Skip to content
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

fix: get source pkg from installed nevra for unfixed cves #88

Merged
merged 3 commits into from
Dec 4, 2024
Merged

fix: get source pkg from installed nevra for unfixed cves #88

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
b10712a
fix: get source pkg from installed nevra for unfixed cves
psegedy Dec 2, 2024
dedafda
fix: don't process same name ids multiple times
psegedy Dec 2, 2024
262f62d
fix: remove unused nameID2SrcNameIDs map
psegedy Dec 2, 2024
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: 2 additions & 3 deletions vmaas/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ type Cache struct {

ArchCompat map[ArchID]map[ArchID]bool

PackageDetails map[PkgID]PackageDetail
Nevra2PkgID map[Nevra]PkgID
NameID2SrcNameIDs map[NameID]map[NameID]struct{}
PackageDetails map[PkgID]PackageDetail
Nevra2PkgID map[Nevra]PkgID

RepoIDs []RepoID
RepoDetails map[RepoID]RepoDetail
Expand Down
12 changes: 0 additions & 12 deletions vmaas/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,6 @@ func loadPkgDetails(c *Cache) {
id2pkdDetail := make(map[PkgID]PackageDetail, cnt)
nevra2id := make(map[Nevra]PkgID, cnt)
srcPkgID2PkgID := make(map[PkgID][]PkgID, cntSrc)
nameID2SrcNameIDs := make(map[NameID]map[NameID]struct{})
var pkgID PkgID
for rows.Next() {
var det PackageDetail
Expand All @@ -343,16 +342,6 @@ func loadPkgDetails(c *Cache) {
continue
}

var srcNameID NameID
row := sqlDB.QueryRow("SELECT name_id FROM package_detail WHERE id = ?", *det.SrcPkgID)
if err := row.Scan(&srcNameID); err != nil {
panic(err)
}
if _, ok := nameID2SrcNameIDs[det.NameID]; !ok {
nameID2SrcNameIDs[det.NameID] = make(map[NameID]struct{})
}
nameID2SrcNameIDs[det.NameID][srcNameID] = struct{}{}

_, ok := srcPkgID2PkgID[*det.SrcPkgID]
if !ok {
srcPkgID2PkgID[*det.SrcPkgID] = []PkgID{}
Expand All @@ -365,7 +354,6 @@ func loadPkgDetails(c *Cache) {
c.PackageDetails = id2pkdDetail
c.Nevra2PkgID = nevra2id
c.SrcPkgID2PkgID = srcPkgID2PkgID
c.NameID2SrcNameIDs = nameID2SrcNameIDs
}

func loadRepoDetails(c *Cache) { //nolint: funlen
Expand Down
42 changes: 32 additions & 10 deletions vmaas/vulnerabilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,17 +219,20 @@ func (r *ProcessedRequest) processProducts(c *Cache, opts *options) []ProductsPa
productsPackages := make([]ProductsPackage, 0)
for _, pkg := range r.Packages {
nameID := c.Packagename2ID[pkg.Nevra.Name]
products := cpes2products(c, r.Cpes, nameID, r.Updates.ModuleList, pkg, opts)
evrID := c.Evr2ID[utils.Evr{Epoch: pkg.Nevra.Epoch, Release: pkg.Nevra.Release, Version: pkg.Nevra.Version}]
archID := c.Arch2ID[pkg.Nevra.Arch]
pkgID := c.Nevra2PkgID[Nevra{NameID: nameID, EvrID: evrID, ArchID: archID}]
products := cpes2products(c, r.Cpes, nameID, pkgID, r.Updates.ModuleList, pkg, opts)
if opts.newerReleaseverCsaf && len(r.Cpes) > 0 {
// look at newer releasever cpes only when there is a CPE hit for EUS repo
newerReleaseverProducts := cpes2products(c, r.NewerReleaseverCpes, nameID, r.Updates.ModuleList, pkg, opts)
newerReleaseverProducts := cpes2products(c, r.NewerReleaseverCpes, nameID, pkgID, r.Updates.ModuleList, pkg, opts)
products.ProductsFixed = append(products.ProductsFixed, newerReleaseverProducts.ProductsFixed...)
products.ProductsUnfixed = append(products.ProductsUnfixed, newerReleaseverProducts.ProductsUnfixed...)
}

if len(r.Cpes) == 0 {
// use CPEs from Content Sets if we haven't found any Cpes from repos
products = cpes2products(c, r.ContentSetsCpes, nameID, r.Updates.ModuleList, pkg, opts)
products = cpes2products(c, r.ContentSetsCpes, nameID, pkgID, r.Updates.ModuleList, pkg, opts)
}
productsPackages = append(productsPackages, products)
}
Expand Down Expand Up @@ -362,26 +365,45 @@ func productWithFixedCVEs(c *Cache, cpe CpeID, nameID NameID, modules []ModuleSt
return products, ok
}

func cpes2products(c *Cache, cpes []CpeID, nameID NameID, modules []ModuleStream, pkg NevraString,
func cpes2products(c *Cache, cpes []CpeID, nameID NameID, pkgID PkgID, modules []ModuleStream, pkg NevraString,
opts *options,
) ProductsPackage {
productsUnfixed := make([]CSAFProduct, 0, len(cpes)*(len(modules)+1))
productsFixed := make([]CSAFProduct, 0, len(cpes))
// add empty module to module list to find affected products without modules
modules = append(modules, ModuleStream{})
for _, cpe := range cpes {
seenNameIDs := make(map[NameID]bool)
// create unfixed products for every CPE, unfixed product has PackageID=0
for srcNameID := range c.NameID2SrcNameIDs[nameID] {
srcName := c.ID2Packagename[srcNameID]
if opts.excludedPackages[srcName] {
continue
}
productsUnfixed = append(productsUnfixed, productsWithUnfixedCVEs(c, cpe, srcNameID, modules)...)
pkgDetail := c.PackageDetails[pkgID]
srcNameID := pkgDetail.NameID
if pkgDetail.SrcPkgID != nil {
srcPkgDetail := c.PackageDetails[*pkgDetail.SrcPkgID]
srcNameID = srcPkgDetail.NameID
}

if seenNameIDs[nameID] || seenNameIDs[srcNameID] {
continue
}

srcName := c.ID2Packagename[srcNameID]
if opts.excludedPackages[srcName] {
seenNameIDs[srcNameID] = true
continue
}
productsUnfixed = append(productsUnfixed, productsWithUnfixedCVEs(c, cpe, srcNameID, modules)...)
if srcNameID != nameID {
// find unfixed products for installed package name not name of source package in case CSAF
// shows vulnerability for package name and not source package name
productsUnfixed = append(productsUnfixed, productsWithUnfixedCVEs(c, cpe, nameID, modules)...)
}

// create fixed products for every CPE
if products, ok := productWithFixedCVEs(c, cpe, nameID, modules); ok {
productsFixed = append(productsFixed, products...)
}
seenNameIDs[srcNameID] = true
seenNameIDs[nameID] = true
}
pp := ProductsPackage{
ProductsFixed: productsFixed,
Expand Down
17 changes: 9 additions & 8 deletions vmaas/vulnerabilities_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ func TestCSAF(t *testing.T) {
unfixed := CSAFProduct{CpeID: 1, PackageNameID: 1}
fixed1 := CSAFProduct{CpeID: 1, PackageNameID: 1, PackageID: 1}
fixed2 := CSAFProduct{CpeID: 2, PackageNameID: 1, PackageID: 2}
var one PkgID = 1

c := Cache{
Arch2ID: map[string]ArchID{"x86_64": 1},
Expand All @@ -35,13 +36,9 @@ func TestCSAF(t *testing.T) {
{NameID: 2, EvrID: 1, ArchID: 1}: 3,
},
PackageDetails: map[PkgID]PackageDetail{
1: {NameID: 1, EvrID: 1, ArchID: 1}, // kernel-0:1-1
2: {NameID: 1, EvrID: 2, ArchID: 1}, // kernel-0:2-2
3: {NameID: 2, EvrID: 1, ArchID: 1}, // kernel-devel-0:1-1
},
NameID2SrcNameIDs: map[NameID]map[NameID]struct{}{
1: {1: struct{}{}},
2: {1: struct{}{}},
1: {NameID: 1, EvrID: 1, ArchID: 1, SrcPkgID: nil}, // kernel-0:1-1
2: {NameID: 1, EvrID: 2, ArchID: 1, SrcPkgID: nil}, // kernel-0:2-2
3: {NameID: 2, EvrID: 1, ArchID: 1, SrcPkgID: &one}, // kernel-devel-0:1-1
},
CSAFCVEs: map[CpeIDNameID]map[CSAFProduct]CSAFCVEs{
{CpeID: 1, NameID: 1}: {
Expand All @@ -58,6 +55,7 @@ func TestCSAF(t *testing.T) {
type expected struct {
pkg NevraString
nameID NameID
pkgID PkgID
fixed []CSAFProduct
unfixed []CSAFProduct
}
Expand All @@ -68,26 +66,29 @@ func TestCSAF(t *testing.T) {
{
pkg: NevraString{Nevra: pkg1, Pkg: pkg1.String()},
nameID: 1,
pkgID: 1,
unfixed: []CSAFProduct{unfixed},
fixed: []CSAFProduct{fixed1, fixed2},
},
{
pkg: NevraString{Nevra: pkg2, Pkg: pkg2.String()},
nameID: 1,
pkgID: 2,
unfixed: []CSAFProduct{unfixed},
fixed: []CSAFProduct{fixed1, fixed2},
},
{
pkg: NevraString{Nevra: pkg3, Pkg: pkg3.String()},
nameID: 2,
pkgID: 3,
unfixed: []CSAFProduct{unfixed},
fixed: []CSAFProduct{},
}, // match source package
}

products := make([]ProductsPackage, 0, len(matrix))
for _, m := range matrix {
pp := cpes2products(&c, []CpeID{1, 2}, m.nameID, []ModuleStream{ms}, m.pkg, &defaultOpts)
pp := cpes2products(&c, []CpeID{1, 2}, m.nameID, m.pkgID, []ModuleStream{ms}, m.pkg, &defaultOpts)
assert.Equal(t, m.fixed, pp.ProductsFixed)
assert.Equal(t, m.unfixed, pp.ProductsUnfixed)
products = append(products, pp)
Expand Down
Loading