Skip to content

Commit 9d6d78b

Browse files
committed
fix: sort invalid PURLs so they're properly compacted
1 parent 23a4657 commit 9d6d78b

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

cmd/osv-scanner/__snapshots__/main_test.snap

+2-4
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,8 @@ Scanning dir ./fixtures/sbom-insecure/
542542
Scanned <rootdir>/fixtures/sbom-insecure/alpine.cdx.xml as CycloneDX SBOM and found 14 packages
543543
Scanned <rootdir>/fixtures/sbom-insecure/bad-purls.cdx.xml as CycloneDX SBOM and found 8 packages
544544
Ignored 6 packages with invalid PURLs
545-
Ignored invalid PURL "pkg:pypi/"
546-
Ignored invalid PURL "pkg:///"
547545
Ignored invalid PURL "/"
546+
Ignored invalid PURL "pkg:///"
548547
Ignored invalid PURL "pkg:apk/alpine/@1.36.1-r27?arch=x86_64&upstream=busybox&distro=alpine-3.17.2"
549548
Ignored invalid PURL "pkg:pypi/"
550549
Scanned <rootdir>/fixtures/sbom-insecure/postgres-stretch.cdx.xml as CycloneDX SBOM and found 136 packages
@@ -698,9 +697,8 @@ No issues found
698697
[TestRun/one_specific_supported_sbom_with_invalid_PURLs - 1]
699698
Scanned <rootdir>/fixtures/sbom-insecure/bad-purls.cdx.xml as CycloneDX SBOM and found 8 packages
700699
Ignored 6 packages with invalid PURLs
701-
Ignored invalid PURL "pkg:pypi/"
702-
Ignored invalid PURL "pkg:///"
703700
Ignored invalid PURL "/"
701+
Ignored invalid PURL "pkg:///"
704702
Ignored invalid PURL "pkg:apk/alpine/@1.36.1-r27?arch=x86_64&upstream=busybox&distro=alpine-3.17.2"
705703
Ignored invalid PURL "pkg:pypi/"
706704
No issues found

pkg/osvscanner/osvscanner.go

+1
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ func scanSBOMFile(r reporter.Reporter, path string, fromFSScan bool) ([]scannedP
506506
len(ignoredPURLs),
507507
output.Form(len(ignoredPURLs), "package", "packages"),
508508
)
509+
slices.Sort(ignoredPURLs)
509510
for _, purl := range slices.Compact(ignoredPURLs) {
510511
r.Warnf(
511512
"Ignored invalid PURL \"%s\"\n",

0 commit comments

Comments
 (0)