Skip to content

fix(purl): resolve Docker Hardened Images apk/dhi and deb/dhi PURLs #5715

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
aubm wants to merge 3 commits into
base: master
Choose a base branch
from
+18 −1
Open

fix(purl): resolve Docker Hardened Images apk/dhi and deb/dhi PURLs #5715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f898c75
fix(purl): resolve Docker Hardened Images apk/dhi and deb/dhi PURLs
aubm Jul 27, 2026
3c3bb34
refactor(purl): move DHI PURL conversion to Go per review
aubm Jul 28, 2026
d2fdf30
refactor(purl): group DHI registrations
aubm Jul 31, 2026
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: 10 additions & 1 deletion go/purl/ecosystems_simple.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func init() {
registerSimple(osvconstants.EcosystemBitnami, "bitnami", "", nil)
registerSimple(osvconstants.EcosystemCRAN, "cran", "", nil)
registerSimple(osvconstants.EcosystemConanCenter, "conan", "", nil)
registerSimple(osvconstants.EcosystemDockerHardenedImages, "dhi", "", nil)
registerSimple(osvconstants.EcosystemHackage, "hackage", "", nil)
registerSlash(osvconstants.EcosystemHex, "hex")
registerSimple(osvconstants.EcosystemJulia, "julia", "", nil)
Expand Down Expand Up @@ -103,4 +102,14 @@ func init() {
registerSimple(osvconstants.EcosystemAlpaquita, "apk", "alpaquita", sourceArchQualifiers)
registerSimple(osvconstants.EcosystemAlpine, "apk", "alpine", sourceArchQualifiers)
registerSimple(osvconstants.EcosystemBellSoftHardenedContainers, "apk", "bellsoft-hardened-containers", sourceArchQualifiers)

// Docker Hardened Images
registerSimple(osvconstants.EcosystemDockerHardenedImages, "dhi", "", nil)
// DHI advisories also publish release-lineage PURLs -- pkg:apk/dhi/<name>
// for the Alpine lineage and pkg:deb/dhi/<name> for Debian -- so map both
// back to the ecosystem for PURL queries. Generation stays pkg:dhi/ (the
// registerSimple above); the dhi namespace disambiguates from Alpine
// (apk/alpine) and Debian (deb/debian), so there is no parser collision.
registerParser("apk", "dhi", simpleParser{ecosystem: osvconstants.EcosystemDockerHardenedImages})
registerParser("deb", "dhi", simpleParser{ecosystem: osvconstants.EcosystemDockerHardenedImages})
}
8 changes: 8 additions & 0 deletions go/purl/purl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func TestGenerate(t *testing.T) {
{"npm", "@babel/core", "pkg:npm/%40babel/core", false},
{"Hex", "acme/foo", "pkg:hex/acme/foo", false},
{"SwiftURL", "github.com/apple/swift-markdown", "pkg:swift/github.com/apple/swift-markdown", false},
{"Docker Hardened Images", "curl", "pkg:dhi/curl", false},
// Error cases
{"UnknownEcosystem", "package", "", true},
}
Expand Down Expand Up @@ -66,6 +67,13 @@ func TestParse(t *testing.T) {
{"pkg:npm/%40babel/core@1.2.3", "npm", "@babel/core", "1.2.3", false},
{"pkg:hex/acme/foo@1.2.3", "Hex", "acme/foo", "1.2.3", false},
{"pkg:swift/github.com/apple/swift-markdown@1.2.3", "SwiftURL", "github.com/apple/swift-markdown", "1.2.3", false},
// Docker Hardened Images: release-lineage PURLs resolve to the ecosystem.
// Qualifiers are ignored; versionless (OSV affected) and versioned (VEX
// product) forms both parse. pkg:dhi/ also still resolves.
{"pkg:apk/dhi/curl?os_distro=alpine&os_name=dhi&os_version=3.23", "Docker Hardened Images", "curl", "", false},
{"pkg:apk/dhi/curl@8.4.0-r0", "Docker Hardened Images", "curl", "8.4.0-r0", false},
{"pkg:deb/dhi/openssl@3.0.11-1", "Docker Hardened Images", "openssl", "3.0.11-1", false},
{"pkg:dhi/curl@8.4.0-r0", "Docker Hardened Images", "curl", "8.4.0-r0", false},
// Error cases
{"invalid-purl", "", "", "", true},
{"pkg:unknown/package@1.0.0", "", "", "", true},
Expand Down