Skip to content

Commit b15259a

Browse files
committed
fix: merged main again
2 parents 5ab2e0f + 2380e5b commit b15259a

41 files changed

Lines changed: 469 additions & 1012 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

seo-check.config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"src/pages/vulnerability-database.mdx",
99
"src/pages/comparison/index.md",
1010
"src/pages/how-to-guides/vexing/vexing-debian-packages.md",
11-
"src/pages/explanations/sbom-problem-statement.md",
1211
"src/pages/other/**",
1312
"src/pages/reference/scanner/**",
1413
"src/pages/reference/gitlab-components/**",
-31.5 KB
Binary file not shown.
-63.3 KB
Binary file not shown.
-210 KB
Binary file not shown.
-35 KB
Binary file not shown.

src/assets/advisory-list-page.png

-229 KB
Binary file not shown.

src/components/vulnerability-database/cve-detail/RelatedCVEsCard.tsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ interface Props {
88
}
99

1010
const GROUP_LABEL: Record<string, string> = {
11-
aliases: 'Alias',
11+
alias: 'Alias',
1212
upstream: 'Upstream',
1313
advisory: 'Advisory',
1414
}
@@ -20,10 +20,9 @@ const dateOptions: Intl.DateTimeFormatOptions = {
2020
}
2121

2222
export default function RelatedCVEsCard({ related }: Props) {
23-
const groups = (['aliases', 'upstream'] as const)
23+
const groups = (['alias', 'upstream'] as const)
2424
.map((key) => ({ key, items: related?.[key] ?? [] }))
2525
.filter((group) => group.items.length > 0)
26-
2726
if (groups.length === 0) return null
2827

2928
return (
@@ -35,7 +34,7 @@ export default function RelatedCVEsCard({ related }: Props) {
3534
<ul className="flex flex-col gap-1">
3635
{groups.flatMap(({ key, items }) =>
3736
items.map((cve) => {
38-
const exists = 'exists' in cve ? cve.exists : true
37+
const exists = cve.description !== ""
3938
const content = (
4039
<div className="min-w-0">
4140
<span
@@ -49,12 +48,10 @@ export default function RelatedCVEsCard({ related }: Props) {
4948
{cve.description}
5049
</p>
5150
)}
52-
<div className="mt-1 flex flex-wrap items-center gap-1 gap-y-0.5 text-xs text-muted-foreground">
51+
<div className="mt-1 flex flex-wrap items-center gap-y-0.5 text-xs text-muted-foreground">
5352
{GROUP_LABEL[key] ?? key}
5453
{typeof cve.epss === 'number' && (
55-
<span>
56-
EPSS {(cve.epss * 100).toFixed(1)}%
57-
</span>
54+
<span>, EPSS {(cve.epss * 100).toFixed(2)}%</span>
5855
)}
5956
</div>
6057
</div>

src/components/vulnerability-database/cve-detail/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ export interface CVEData {
1919
related?: {
2020
advisory?: CVEData[]
2121
upstream?: RelatedCVE[]
22-
aliases?: RelatedCVE[]
22+
alias?: RelatedCVE[]
2323
}
2424
}
2525

2626
/** A related CVE, annotated with whether it exists in the DevGuard database (and can be linked to). */
27-
export type RelatedCVE = CVEData & { exists: boolean }
27+
export type RelatedCVE = CVEData
2828

2929
export const LABEL_CLASS =
3030
'text-muted-foreground font-mono text-xs tracking-wider uppercase'

src/nix-tests/run-test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ EXAMPLE_REPO_DIR="$TMP_DIR/example-repository"
1111
MDX_FILES=(
1212
"src/pages/getting-started/first-scan.mdx"
1313
"src/pages/contributing/getting-started.mdx"
14-
"src/pages/explanations/explaining-sboms.mdx"
1514
"src/pages/how-to-guides/scanning/upload-vex.mdx"
1615
)
1716

src/pages/explanations/_meta.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ export default {
1515
title: 'Attestations & Provenance',
1616
},
1717
'personal-access-token': { title: 'Personal Access Tokens' },
18-
'sbom-problem-statement': { title: 'SBOM Problem Statement' },
1918
'supplementary-sboms': { title: 'Supplementary SBOMs' },
20-
'explaining-sboms': { title: 'Explaining SBOMs' },
2119
'transitive-dependencies': { title: 'Transitive Dependencies' },
2220
security: { title: 'Security' },
2321
integrations: { title: 'Integrations' },

0 commit comments

Comments
 (0)