Skip to content

vex: only check vendor_fix remediations #1904

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
crozzy wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −18
Open

vex: only check vendor_fix remediations #1904

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
15 changes: 11 additions & 4 deletions rhel/vex/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,20 @@ func newRemediationIndex() *remediationIndex {
}

// PopulateRemediations is the populate function for a remediationIndex.
//
// Only vendor_fix remediations are indexed, as these are the entries that carry
// RHSA URLs.
func populateRemediations(m map[string]*csaf.RemediationData, doc *csaf.CSAF) {
for i := range doc.Vulnerabilities {
v := &doc.Vulnerabilities[i]
for i := range v.Remediations {
r := &v.Remediations[i]
for j := range doc.Vulnerabilities[i].Remediations {
r := &doc.Vulnerabilities[i].Remediations[j]
if r.Category != "vendor_fix" {
continue
}
for _, id := range r.ProductIDs {
m[id] = r
if _, exists := m[id]; !exists {
m[id] = r
}
}
}
}
Expand Down
30 changes: 16 additions & 14 deletions rhel/vex/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@ func (p *Parser) parseDoc(ctx context.Context, doc []byte) (string, []*claircore
}
}
}
links = append(links, creator.docLink)
if creator.docLink != "" {
links = append(links, creator.docLink)
}

var desc string
for _, n := range v.Notes {
Expand Down Expand Up @@ -736,9 +738,9 @@ func (c *creator) knownAffectedVulnerabilities(ctx context.Context, v *csaf.Vuln
vuln.Repo = c.rc.Get(st.WFN, repoKey)
}

// Append VEX product ID as URL fragment to the last link for downstream comparison.
if vuln.Links != "" {
vuln.Links = vuln.Links + "#" + url.PathEscape(st.ID)
// Embed VEX product ID as a URL fragment on the VEX document self-link for downstream comparison.
if c.docLink != "" {
vuln.Links = strings.Replace(vuln.Links, c.docLink, c.docLink+"#"+url.PathEscape(st.ID), 1)
}
}

Expand Down Expand Up @@ -879,14 +881,14 @@ func (c *creator) fixedVulnerabilities(ctx context.Context, v *csaf.Vulnerabilit
default:
panic("unreachable")
}
// Find remediations and add RHSA URL to links.
// Embed VEX product ID as a URL fragment on the VEX document self-link for downstream comparison.
if c.docLink != "" {
vuln.Links = strings.Replace(vuln.Links, c.docLink, c.docLink+"#"+url.PathEscape(st.ID), 1)
}
// Append RHSA URL after the VEX self-link.
if rem := st.Remediation; rem != nil {
vuln.Links = vuln.Links + " " + rem.URL
}
// Append VEX product ID as URL fragment to the last link for downstream comparison.
if vuln.Links != "" {
vuln.Links = vuln.Links + "#" + url.PathEscape(st.ID)
}

commit(key, vuln)
}
Expand Down Expand Up @@ -993,14 +995,14 @@ func (c *creator) knownNotAffectedVulnerabilities(ctx context.Context, v *csaf.V
default:
panic("unreachable")
}
// Find remediations and add RHSA URL to links.
// Embed VEX product ID as a URL fragment on the VEX document self-link for downstream comparison.
if c.docLink != "" {
vuln.Links = strings.Replace(vuln.Links, c.docLink, c.docLink+"#"+url.PathEscape(st.ID), 1)
}
// Append RHSA URL after the VEX self-link.
if rem := st.Remediation; rem != nil {
vuln.Links = vuln.Links + " " + rem.URL
}
// Append VEX product ID as URL fragment to the last link for downstream comparison.
if vuln.Links != "" {
vuln.Links = vuln.Links + "#" + url.PathEscape(st.ID)
}

commit(key, vuln)
}
Expand Down
Loading