fix(helm): fixed helm filepath bug introduced by resolver (#5400)

Signed-off-by: João Reigota <[email protected]>
Checkmarx · May 25, 2022 · 3ace1f4 · 3ace1f4
1 parent 39778e8
commit 3ace1f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/pkg/detector/helm/helm_detect.go b/pkg/detector/helm/helm_detect.go
@@ -89,14 +89,16 @@ func (d DetectKindLine) DetectLine(file *model.FileMetadata, searchKey string,
 			Line:                 curLineRes.lineRes + 1,
 			VulnLines:            detector.GetAdjacentVulnLines(curLineRes.lineRes, outputLines, lines),
 			LineWithVulnerabilty: strings.Split(lines[curLineRes.lineRes], ": ")[0],
+			ResolvedFile:         file.FilePath,
 		}
 	}
 
 	logWithFields.Warn().Msgf("Failed to detect line, query response %s", searchKey)
 
 	return model.VulnerabilityLines{
-		Line:      undetectedVulnerabilityLine,
-		VulnLines: []model.CodeLine{},
+		Line:         undetectedVulnerabilityLine,
+		VulnLines:    []model.CodeLine{},
+		ResolvedFile: file.FilePath,
 	}
 }
 

diff --git a/pkg/detector/helm/helm_detect_test.go b/pkg/detector/helm/helm_detect_test.go
@@ -63,6 +63,7 @@ spec:
 					},
 				},
 				LineWithVulnerabilty: "  containers:",
+				ResolvedFile:         "test-connection.yaml",
 			},
 		},
 		{
@@ -116,6 +117,7 @@ spec:
 					},
 				},
 				LineWithVulnerabilty: "spec:",
+				ResolvedFile:         "test-dup_values.yaml",
 			},
 		},
 		{
@@ -177,6 +179,7 @@ spec:
 					},
 				},
 				LineWithVulnerabilty: "  containers:",
+				ResolvedFile:         "test-dups.yaml",
 			},
 		},
 	}

diff --git a/pkg/engine/vulnerability_builder.go b/pkg/engine/vulnerability_builder.go
@@ -109,7 +109,7 @@ var DefaultVulnerabilityBuilder = func(ctx *QueryContext, tracker Tracker,
 
 	var similarityID *string
 
-	similarityID, err = similarity.ComputeSimilarityID(ctx.baseScanPaths, file.FilePath, queryID, similarityIDLineInfo, searchValue)
+	similarityID, err = similarity.ComputeSimilarityID(ctx.baseScanPaths, linesVulne.ResolvedFile, queryID, similarityIDLineInfo, searchValue)
 	if err != nil {
 		logWithFields.Err(err).Send()
 		tracker.FailedComputeSimilarityID()