Merge pull request #1220 from Checkmarx/other/Add-file-path-in-ignoredFile-packages

Add filepath to ignore file (AST-103853)

Author: cx-itay-paz

internal/commands/data/checkmarxIgnoredTempList.json

@@ -2,6 +2,7 @@
   {
     "PackageManager": "npm",
     "PackageName": "coa",
-    "PackageVersion": "3.1.3"
+    "PackageVersion": "3.1.3",
+    "FilePath": "../../../commands/data/manifests/package.json"
   }
 ]

internal/commands/data/checkmarxIgnoredTempListCsproj.json

@@ -2,6 +2,8 @@
   {
     "PackageManager": "nuget",
     "PackageName": "Microsoft.Extensions.Caching.Memory",
-    "PackageVersion": "6.0.3"
+    "PackageVersion": "6.0.3",
+    "FilePath": "../../../commands/data/manifests/test.csproj"
+
   }
 ]

internal/services/realtimeengine/ossrealtime/config.go

@@ -22,22 +22,23 @@ type OssPackageResults struct {
 	Packages []OssPackage `json:"Packages"`
 }
 
-func composeID(packageManager, packageName, packageVersion string) string {
-	return fmt.Sprintf("%s_%s_%s", packageManager, packageName, packageVersion)
+func composeID(packageManager, packageName, packageVersion, filePath string) string {
+	return fmt.Sprintf("%s_%s_%s_%s", packageManager, packageName, packageVersion, filePath)
 }
 
 func (p *OssPackage) GetID() string {
-	return composeID(p.PackageManager, p.PackageName, p.PackageVersion)
+	return composeID(p.PackageManager, p.PackageName, p.PackageVersion, p.FilePath)
 }
 
 type IgnoredPackage struct {
 	PackageManager string `json:"PackageManager"`
 	PackageName    string `json:"PackageName"`
 	PackageVersion string `json:"PackageVersion"`
+	FilePath       string `json:"FilePath"`
 }
 
 func (p IgnoredPackage) GetID() string {
-	return composeID(p.PackageManager, p.PackageName, p.PackageVersion)
+	return composeID(p.PackageManager, p.PackageName, p.PackageVersion, p.FilePath)
 }
 
 type Vulnerability struct {

internal/services/realtimeengine/ossrealtime/oss-realtime.go

@@ -95,7 +95,9 @@ func (o *OssRealtimeService) RunOssRealtimeScan(filePath, ignoredFilePath string
 		ignoreMap := buildIgnoreMap(ignoredPkgs)
 		response.Packages = filterIgnoredPackages(response.Packages, ignoreMap)
 	}
-
+	for i := range response.Packages {
+		response.Packages[i].FilePath = filePath
+	}
 	return response, nil
 }