From df0c9c7b3fd89d2b8dfdbb63d05208d6c4a2374d Mon Sep 17 00:00:00 2001
From: Daria Kuznetsova <d.kuznetsova@sap.com>
Date: Tue, 31 Oct 2023 12:03:57 +0100
Subject: [PATCH] fix(codeqlExecuteScan): exclude codeqlDB from uploaded
 sources to github (#4652)

* fixed unzipping db sources without db dir

* fixed tests
---
 pkg/codeql/github_repo_upload.go      | 6 +++---
 pkg/codeql/github_repo_upload_test.go | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkg/codeql/github_repo_upload.go b/pkg/codeql/github_repo_upload.go
index 60a220d11..cfecc22dc 100644
--- a/pkg/codeql/github_repo_upload.go
+++ b/pkg/codeql/github_repo_upload.go
@@ -118,7 +118,7 @@ func (uploader *GitUploaderInstance) UploadProjectToGithub() (string, error) {
 	}
 
 	zipPath := path.Join(uploader.dbDir, SrcZip)
-	err = unzip(zipPath, tmpDir, strings.Trim(srcLocationPrefix, fmt.Sprintf("%c", os.PathSeparator)))
+	err = unzip(zipPath, tmpDir, strings.Trim(srcLocationPrefix, fmt.Sprintf("%c", os.PathSeparator)), strings.Trim(uploader.dbDir, fmt.Sprintf("%c", os.PathSeparator)))
 	if err != nil {
 		return "", err
 	}
@@ -259,7 +259,7 @@ func push(r repository, token string) error {
 	})
 }
 
-func unzip(zipPath, targetDir, srcDir string) error {
+func unzip(zipPath, targetDir, srcDir, dbDir string) error {
 	r, err := zip.OpenReader(zipPath)
 	if err != nil {
 		return err
@@ -277,7 +277,7 @@ func unzip(zipPath, targetDir, srcDir string) error {
 			fNameSplit[0] = strings.Replace(fNameSplit[0], "_", ":", 1)
 			fName = strings.Join(fNameSplit, fmt.Sprintf("%c", os.PathSeparator))
 		}
-		if !strings.Contains(fName, srcDir) {
+		if !strings.Contains(fName, srcDir) || strings.Contains(fName, dbDir) {
 			continue
 		}
 
diff --git a/pkg/codeql/github_repo_upload_test.go b/pkg/codeql/github_repo_upload_test.go
index 3288a41b7..bcf4ce2d7 100644
--- a/pkg/codeql/github_repo_upload_test.go
+++ b/pkg/codeql/github_repo_upload_test.go
@@ -210,6 +210,7 @@ func TestUnzip(t *testing.T) {
 		srcFilenames := []string{
 			filepath.Join(sourceDir, "file1"),
 			filepath.Join(sourceDir, "file2"),
+			filepath.Join(sourceDir, "codeqlDB"),
 			filepath.Join(sourceDir, "subfolder1", "file1"),
 			filepath.Join(sourceDir, "subfolder1", "file2"),
 			filepath.Join(sourceDir, "subfolder2", "file1"),
@@ -218,7 +219,7 @@ func TestUnzip(t *testing.T) {
 		if err != nil {
 			panic(err)
 		}
-		assert.NoError(t, unzip(zipPath, targetDir, sourceDir))
+		assert.NoError(t, unzip(zipPath, targetDir, sourceDir, "codeqlDB"))
 		targetFilenames := []string{
 			filepath.Join(targetDir, "file1"),
 			filepath.Join(targetDir, "file2"),
@@ -247,7 +248,7 @@ func TestUnzip(t *testing.T) {
 		if err != nil {
 			panic(err)
 		}
-		assert.NoError(t, unzip(zipPath, targetDir, sourceDir))
+		assert.NoError(t, unzip(zipPath, targetDir, sourceDir, "codeqlDB"))
 		checkExistedFiles(t, targetDir, filenames)
 	})
 
@@ -264,7 +265,7 @@ func TestUnzip(t *testing.T) {
 		defer os.RemoveAll(sourceDir)
 		zipPath := filepath.Join(sourceDir, "src.zip")
 
-		assert.Error(t, unzip(zipPath, targetDir, sourceDir))
+		assert.Error(t, unzip(zipPath, targetDir, sourceDir, "codeqlDB"))
 	})
 
 	t.Run("extra files in zip", func(t *testing.T) {
@@ -294,7 +295,7 @@ func TestUnzip(t *testing.T) {
 		if err != nil {
 			panic(err)
 		}
-		assert.NoError(t, unzip(zipPath, targetDir, sourceDir))
+		assert.NoError(t, unzip(zipPath, targetDir, sourceDir, "codeqlDB"))
 		targetFilenames := []string{
 			filepath.Join(targetDir, "file1"),
 			filepath.Join(targetDir, "file2"),