fix gosec issues #2694

Checkmarx · Apr 5, 2021 · 8329147 · 8329147
1 parent 115ac1c
commit 8329147
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/internal/console/kics.go b/internal/console/kics.go
@@ -127,7 +127,7 @@ func setupLogs() error {
 	}
 
 	if logFile {
-		file, err := os.OpenFile(logPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, os.ModePerm)
+		file, err := os.OpenFile(filepath.Clean(logPath), os.O_APPEND|os.O_CREATE|os.O_WRONLY, os.ModePerm)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/engine/source/filesystem.go b/pkg/engine/source/filesystem.go
@@ -218,7 +218,12 @@ func ReadMetadata(queryDir string) map[string]interface{} {
 
 		return nil
 	}
-	defer f.Close()
+	defer func() {
+		if err := f.Close(); err != nil {
+			log.Err(err).
+				Msgf("Queries provider can't close file, file=%s", filepath.Clean(path.Join(queryDir, MetadataFileName)))
+		}
+	}()
 
 	var metadata map[string]interface{}
 	if err := json.NewDecoder(f).Decode(&metadata); err != nil {