Skip to content

Fixed #52 - Raise exit code properly on vulnerabilities. #53

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

Merged
merged 1 commit into from
Dec 14, 2022
Merged

Fixed #52 - Raise exit code properly on vulnerabilities. #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions cmd/osv-scanner/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,21 @@ func run(args []string, stdout, stderr io.Writer) int {
DirectoryPaths: context.Args().Slice(),
}, r)

if err != nil {
return err
if errPrint := r.PrintResult(&vulnResult); errPrint != nil {
return fmt.Errorf("failed to write output: %v", errPrint)
}

if err := r.PrintResult(&vulnResult); err != nil {
return fmt.Errorf("failed to write output: %v", err)
}

return nil
return err
},
}

if err := app.Run(args); err != nil {
if r == nil {
r = output.NewReporter(stdout, stderr, false)
}
if errors.Is(err, osvscanner.VulnerabilitiesFoundErr) {
return 1
}

if errors.Is(err, osvscanner.NoPackagesFoundErr) {
r.PrintError(fmt.Sprintf("No package sources found, --help for usage information.\n"))
return 128
Expand Down
9 changes: 8 additions & 1 deletion pkg/osvscanner/osvscanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ type ScannerActions struct {

// Error for when no packages is found during a scan.
var NoPackagesFoundErr = errors.New("no packages found in scan")
var VulnerabilitiesFoundErr = errors.New("vulnerabilities found")

// scanDir walks through the given directory to try to find any relevant files
// These include:
Expand Down Expand Up @@ -339,5 +340,11 @@ func DoScan(actions ScannerActions, r *output.Reporter) (models.VulnerabilityRes
return models.VulnerabilityResults{}, fmt.Errorf("failed to hydrate OSV response: %v", err)
}

return groupResponseBySource(r, query, hydratedResp), nil
vulnerabilityResults := groupResponseBySource(r, query, hydratedResp)
// if vulnerability exists it should return error
if len(vulnerabilityResults.Results) > 0 {
return vulnerabilityResults, VulnerabilitiesFoundErr
}

return vulnerabilityResults, nil
}