Skip to content

fix(security): sanitize extractor-emitted package identifiers in workflow-parsed log sinks #2928

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

Open
adilburaksen wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −4
Open

fix(security): sanitize extractor-emitted package identifiers in workflow-parsed log sinks #2928

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
5 changes: 3 additions & 2 deletions pkg/osvscanner/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/google/osv-scanner/v2/internal/config"
"github.com/google/osv-scanner/v2/internal/imodels"
"github.com/google/osv-scanner/v2/internal/imodels/results"
"github.com/google/osv-scanner/v2/internal/output"
"github.com/google/osv-scanner/v2/pkg/models"
"github.com/ossf/osv-schema/bindings/go/osvconstants"
"github.com/ossf/osv-schema/bindings/go/osvschema"
Expand Down Expand Up @@ -45,7 +46,7 @@ func filterUnscannablePackages(scanResults *results.ScanResults, actions Scanner
// Short commit hashes (< 40 hex chars) are rejected by the OSV API with
// "Invalid hash". Skip them with a warning rather than aborting the scan.
case imodels.Commit(psr) != "" && len(imodels.Commit(psr)) < 40:
cmdlogger.Warnf("Skipping %s: short commit hash %q cannot be queried; OSV API requires a full 40-character SHA.", imodels.Name(psr), imodels.Commit(psr))
cmdlogger.Warnf("Skipping %s: short commit hash %q cannot be queried; OSV API requires a full 40-character SHA.", output.SanitizeForWorkflowCommand(imodels.Name(psr)), imodels.Commit(psr))

if actions.ShowAllPackages {
filteredPsr = append(filteredPsr, psr)
Expand Down Expand Up @@ -101,7 +102,7 @@ func filterIgnoredPackages(scanResults *results.ScanResults) {
if reason == "" {
reason = "(no reason given)"
}
cmdlogger.Infof("Package %s has been filtered out because: %s", pkgString, reason)
cmdlogger.Infof("Package %s has been filtered out because: %s", output.SanitizeForWorkflowCommand(pkgString), output.SanitizeForWorkflowCommand(reason))

continue
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/osvscanner/vulnerability_result.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ func buildVulnerabilityResults(
if actions.ScanLicensesSummary || len(actions.ScanLicensesAllowlist) > 0 {
if override, entry := configToUse.ShouldOverridePackageLicense(p); override {
if entry.License.Ignore {
cmdlogger.Infof("ignoring license for package %s/%s/%s", pkg.Package.Ecosystem, pkg.Package.Name, pkg.Package.Version)
cmdlogger.Infof("ignoring license for package %s/%s/%s", output.SanitizeForWorkflowCommand(pkg.Package.Ecosystem), output.SanitizeForWorkflowCommand(pkg.Package.Name), output.SanitizeForWorkflowCommand(pkg.Package.Version))
p.Licenses = []string{}
} else {
cmdlogger.Infof("overriding license for package %s/%s/%s with %s", pkg.Package.Ecosystem, pkg.Package.Name, pkg.Package.Version, strings.Join(entry.License.Override, ","))
cmdlogger.Infof("overriding license for package %s/%s/%s with %s", output.SanitizeForWorkflowCommand(pkg.Package.Ecosystem), output.SanitizeForWorkflowCommand(pkg.Package.Name), output.SanitizeForWorkflowCommand(pkg.Package.Version), output.SanitizeForWorkflowCommand(strings.Join(entry.License.Override, ",")))
p.Licenses = entry.License.Override
}
}
Expand Down