Add advanced security fields to audit simple-json struct

xray/utils/resultstable.go

@@ -916,7 +916,7 @@ func getApplicableCveValue(extendedResults *ExtendedScanResults, xrayCves []form
 			}
 			for _, relatedResult := range relatedResults {
 				cveExistsInResult = true
-				if isApplicableResult(relatedResult) {
+				if IsApplicableResult(relatedResult) {
 					return Applicable
 				}
 			}
@@ -943,7 +943,7 @@ func getCveApplicability(cve formats.CveRow, applicabilityScanResults []*sarif.R
 		}
 		// Set applicable details
 		applicability = &formats.Applicability{
-			Status:             isApplicableResult(relatedResult),
+			Status:             IsApplicableResult(relatedResult),
 			ScannerDescription: description,
 		}
 		// Add new evidences from locations

xray/utils/sarifutils.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"fmt"
+	"os"
 	"strconv"
 	"strings"
 
@@ -94,6 +95,9 @@ func GetDiffFromRun(sources []*sarif.Run, targets []*sarif.Run) (runWithNewOnly
 	if combinedSource == nil {
 		return
 	}
+	if len(targets) == 0 {
+		return combinedSource
+	}
 	combinedTarget := sarif.NewRunWithInformationURI(targets[0].Tool.Driver.Name, getRunInformationUri(targets[0]))
 	AggregateMultipleRunsIntoSingle(targets, combinedTarget)
 	if combinedTarget == nil {
@@ -340,9 +344,15 @@ func GetStartLocationInFile(location *sarif.Location) string {
 }
 
 func ExtractRelativePath(resultPath string, projectRoot string) string {
+	osFilePrefix := "file:///private/"
 	filePrefix := "file://"
-	relativePath := strings.ReplaceAll(strings.ReplaceAll(resultPath, projectRoot, ""), filePrefix, "")
-	return relativePath
+	resultPath = strings.ReplaceAll(resultPath, osFilePrefix, "")
+	resultPath = strings.TrimSuffix(strings.ReplaceAll(resultPath, filePrefix, ""), string(os.PathSeparator))
+	if resultPath == projectRoot {
+		return ""
+	}
+	s := strings.ReplaceAll(resultPath, projectRoot, "")
+	return s
 }
 
 func GetResultSeverity(result *sarif.Result) string {
@@ -361,7 +371,7 @@ func ConvertToSarifLevel(severity string) string {
 	return string(noneLevel)
 }
 
-func isApplicableResult(result *sarif.Result) bool {
+func IsApplicableResult(result *sarif.Result) bool {
 	return !(result.Kind != nil && *result.Kind == "pass")
 }