Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions utils/results/conversion/convertor.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,18 @@ func (c *CommandResultsConvertor) ConvertToSimpleJson(cmdResults *results.Securi
return parseCommandResults(c.Params, parser, cmdResults)
}

// ConvertTargetToSimpleJson converts a single TargetResults to SimpleJson format without flattening multiple targets.
func (c *CommandResultsConvertor) ConvertTargetToSimpleJson(target *results.TargetResults, cmdResults *results.SecurityCommandResults) (simpleJsonResults formats.SimpleJsonResults, err error) {
if target == nil {
return formats.SimpleJsonResults{}, nil
}
singleTargetResults := &results.SecurityCommandResults{
ResultsMetaData: cmdResults.ResultsMetaData,
Targets: []*results.TargetResults{target},
}
return c.ConvertToSimpleJson(singleTargetResults)
}

func (c *CommandResultsConvertor) ConvertToSarif(cmdResults *results.SecurityCommandResults) (sarifReport *sarif.Report, err error) {
parser := sarifparser.NewCmdResultsSarifConverter(c.Params.PlatformUrl, c.Params.PatchBinaryPaths)
return parseCommandResults(c.Params, parser, cmdResults)
Expand Down
74 changes: 74 additions & 0 deletions utils/results/conversion/convertor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -799,3 +799,77 @@ func getDockerScanTestResults(unique bool) (*results.SecurityCommandResults, val
})
return cmdResults, expected
}

func TestConvertTargetToSimpleJson(t *testing.T) {
target1 := &results.TargetResults{
ScanTarget: results.ScanTarget{Target: "/path/to/project1"},
ScaResults: &results.ScaScanResults{
DeprecatedXrayResults: []services.ScanResponse{{
Vulnerabilities: []services.Vulnerability{
{
Cves: []services.Cve{{Id: "CVE-2023-1234"}},
Severity: "High",
Components: map[string]services.Component{
"pkg1": {
FixedVersions: []string{"1.2.0"},
ImpactPaths: [][]services.ImpactPathNode{{{ComponentId: "root"}, {ComponentId: "pkg1"}}},
},
},
},
},
}},
},
}

target2 := &results.TargetResults{
ScanTarget: results.ScanTarget{Target: "/path/to/project2"},
ScaResults: &results.ScaScanResults{
DeprecatedXrayResults: []services.ScanResponse{{
Vulnerabilities: []services.Vulnerability{
{
Cves: []services.Cve{{Id: "CVE-2023-5678"}},
Severity: "Critical",
Components: map[string]services.Component{
"pkg2": {
FixedVersions: []string{"2.0.0"},
ImpactPaths: [][]services.ImpactPathNode{{{ComponentId: "root"}, {ComponentId: "pkg2"}}},
},
},
},
},
}},
},
}

cmdResults := &results.SecurityCommandResults{
ResultsMetaData: results.ResultsMetaData{
CmdType: utils.SourceCode,
ResultContext: results.ResultContext{
IncludeVulnerabilities: true,
},
},
Targets: []*results.TargetResults{target1, target2},
}

convertor := NewCommandResultsConvertor(ResultConvertParams{
IncludeVulnerabilities: true,
HasViolationContext: false,
})

// Test converting first target only
result1, err := convertor.ConvertTargetToSimpleJson(target1, cmdResults)
assert.NoError(t, err)
assert.NotEmpty(t, result1.Vulnerabilities)
assert.Equal(t, 1, len(result1.Vulnerabilities))
assert.Equal(t, "CVE-2023-1234", result1.Vulnerabilities[0].Cves[0].Id)

// Test converting second target only
result2, err := convertor.ConvertTargetToSimpleJson(target2, cmdResults)
assert.NoError(t, err)
assert.NotEmpty(t, result2.Vulnerabilities)
assert.Equal(t, 1, len(result2.Vulnerabilities))
assert.Equal(t, "CVE-2023-5678", result2.Vulnerabilities[0].Cves[0].Id)

// Verify no flattening occurred
assert.NotEqual(t, result1.Vulnerabilities[0].Cves[0].Id, result2.Vulnerabilities[0].Cves[0].Id)
}