Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix influx counter for whitesource #5133

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix influx counter for whitesource #5133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e0dc7
Fix influx counter for whitesource
tlefaix Oct 7, 2024
1629ef4
Add log
tlefaix Nov 28, 2024
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
11 changes: 7 additions & 4 deletions cmd/whitesourceExecuteScan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,7 @@ func collectVulnsAndLibsForProject(
if err != nil {
errorsOccurred = append(errorsOccurred, fmt.Sprint(err))
}
log.Entry().Infof("Current influx data : minor_vulnerabilities = %v / major_vulnerabilities = %v / vulnerabilities = %v", influx.whitesource_data.fields.minor_vulnerabilities, influx.whitesource_data.fields.major_vulnerabilities, influx.whitesource_data.fields.vulnerabilities)

// collect all libraries detected in all related projects and errors
libraries, err := sys.GetProjectHierarchy(project.Token, true)
Expand Down Expand Up @@ -897,9 +898,11 @@ func checkProjectSecurityViolations(config *ScanOptions, cvssSeverityLimit float
}

severeVulnerabilities, nonSevereVulnerabilities := ws.CountSecurityVulnerabilities(&alerts, cvssSeverityLimit)
influx.whitesource_data.fields.minor_vulnerabilities = nonSevereVulnerabilities
influx.whitesource_data.fields.major_vulnerabilities = severeVulnerabilities
influx.whitesource_data.fields.vulnerabilities = nonSevereVulnerabilities + severeVulnerabilities
influx.whitesource_data.fields.minor_vulnerabilities += nonSevereVulnerabilities
influx.whitesource_data.fields.major_vulnerabilities += severeVulnerabilities
influx.whitesource_data.fields.vulnerabilities += (nonSevereVulnerabilities + severeVulnerabilities)
log.Entry().Infof("Current influx data : minor_vulnerabilities = %v / major_vulnerabilities = %v / vulnerabilities = %v", influx.whitesource_data.fields.minor_vulnerabilities, influx.whitesource_data.fields.major_vulnerabilities, influx.whitesource_data.fields.vulnerabilities)

if nonSevereVulnerabilities > 0 {
log.Entry().Warnf("WARNING: %v Open Source Software Security vulnerabilities with "+
"CVSS score below threshold %.1f detected in project %s.", nonSevereVulnerabilities,
Expand All @@ -910,11 +913,11 @@ func checkProjectSecurityViolations(config *ScanOptions, cvssSeverityLimit float
}
// https://github.com/SAP/jenkins-library/blob/master/vars/whitesourceExecuteScan.groovy#L558
if severeVulnerabilities > 0 {
log.Entry().Infof("%v Open Source Software Security vulnerabilities with CVSS score greater or equal to %.1f detected in project %s", severeVulnerabilities, cvssSeverityLimit, project.Name)
if config.FailOnSevereVulnerabilities {
log.SetErrorCategory(log.ErrorCompliance)
return severeVulnerabilities, alerts, assessedAlerts, fmt.Errorf("%v Open Source Software Security vulnerabilities with CVSS score greater or equal to %.1f detected in project %s", severeVulnerabilities, cvssSeverityLimit, project.Name)
}
log.Entry().Infof("%v Open Source Software Security vulnerabilities with CVSS score greater or equal to %.1f detected in project %s", severeVulnerabilities, cvssSeverityLimit, project.Name)
log.Entry().Info("Step will only create data but not fail due to setting failOnSevereVulnerabilities: false")
return severeVulnerabilities, alerts, assessedAlerts, nil
}
Expand Down
9 changes: 9 additions & 0 deletions cmd/whitesourceExecuteScan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,9 @@ func TestCheckProjectSecurityViolations(t *testing.T) {
assert.Equal(t, 0, severeVulnerabilities)
assert.Equal(t, 0, len(alerts))
assert.Equal(t, 0, len(assessedAlerts))
assert.Equal(t, 0, influx.whitesource_data.fields.minor_vulnerabilities)
assert.Equal(t, 0, influx.whitesource_data.fields.major_vulnerabilities)
assert.Equal(t, 0, influx.whitesource_data.fields.vulnerabilities)
})

t.Run("error - some vulnerabilities", func(t *testing.T) {
Expand All @@ -744,6 +747,9 @@ func TestCheckProjectSecurityViolations(t *testing.T) {
assert.Equal(t, 1, severeVulnerabilities)
assert.Equal(t, 2, len(alerts))
assert.Equal(t, 0, len(assessedAlerts))
assert.Equal(t, 1, influx.whitesource_data.fields.minor_vulnerabilities)
assert.Equal(t, 1, influx.whitesource_data.fields.major_vulnerabilities)
assert.Equal(t, 2, influx.whitesource_data.fields.vulnerabilities)
})

t.Run("success - assessed vulnerabilities", func(t *testing.T) {
Expand All @@ -759,6 +765,9 @@ func TestCheckProjectSecurityViolations(t *testing.T) {
assert.Equal(t, 0, severeVulnerabilities)
assert.Equal(t, 0, len(alerts))
assert.Equal(t, 2, len(assessedAlerts))
assert.Equal(t, 0, influx.whitesource_data.fields.minor_vulnerabilities)
assert.Equal(t, 0, influx.whitesource_data.fields.major_vulnerabilities)
assert.Equal(t, 0, influx.whitesource_data.fields.vulnerabilities)
})

t.Run("error - WhiteSource failure", func(t *testing.T) {
Expand Down