Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ impl VulnerabilityAdvisoryHead {
}
}
pub async fn from_entities<C: ConnectionTrait>(
vulnerability: &vulnerability::Model,
vuln_advisories: &[advisory::Model],
vuln_cvss3s: &[cvss3::Model],
tx: &C,
Expand All @@ -98,7 +97,7 @@ impl VulnerabilityAdvisoryHead {
// filter all vulnerability cvss3 to those that pertain to only this advisory.
let cvss3 = vuln_cvss3s
.iter()
.filter(|e| e.vulnerability_id == vulnerability.id)
.filter(|e| e.advisory_id == advisory.id)
.collect::<Vec<_>>();

let score = if cvss3.is_empty() {
Expand Down
9 changes: 2 additions & 7 deletions modules/fundamental/src/vulnerability/model/summary.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,8 @@ impl VulnerabilitySummary {
.await?,
average_severity: vuln.base_severity.map(|s| s.into()),
average_score: vuln.base_score,
advisories: VulnerabilityAdvisoryHead::from_entities(
vuln,
advisories,
vuln_cvss3s,
tx,
)
.await?,
advisories: VulnerabilityAdvisoryHead::from_entities(advisories, vuln_cvss3s, tx)
.await?,
});
}

Expand Down
15 changes: 15 additions & 0 deletions modules/fundamental/src/vulnerability/service/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,21 @@ async fn vulnerability_queries(ctx: &TrustifyContext) -> Result<(), anyhow::Erro
assert_eq!(vulns.items[0].average_score, Some(6.9));
assert_eq!(vulns.items[0].average_severity, Some(Severity::Medium));

let vulns = service
.fetch_vulnerabilities(
q("CVE-2023-39325"),
Paginated::default(),
Default::default(),
&ctx.db,
)
.await?;
assert_eq!(1, vulns.items.len());
assert_eq!(2, vulns.items[0].advisories.len());
assert_eq!(vulns.items[0].advisories[0].score, Some(7.5));
assert_eq!(vulns.items[0].advisories[0].severity, Some(Severity::High));
assert_eq!(vulns.items[0].advisories[1].score, None);
assert_eq!(vulns.items[0].advisories[1].severity, None);

Ok(())
}

Expand Down