rhel: add csaf/vex updater #1165

crozzy · 2023-11-29T22:08:46Z

TODO

codecov · 2023-11-29T22:17:37Z

Codecov Report

Attention: Patch coverage is 58.13953% with 270 lines in your changes missing coverage. Please review.

Project coverage is 55.35%. Comparing base (a3c7415) to head (8172e8b).
Report is 6 commits behind head on main.

Files	Patch %	Lines
rhel/vex/fetcher.go	53.16%	62 Missing and 49 partials ⚠️
rhel/vex/parser.go	64.56%	85 Missing and 22 partials ⚠️
rhel/vex/updater.go	53.73%	27 Missing and 4 partials ⚠️
rhel/matcherfactory.go	0.00%	14 Missing ⚠️
rhel/matcher.go	65.00%	6 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1165      +/-   ##
==========================================
+ Coverage   55.25%   55.35%   +0.10%     
==========================================
  Files         278      282       +4     
  Lines       17199    17834     +635     
==========================================
+ Hits         9503     9872     +369     
- Misses       6738     6928     +190     
- Partials      958     1034      +76

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

rhel/vex/fetcher.go

rhel/vex/parser.go

crozzy · 2024-07-26T21:11:21Z

@RTann 1d2ccd3 comments are addressed in this fixup or in-line

hdonnay · 2024-07-30T20:07:31Z

rhel/matcher.go

+// as a CPE match expression, and to be considered vulnerable,
+// the relationship between claircore.IndexRecord.Repository.CPE and
+// the claircore.Vulnerability.Repo.CPE needs to be a CPE Name Comparison
+// Relation of SUBSET(⊂)(source is a subset of, or equal to the target).


Should be ⊇ (or the spec SUPERSET) -- "Source is a superset or equal to the target"

rhel/matcher.go

rhel/vex/updater.go

rhel/matcher_test.go

RTann · 2024-08-05T23:56:40Z

rhel/vex/fetcher.go

+			// Here we are construct new-line-delimited JSON by first compacting the
+			// JSON from the file, writing a newline to the bc buf and appending the
+			// compacted JSON, and finally writing all those bytes to the snappy.Writer.


Suggested change

// Here we are construct new-line-delimited JSON by first compacting the

// JSON from the file, writing a newline to the bc buf and appending the

// compacted JSON, and finally writing all those bytes to the snappy.Writer.

// Here we construct new-line-delimited JSON by first compacting the

// JSON from the file, writing a newline to the bc buf and appending the

// compacted JSON, and finally writing all those bytes to the snappy.Writer.

Also I think the ordering here is incorrect. First the compacted JSON is written, then the newline

rhel/vex/fetcher.go

RTann · 2024-08-06T00:08:59Z

rhel/vex/parser.go

+// DeltaParse implements [driver.DeltaUpdater].
+func (u *Updater) DeltaParse(ctx context.Context, contents io.ReadCloser) ([]*claircore.Vulnerability, []string, error) {
+	ctx = zlog.ContextWithValues(ctx, "component", "rhel/vex/Updater.DeltaParse")
+	// This map is needed for deduplication purposes, the compressed CSAF data maybe include


Suggested change

// This map is needed for deduplication purposes, the compressed CSAF data maybe include

// This map is needed for deduplication purposes, the compressed CSAF data may include

rhel/vex/parser.go

Replace the Red Hat OVALv2 update source with the Red Hat CSAF/VEX data. Signed-off-by: crozzy <joseph.crosland@gmail.com>

Start matching repository CPEs based on the CPE subset relation. This change interprets VEX CPEs identifying Red Hat repositories as CPE matching expressions and looks for a subset relation with the record's repositoty CPE. This change also introduces a fallback to deal with CPEs in the VEX data that are expected to describe a subset relationship but don't use the correct matching syntax, in these cases matching is done with a crude string prefix match. Signed-off-by: crozzy <joseph.crosland@gmail.com>

Previously the IgnoreUnpatched config key was a part of the RHEL updater and would dictate whether or not the updater would ingest unpatched vulnerabilities. This change moves that key to the RHEL matcher and dictates whether the matcher should check for a fixed_in_version when querying potential vulnerabilities. This makes the config option more usable at the expense of DB size. Signed-off-by: crozzy <joseph.crosland@gmail.com>

Given that the rhel-vex data will be responsible for Red Hat vulnerabilities we no longer want the existing OVAL updater to be a default (or even selectable). This patch also removes existing RHEL OVAL data from the matcher DB. Signed-off-by: crozzy <joseph.crosland@gmail.com>

crozzy · 2024-08-14T17:17:26Z

@RTann I can't reply in-line to this comment

out of curiosity, if we were to decide to change this date, would there be any issues related to deleting old entries out-of-the-box? For example, if this were moved to 2015? Or perhaps even earlier? Would any special care be required (a new migration step)?

Yes, we can move it, if you're going earlier you shouldn't need to change anything, if you're going later and you want earlier vulns to not be available for matching anymore you can iterate the version (updaterVersion), then vulns should shuffle off the GC coil.

RTann · 2024-08-17T02:36:30Z

rhel/vex/parser.go

+			links := []string{}
+			for _, r := range v.References {
+				links = append(links, r.URL)
+			}


I'm referring to this "self" under vulnerabilities.references:

"references": [ { "category": "self", "summary": "Canonical URL", "url": "https://access.redhat.com/security/cve/CVE-2024-3727" }, { "category": "external", "summary": "RHBZ#2274767", "url": "https://bugzilla.redhat.com/show_bug.cgi?id=2274767" },

not sure if it's guaranteed to be first, but it's definitely the one users will care about most. Though, that can just be the client's problem to fetch it, if that's the one they want (for example StackRox can just search for the link prefixed with https://access.redhat.com/security/cve/CVE-

hdonnay

LGTM

crozzy force-pushed the csaf-vex branch from 6c09465 to a3be9dd Compare November 29, 2023 22:12

crozzy force-pushed the csaf-vex branch from a3be9dd to a345799 Compare November 30, 2023 21:59

crozzy force-pushed the csaf-vex branch 7 times, most recently from a834c67 to 0c787f2 Compare December 21, 2023 22:36

crozzy force-pushed the csaf-vex branch 7 times, most recently from 758d6a4 to fbfbf82 Compare January 4, 2024 20:04

crozzy force-pushed the csaf-vex branch 4 times, most recently from 89006e1 to 4deb036 Compare January 25, 2024 17:59

crozzy force-pushed the csaf-vex branch 5 times, most recently from 12e41cb to 052599d Compare February 2, 2024 22:42

hdonnay reviewed Feb 5, 2024

View reviewed changes

rhel/vex/fetcher.go Outdated Show resolved Hide resolved

hdonnay reviewed Feb 5, 2024

View reviewed changes

rhel/vex/fetcher.go Outdated Show resolved Hide resolved

hdonnay reviewed Feb 5, 2024

View reviewed changes

rhel/vex/parser.go Outdated Show resolved Hide resolved

crozzy force-pushed the csaf-vex branch from 9d9e53a to cb43f01 Compare February 5, 2024 21:47

crozzy force-pushed the csaf-vex branch 2 times, most recently from 7d90161 to a5d8a67 Compare July 26, 2024 20:51

crozzy requested a review from RTann July 26, 2024 21:09

crozzy force-pushed the csaf-vex branch 6 times, most recently from 272c600 to 7b20cac Compare July 29, 2024 22:10

hdonnay reviewed Jul 30, 2024

View reviewed changes

crozzy force-pushed the csaf-vex branch 5 times, most recently from d43b87e to ea4747f Compare August 2, 2024 21:00

RTann reviewed Aug 6, 2024

View reviewed changes

crozzy force-pushed the csaf-vex branch from ea4747f to fbc9d09 Compare August 14, 2024 14:31

crozzy added 4 commits August 14, 2024 10:10

rhel: add csaf/vex updater

8b8330e

Replace the Red Hat OVALv2 update source with the Red Hat CSAF/VEX data. Signed-off-by: crozzy <joseph.crosland@gmail.com>

crozzy force-pushed the csaf-vex branch from fbc9d09 to 8172e8b Compare August 14, 2024 17:10

crozzy requested review from hdonnay and RTann August 14, 2024 19:17

RTann approved these changes Aug 17, 2024

View reviewed changes

hdonnay approved these changes Aug 19, 2024

View reviewed changes

crozzy merged commit daaf5fd into quay:main Aug 19, 2024
8 checks passed

crozzy removed the needs-changelog Label for PRs that need a changelog note. label Aug 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rhel: add csaf/vex updater #1165

rhel: add csaf/vex updater #1165

crozzy commented Nov 29, 2023 •

edited

Loading

codecov bot commented Nov 29, 2023 •

edited

Loading

crozzy commented Jul 26, 2024

hdonnay Jul 30, 2024

RTann Aug 5, 2024

RTann Aug 6, 2024

crozzy Aug 14, 2024

crozzy commented Aug 14, 2024

RTann Aug 17, 2024

hdonnay left a comment

	// This map is needed for deduplication purposes, the compressed CSAF data maybe include
	// This map is needed for deduplication purposes, the compressed CSAF data may include

rhel: add csaf/vex updater #1165

rhel: add csaf/vex updater #1165

Conversation

crozzy commented Nov 29, 2023 • edited Loading

codecov bot commented Nov 29, 2023 • edited Loading

Codecov Report

crozzy commented Jul 26, 2024

hdonnay Jul 30, 2024

Choose a reason for hiding this comment

RTann Aug 5, 2024

Choose a reason for hiding this comment

RTann Aug 6, 2024

Choose a reason for hiding this comment

crozzy Aug 14, 2024

Choose a reason for hiding this comment

crozzy commented Aug 14, 2024

RTann Aug 17, 2024

Choose a reason for hiding this comment

hdonnay left a comment

Choose a reason for hiding this comment

crozzy commented Nov 29, 2023 •

edited

Loading

codecov bot commented Nov 29, 2023 •

edited

Loading