Skip to content
Merged
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
8 changes: 4 additions & 4 deletions audit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1086,8 +1086,8 @@ func TestAuditNewScaCycloneDxPnpm(t *testing.T) {
)
assert.NoError(t, err)
validations.VerifyCycloneDxResults(t, output, validations.ValidationParams{
Total: &validations.TotalCount{Vulnerabilities: 1, BomComponents: 2 /* root */ + 2 /* direct */, Licenses: 1},
SbomComponents: &validations.SbomCount{Root: 2, Direct: 2},
Total: &validations.TotalCount{Vulnerabilities: 1, BomComponents: 1 /* root */ + 2 /* direct */, Licenses: 1},
SbomComponents: &validations.SbomCount{Root: 1, Direct: 2},
Vulnerabilities: &validations.VulnerabilityCount{
ValidateScan: &validations.ScanCount{Sca: 1},
ValidateApplicabilityStatus: &validations.ApplicabilityStatusCount{NotApplicable: 1},
Expand Down Expand Up @@ -1238,8 +1238,8 @@ func TestAuditNewScaCycloneDxUV(t *testing.T) {
)
assert.NoError(t, err)
validations.VerifyCycloneDxResults(t, output, validations.ValidationParams{
Total: &validations.TotalCount{Vulnerabilities: 20, BomComponents: 1 /* root */ + 8 /* direct */ + 1 /* file (secret)*/, Licenses: 5},
SbomComponents: &validations.SbomCount{Root: 1, Direct: 8},
Total: &validations.TotalCount{Vulnerabilities: 20, BomComponents: 1 /* root */ + 3 /* direct */ + 4 /* transitive */ + 1 /* file (secret)*/, Licenses: 5},
SbomComponents: &validations.SbomCount{Root: 1, Direct: 3, Transitive: 4},
Vulnerabilities: &validations.VulnerabilityCount{
ValidateScan: &validations.ScanCount{Sca: 18, Sast: 1, Secrets: 1},
ValidateApplicabilityStatus: &validations.ApplicabilityStatusCount{NotCovered: 9, NotApplicable: 9},
Expand Down
2 changes: 2 additions & 0 deletions sca/bom/xrayplugin/plugin/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ type Config struct {
Ecosystems []techutils.Technology `json:"ecosystems,omitempty" yaml:"ecosystems,omitempty"`
// [Optional] Specific directories to scan.
IncludeDirs []string `json:"includeDirs,omitempty"`
// [Optional] Allow running build tools (e.g. the target's gradlew) to resolve dependencies.
AllowBuildExecution bool `json:"allowBuildExecution,omitempty" yaml:"allowBuildExecution,omitempty"`
}
2 changes: 1 addition & 1 deletion sca/bom/xrayplugin/plugin/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

const (
xrayLibPluginVersionEnvVariable = "JFROG_CLI_XRAY_LIB_PLUGIN_VERSION"
defaultXrayLibPluginVersion = "1.6.0"
defaultXrayLibPluginVersion = "1.9.0"

SnippetDetectionEnvVariable = "JFROG_XRAY_SNIPPET_SCAN_ENABLE"

Expand Down
13 changes: 7 additions & 6 deletions sca/bom/xrayplugin/xraylibbom.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,13 @@ func (sbg *XrayLibBomGenerator) getXrayLibExecutablePath() (xrayLibPath string,

func (sbg *XrayLibBomGenerator) executeScanner(scanner plugin.Scanner, target results.ScanTarget) (output *cyclonedx.BOM, err error) {
scanConfig := plugin.Config{
BomRef: cdxutils.GetFileRef(target.Target),
Type: string(cyclonedx.ComponentTypeFile),
Name: target.Target,
IgnorePatterns: ignorePatternsForTarget(target),
IncludeDirs: target.Include,
Ecosystems: sbg.specificTechs,
BomRef: cdxutils.GetFileRef(target.Target),
Type: string(cyclonedx.ComponentTypeFile),
Name: target.Target,
IgnorePatterns: ignorePatternsForTarget(target),
IncludeDirs: target.Include,
Ecosystems: sbg.specificTechs,
AllowBuildExecution: true,
}
if scanConfigStr, err := utils.GetAsJsonString(scanConfig, false, true); err == nil {
log.Debug(fmt.Sprintf("Scan configuration: %s", scanConfigStr))
Expand Down
Loading