Skip to content

ROX-13435: fix RHELv2 updates #1012

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

Merged
merged 1 commit into from
Nov 10, 2022
Merged

ROX-13435: fix RHELv2 updates #1012

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
1 change: 1 addition & 0 deletions cmd/updater/diffdumps/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ type config struct {
KeepUnusedRHELv2CPEs bool `json:"keepUnusedRHELv2CPEs"`
UseLegacyUbuntuCVEURLPrefix bool `json:"useLegacyUbuntuCVEURLPrefix"`
UseLegacyAlpineCVEURLPrefix bool `json:"useLegacyAlpineCVEURLPrefix"`
UseLegacyRHELv2PackageInfos bool `json:"useLegacyRHELv2PackageInfos"`
}

// Command defines the diff-dumps command.
Expand Down
31 changes: 21 additions & 10 deletions cmd/updater/diffdumps/rhelv2_diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,29 @@ import (
)

//nolint:staticcheck
func processRHELv2Vulnerability(v *database.RHELv2Vulnerability) {
func processHeadRHELv2Vulnerability(cfg config, v *database.RHELv2Vulnerability) {
// PackageInfos is deprecated, so it is no longer populated.
// However, we need to ensure we diff correctly with older genesis dumps
// which populate this field. We simply convert each RHELv2PackageInfo
// into its respective RHELv2Package.
for _, pkgInfo := range v.PackageInfos {
for _, pkg := range pkgInfo.Packages {
pkg.FixedInVersion = pkgInfo.FixedInVersion
pkg.ArchOperation = pkgInfo.ArchOperation
v.Packages = append(v.Packages, pkg)
// which do populate this field.
// We simply convert each RHELv2Package into its respective RHELv2PackageInfo.
if cfg.UseLegacyRHELv2PackageInfos {
for _, pkg := range v.Packages {
pkgInfo := &database.RHELv2PackageInfo{
FixedInVersion: pkg.FixedInVersion,
ArchOperation: pkg.ArchOperation,
}

// Set these fields to their defaults, to minimize space.
pkg.FixedInVersion = ""
pkg.ArchOperation = 0

pkgInfo.Packages = append(pkgInfo.Packages, pkg)

v.PackageInfos = append(v.PackageInfos, pkgInfo)
}

v.Packages = nil
}
v.PackageInfos = nil
}

func generateRHELv2Diff(cfg config, outputDir string, baseLastModifiedTime time.Time, baseF, headF *zip.File, rhelExists bool) error {
Expand Down Expand Up @@ -78,7 +88,6 @@ func generateRHELv2Diff(cfg config, outputDir string, baseLastModifiedTime time.

baseVulnsMap := make(map[string]*database.RHELv2Vulnerability, len(baseRHEL.Vulns))
for _, vuln := range baseRHEL.Vulns {
processRHELv2Vulnerability(vuln)
if _, ok := baseVulnsMap[vuln.Name]; ok {
// Should really never happen, but being defensive.
return errors.Errorf("UNEXPECTED: got multiple vulns for key: %s", vuln.Name)
Expand All @@ -88,6 +97,8 @@ func generateRHELv2Diff(cfg config, outputDir string, baseLastModifiedTime time.

var filtered []*database.RHELv2Vulnerability
for _, headVuln := range rhel.Vulns {
processHeadRHELv2Vulnerability(cfg, headVuln)

matchingBaseVuln, found := baseVulnsMap[headVuln.Name]
// If the vuln was not in the base, add it.
if !found {
Expand Down
50 changes: 40 additions & 10 deletions image/scanner/dump/genesis_manifests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"useDPKGParserForAlpine": true,
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true
}
},
{
Expand All @@ -36,7 +37,8 @@
"useDPKGParserForAlpine": true,
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true
}
},
{
Expand All @@ -52,7 +54,8 @@
"useDPKGParserForAlpine": true,
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true
}
},
{
Expand All @@ -68,7 +71,8 @@
"useDPKGParserForAlpine": true,
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true
}
},
{
Expand All @@ -84,7 +88,8 @@
"useDPKGParserForAlpine": true,
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true
}
},
{
Expand All @@ -100,7 +105,8 @@
"useDPKGParserForAlpine": true,
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true
}
},
{
Expand All @@ -116,7 +122,8 @@
"useDPKGParserForAlpine": true,
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true
}
},
{
Expand All @@ -132,7 +139,8 @@
"useDPKGParserForAlpine": true,
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true
}
},
{
Expand All @@ -148,7 +156,8 @@
"useDPKGParserForAlpine": true,
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true
}
},
{
Expand All @@ -164,7 +173,8 @@
"useDPKGParserForAlpine": true,
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true
}
},
{
Expand All @@ -179,6 +189,7 @@
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -193,6 +204,7 @@
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -207,6 +219,7 @@
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -221,6 +234,7 @@
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -235,6 +249,7 @@
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -248,6 +263,7 @@
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -259,6 +275,7 @@
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -270,6 +287,7 @@
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -281,6 +299,7 @@
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -292,6 +311,7 @@
"keepUnusedRHELv2CPEs": true,
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -302,6 +322,7 @@
"config": {
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -312,6 +333,7 @@
"config": {
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -322,6 +344,7 @@
"config": {
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -332,6 +355,7 @@
"config": {
"useLegacyUbuntuCVEURLPrefix": true,
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -341,6 +365,7 @@
"uuid": "76920bf9-d0d2-47cd-9d53-ae4943edc02a",
"config": {
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -350,6 +375,7 @@
"uuid": "4d2f8c67-af86-443e-9c21-58261672f262",
"config": {
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -359,6 +385,7 @@
"uuid": "90ed7d2d-7839-4f65-93fb-e56f37a62224",
"config": {
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -368,6 +395,7 @@
"uuid": "56f8939b-653c-468c-8114-ff8a009d67cd",
"config": {
"useLegacyAlpineCVEURLPrefix": true,
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -376,6 +404,7 @@
"timestamp": "2022-07-07T00:19:50.023423474Z",
"uuid": "b36af074-8f40-4221-a4f6-b96d05d177dd",
"config": {
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
},
Expand All @@ -384,6 +413,7 @@
"timestamp": "2022-09-08T18:34:29.343211144Z",
"uuid": "f81dbc6b-5899-433b-bc86-9127219a9d89",
"config": {
"useLegacyRHELv2PackageInfos": true,
"ignoreIstioVulns": true
}
}
Expand Down