Skip to content

feat(ubuntu): match FIPS packages against the dedicated FIPS bucket #66

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
Bit-Doctor wants to merge 1 commit into
base: djc/main-dd-069
Choose a base branch
from
Open

feat(ubuntu): match FIPS packages against the dedicated FIPS bucket #66

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: 5 additions & 0 deletions pkg/detector/ospkg/ubuntu/testdata/fixtures/data-source.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
Name: "Ubuntu CVE Tracker"
URL: "https://git.launchpad.net/ubuntu-cve-tracker"
- key: ubuntu 21.04
value:
ID: "ubuntu"
Name: "Ubuntu CVE Tracker"
URL: "https://git.launchpad.net/ubuntu-cve-tracker"
- key: ubuntu 20.04-FIPS
value:
ID: "ubuntu"
Name: "Ubuntu CVE Tracker"
Expand Down
7 changes: 7 additions & 0 deletions pkg/detector/ospkg/ubuntu/testdata/fixtures/ubuntu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,10 @@
- key: CVE-2016-4476
value:
FixedVersion: "2.4-0ubuntu10"
- bucket: ubuntu 20.04-FIPS
pairs:
- bucket: openssl
pairs:
- key: CVE-2099-FIPS
value:
FixedVersion: "3.0.2-0ubuntu1.17+Fips2"
27 changes: 25 additions & 2 deletions pkg/detector/ospkg/ubuntu/ubuntu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,25 @@ func (s *Scanner) Detect(ctx context.Context, osVer string, _ *ftypes.Repository
log.InfoContext(ctx, "Detecting vulnerabilities...", log.String("os_version", osVer),
log.Int("pkg_num", len(pkgs)))

release := s.versionFromEolDates(ctx, osVer)

var vulns []types.DetectedVulnerability
for _, pkg := range pkgs {
// Skip third-party packages as they are not covered by Ubuntu security advisories
if pkg.Repository.Class == ftypes.RepositoryClassThirdParty {
continue
}

Comment on lines +106 to 114

@LucasChevrierGit LucasChevrierGit Jul 30, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

release can be ESM-suffixed (e.g. "18.04-ESM"), so pkgRelease += "-FIPS" produces "18.04-ESM-FIPS" — a bucket that doesn't exist. Hosts with both esm-infra and FIPS enabled would silently get zero FIPS results. Build the FIPS bucket off the base release instead:

Suggested change
release := s.versionFromEolDates(ctx, osVer)
var vulns []types.DetectedVulnerability
for _, pkg := range pkgs {
// Skip third-party packages as they are not covered by Ubuntu security advisories
if pkg.Repository.Class == ftypes.RepositoryClassThirdParty {
continue
}
release := s.versionFromEolDates(ctx, osVer)
baseRelease := strings.TrimSuffix(release, "-ESM")
var vulns []types.DetectedVulnerability
for _, pkg := range pkgs {
// Skip third-party packages as they are not covered by Ubuntu security advisories
if pkg.Repository.Class == ftypes.RepositoryClassThirdParty {
continue
}
// FIPS advisories live in a "<base-version>-FIPS" bucket ("-ESM" and
// "-FIPS" never combine), so strip any "-ESM" suffix first.
pkgRelease := release
if isFIPSPackage(pkg) {
pkgRelease = baseRelease + "-FIPS"
}

osVer = s.versionFromEolDates(ctx, osVer)
// FIPS-validated packages are fixed on Ubuntu's FIPS streams, which
// trivy-db stores in a dedicated "<version>-FIPS" bucket. Querying that
// bucket (instead of the regular release bucket) ensures FIPS users get
// the FIPS-validated fixed version, and non-FIPS users are unaffected.
pkgRelease := release
if isFIPSPackage(pkg) {
pkgRelease += "-FIPS"
}
advisories, err := s.vs.Get(db.GetParams{
Release: osVer,
Release: pkgRelease,
PkgName: pkg.SrcName,
})
if err != nil {
Expand Down Expand Up @@ -164,6 +173,20 @@ func (s *Scanner) IsSupportedVersion(ctx context.Context, osFamily ftypes.OSType
return osver.Supported(ctx, s.eolDates, osFamily, osVer)
}

// isFIPSPackage reports whether a package is a FIPS-validated build, based on
// the FIPS marker Ubuntu adds to the package version (e.g. "3.0.2-0ubuntu1.17+Fips1").
// Such packages are fixed on Ubuntu's FIPS streams and must be matched against
// the dedicated "<version>-FIPS" bucket rather than the regular release bucket.
func isFIPSPackage(pkg ftypes.Package) bool {
for _, v := range []string{utils.FormatVersion(pkg), utils.FormatSrcVersion(pkg)} {
v = strings.ToLower(v)
if strings.Contains(v, "+fips") || strings.Contains(v, ".fips.") {
return true
}
}
return false
}

// versionFromEolDates checks if actual (not ESM) version is not outdated
func (s *Scanner) versionFromEolDates(ctx context.Context, osVer string) string {
if _, ok := s.eolDates[osVer]; ok {
Expand Down
59 changes: 59 additions & 0 deletions pkg/detector/ospkg/ubuntu/ubuntu_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,65 @@ func TestScanner_Detect(t *testing.T) {
},
},
},
{
name: "FIPS package is matched against the FIPS bucket",
fixtures: []string{
"testdata/fixtures/ubuntu.yaml",
"testdata/fixtures/data-source.yaml",
},
args: args{
osVer: "20.04",
pkgs: []ftypes.Package{
{
Name: "openssl",
Version: "3.0.2-0ubuntu1.17+Fips1",
SrcName: "openssl",
SrcVersion: "3.0.2-0ubuntu1.17+Fips1",
Layer: ftypes.Layer{
DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
},
},
},
},
want: []types.DetectedVulnerability{
{
PkgName: "openssl",
VulnerabilityID: "CVE-2099-FIPS",
InstalledVersion: "3.0.2-0ubuntu1.17+Fips1",
FixedVersion: "3.0.2-0ubuntu1.17+Fips2",
Layer: ftypes.Layer{
DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
},
DataSource: &dbTypes.DataSource{
ID: vulnerability.Ubuntu,
Name: "Ubuntu CVE Tracker",
URL: "https://git.launchpad.net/ubuntu-cve-tracker",
},
},
},
},
{
name: "non-FIPS package does not match the FIPS bucket",
fixtures: []string{
"testdata/fixtures/ubuntu.yaml",
"testdata/fixtures/data-source.yaml",
},
args: args{
osVer: "20.04",
pkgs: []ftypes.Package{
{
Name: "openssl",
Version: "3.0.2-0ubuntu1.17",
SrcName: "openssl",
SrcVersion: "3.0.2-0ubuntu1.17",
Layer: ftypes.Layer{
DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
},
},
},
},
want: nil,
},
{
name: "broken bucket",
fixtures: []string{
Expand Down
Loading