Merge pull request #682 from Checkmarx/bug/elchanan/up-fixlink

Fix "About this vulnerability" link (AST-35994)
Checkmarx · Mar 27, 2024 · d153d73 · d153d73
2 parents 7e1396b + e1bd993
commit d153d73
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 5 deletions.
diff --git a/internal/commands/result.go b/internal/commands/result.go
@@ -1797,11 +1797,11 @@ func addPackageInformation(
 							head.SupportsQuickFix = head.SupportsQuickFix && util.IsPackageFileSupported(*location)
 						}
 						currentPackage.SupportsQuickFix = currentPackage.SupportsQuickFix || head.SupportsQuickFix
-					}
-					if result.VulnerabilityDetails.CveName != "" {
-						currentPackage.FixLink = "https://devhub.checkmarx.com/cve-details/" + result.VulnerabilityDetails.CveName
-					} else {
-						currentPackage.FixLink = ""
+						if result.ID != "" {
+							currentPackage.FixLink = "https://devhub.checkmarx.com/cve-details/" + result.ID
+						} else {
+							currentPackage.FixLink = ""
+						}
 					}
 					if currentPackage.IsDirectDependency {
 						currentPackage.TypeOfDependency = directDependencyType

diff --git a/internal/commands/result_test.go b/internal/commands/result_test.go
@@ -332,3 +332,38 @@ func TestRunGetResultsByScanIdGLFormat(t *testing.T) {
 	// Run test for gl-sast report type
 	os.Remove(fmt.Sprintf("%s.%s", fileName, printer.FormatGL))
 }
+
+func Test_addPackageInformation(t *testing.T) {
+	var dependencyPath = wrappers.DependencyPath{ID: "test-1"}
+	var dependencyArray = [][]wrappers.DependencyPath{{dependencyPath}}
+	resultsModel := &wrappers.ScanResultsCollection{
+		Results: []*wrappers.ScanResult{
+			{
+				Type: "sca", // Assuming this matches commonParams.ScaType
+				ScanResultData: wrappers.ScanResultData{
+					PackageIdentifier: "pkg-123",
+				},
+				ID: "CVE-2021-23-424",
+				VulnerabilityDetails: wrappers.VulnerabilityDetails{
+					CvssScore: 5.0,
+					CveName:   "cwe-789",
+				},
+			},
+		},
+	}
+	scaPackageModel := &[]wrappers.ScaPackageCollection{
+		{
+			ID:                  "pkg-123",
+			FixLink:             "",
+			DependencyPathArray: dependencyArray,
+		},
+	}
+	scaTypeModel := &[]wrappers.ScaTypeCollection{
+		{}}
+
+	resultsModel = addPackageInformation(resultsModel, scaPackageModel, scaTypeModel)
+
+	expectedFixLink := "https://devhub.checkmarx.com/cve-details/CVE-2021-23-424"
+	actualFixLink := resultsModel.Results[0].ScanResultData.ScaPackageCollection.FixLink
+	assert.Equal(t, expectedFixLink, actualFixLink, "FixLink should match the result ID")
+}