From 72de0070646b57b793999fe7b8ac48f6b922b659 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Fri, 30 Aug 2024 07:57:03 +1200 Subject: [PATCH] fix: switch scanner to using new config methods --- pkg/osvscanner/osvscanner.go | 12 +++++++++++- pkg/osvscanner/vulnerability_result.go | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkg/osvscanner/osvscanner.go b/pkg/osvscanner/osvscanner.go index d681912d2a9..dc82c1c9e4a 100644 --- a/pkg/osvscanner/osvscanner.go +++ b/pkg/osvscanner/osvscanner.go @@ -967,7 +967,17 @@ func filterIgnoredPackages(r reporter.Reporter, packages []scannedPackage, confi out := make([]scannedPackage, 0, len(packages)) for _, p := range packages { configToUse := configManager.Get(r, p.Source.Path) - if ignore, ignoreLine := configToUse.ShouldIgnorePackageVersion(p.Name, p.Version, string(p.Ecosystem)); ignore { + if ignore, ignoreLine := configToUse.ShouldIgnorePackage( + models.PackageVulns{ + Package: models.PackageInfo{ + Name: p.Name, + Version: p.Version, + Ecosystem: string(p.Ecosystem), + Commit: p.Commit, + }, + DepGroups: p.DepGroups, + }, + ); ignore { pkgString := fmt.Sprintf("%s/%s/%s", p.Ecosystem, p.Name, p.Version) r.Infof("Package %s has been filtered out because: %s\n", pkgString, ignoreLine.Reason) diff --git a/pkg/osvscanner/vulnerability_result.go b/pkg/osvscanner/vulnerability_result.go index ee3d45806c6..424f32e5b83 100644 --- a/pkg/osvscanner/vulnerability_result.go +++ b/pkg/osvscanner/vulnerability_result.go @@ -68,7 +68,7 @@ func buildVulnerabilityResults( } if actions.ScanLicensesSummary || len(actions.ScanLicensesAllowlist) > 0 { configToUse := configManager.Get(r, rawPkg.Source.Path) - if override, entry := configToUse.ShouldOverridePackageVersionLicense(pkg.Package.Name, pkg.Package.Version, pkg.Package.Ecosystem); override { + if override, entry := configToUse.ShouldOverridePackageLicense(pkg); override { overrideLicenses := make([]models.License, len(entry.License.Override)) for j, license := range entry.License.Override { overrideLicenses[j] = models.License(license)