cve-lite-cli 1.28.0 → 1.30.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -4
- package/dist/advisory/osv-advisory-source.js +3 -0
- package/dist/cli/help.js +3 -2
- package/dist/cli/validate.js +6 -0
- package/dist/constants.js +1 -0
- package/dist/index.js +50 -7
- package/dist/maintenance/dm001-maintenance-risk.js +74 -15
- package/dist/maintenance/score.js +51 -0
- package/dist/output/formatters.js +21 -8
- package/dist/output/html-reporter.js +133 -12
- package/dist/output/maintenance-findings-html.js +4 -0
- package/dist/output/maintenance-findings-sarif.js +58 -0
- package/dist/output/maintenance-terminal.js +63 -5
- package/dist/output/multi-folder-html-reporter.js +64 -7
- package/dist/output/multi-folder-printer.js +11 -2
- package/dist/output/override-findings-html.js +6 -5
- package/dist/output/override-findings-terminal.js +2 -1
- package/dist/output/printers.js +92 -30
- package/dist/output/sarif.js +23 -7
- package/dist/output/write-outputs.js +4 -1
- package/dist/overrides/detectors/oa001-orphaned-target.js +2 -1
- package/dist/overrides/detectors/oa002-floating-tag.js +2 -1
- package/dist/overrides/detectors/oa003-wrong-section.js +2 -1
- package/dist/overrides/detectors/oa004-surpassed-pin.js +2 -1
- package/dist/overrides/detectors/oa005-nested-ineffective.js +2 -1
- package/dist/overrides/detectors/oa006-coupled-platform-binary.js +2 -1
- package/dist/overrides/detectors/oa007-frozen-latest.js +2 -1
- package/dist/overrides/detectors/oa009-stale-floor.js +2 -1
- package/dist/parsers/bun-lock.js +47 -7
- package/dist/parsers/npm-lock-graph.js +90 -12
- package/dist/parsers/pnpm-lock.js +60 -10
- package/dist/parsers/utils.js +0 -15
- package/dist/parsers/yarn-lock.js +140 -58
- package/dist/remediation/fix-commands.js +43 -12
- package/dist/remediation/npm-registry.js +69 -52
- package/dist/remediation/npm-transitive-resolution.js +5 -6
- package/dist/remediation/package-path-lookup.js +29 -0
- package/dist/remediation/parent-upgrade.js +2 -22
- package/dist/scan/completeness.js +49 -0
- package/dist/scan/multi-folder-scan.js +183 -15
- package/dist/scanner.js +210 -155
- package/dist/usage/scanner.js +12 -2
- package/dist/utils/finding.js +28 -0
- package/dist/utils/fix-runner.js +87 -50
- package/dist/utils/version.js +13 -4
- package/dist/utils/vuln.js +16 -0
- package/package.json +3 -3
|
@@ -3,12 +3,14 @@ import path from "node:path";
|
|
|
3
3
|
import { spawn } from "node:child_process";
|
|
4
4
|
import { serializeFinding, summarizeNextAction, summarizeRisk, formatFixCommandWithPublishDates, formatCooldownWarning } from "./formatters.js";
|
|
5
5
|
import { loadLogoDataUri } from "./logos.js";
|
|
6
|
-
import {
|
|
6
|
+
import { isBreakingUpgrade } from "../utils/version.js";
|
|
7
7
|
import { pluralize } from "../utils/string.js";
|
|
8
|
-
import { MAL_GIT_SOURCE_PINNED_DISPLAY, MAL_GIT_SOURCE_FLOATING_DISPLAY } from "../constants.js";
|
|
8
|
+
import { MAL_GIT_SOURCE_PINNED_DISPLAY, MAL_GIT_SOURCE_FLOATING_DISPLAY, severityOrder } from "../constants.js";
|
|
9
|
+
import { hasMaliciousAdvisory } from "../utils/vuln.js";
|
|
9
10
|
import { renderOverrideFindingsHtml } from "./override-findings-html.js";
|
|
10
11
|
import { renderMaintenanceFindingsHtml } from "./maintenance-findings-html.js";
|
|
11
12
|
import { UNVERIFIED_PARENT_UPGRADE_NOTE } from "../remediation/fix-commands.js";
|
|
13
|
+
import { getCompletenessImpact } from "../scan/completeness.js";
|
|
12
14
|
export function serializeHtmlFinding(finding, plan) {
|
|
13
15
|
return {
|
|
14
16
|
...serializeFinding(finding, plan),
|
|
@@ -31,6 +33,7 @@ export function buildReportData(params) {
|
|
|
31
33
|
skippedDependencies: params.skippedDependencies,
|
|
32
34
|
overrideFindings: params.overrideFindings,
|
|
33
35
|
maintenanceFindings: params.maintenanceFindings,
|
|
36
|
+
completeness: params.completeness,
|
|
34
37
|
};
|
|
35
38
|
}
|
|
36
39
|
export const REPORT_STYLES = `:root{--bg:#0d1117;--surface:#161b22;--surface-hi:#1c2128;--input:#21262d;--border:#30363d;--border-sub:#21262d;--text:#e6edf3;--text-2:#8b949e;--text-3:#6b7280;--link:#58a6ff;--link-h:#79c0ff;--green:#3fb950;--logo-bg:#fff}
|
|
@@ -84,6 +87,15 @@ button.header-link:hover{color:var(--link);border-color:var(--link)}
|
|
|
84
87
|
.skipped-deps{padding:12px 18px;display:flex;flex-direction:column;gap:4px}
|
|
85
88
|
.skipped-deps .skipped-deps-hint{font-size:11px;color:var(--text-2);margin-bottom:4px}
|
|
86
89
|
.skipped-dep{font-size:11px;padding:5px 8px;border-radius:4px;background:var(--bg);border:1px solid var(--border-sub)}
|
|
90
|
+
.dup-pkgs{padding:12px 18px;display:flex;flex-direction:column;gap:10px}
|
|
91
|
+
.dup-pkgs .dup-pkgs-hint{font-size:11px;color:var(--text-2);margin-bottom:2px}
|
|
92
|
+
.dup-pkg{background:var(--bg);border:1px solid var(--border-sub);border-radius:6px;padding:8px 10px}
|
|
93
|
+
.dup-pkg-name{font-size:13px;font-weight:600;color:var(--text);display:flex;align-items:center;gap:8px;margin-bottom:6px}
|
|
94
|
+
.dup-count{font-size:11px;font-weight:500;color:var(--text-2);background:var(--input);border:1px solid var(--border);border-radius:10px;padding:1px 7px}
|
|
95
|
+
.dup-versions{display:flex;flex-direction:column;gap:4px}
|
|
96
|
+
.dup-version{display:flex;align-items:center;gap:8px;font-size:12px;color:var(--text-2)}
|
|
97
|
+
.dup-version .dup-ver{font-family:ui-monospace,SFMono-Regular,Menlo,monospace;color:var(--text)}
|
|
98
|
+
.dup-version .dup-origin{color:var(--text-3)}
|
|
87
99
|
.fix-cmd{display:flex;align-items:center;gap:12px;background:var(--bg);border:1px solid var(--border);border-radius:6px;padding:10px 14px}
|
|
88
100
|
.fix-cmd .cmd-text{flex:1;font-family:'SF Mono','Cascadia Code','Fira Code',monospace;font-size:12px;color:var(--green)}
|
|
89
101
|
.fix-cmd .cmd-meta{font-size:11px;color:var(--text-2);white-space:nowrap}
|
|
@@ -124,6 +136,8 @@ button.header-link:hover{color:var(--link);border-color:var(--link)}
|
|
|
124
136
|
.rel-badge.transitive{color:#e3b341;background:#e3b34122}
|
|
125
137
|
.rel-badge.unknown{color:#8b949e;background:#8b949e22}
|
|
126
138
|
.rel-badge.dev{color:#a371f7;background:#6e40c922;border:1px solid #6e40c955}
|
|
139
|
+
.root-dep{font-size:11px;font-family:monospace;color:var(--text)}
|
|
140
|
+
.root-dep-none{font-size:11px;color:var(--text-3)}
|
|
127
141
|
.cve-link{font-size:11px;color:var(--link);font-family:monospace;text-decoration:none;border-bottom:1px dotted var(--link)}
|
|
128
142
|
.cve-link:hover{color:var(--link-h)}
|
|
129
143
|
.fix-hint{font-size:11px;color:var(--green);font-family:monospace}
|
|
@@ -166,6 +180,12 @@ button.header-link:hover{color:var(--link);border-color:var(--link)}
|
|
|
166
180
|
.fix-target-note{color:var(--text-3);font-style:italic;font-size:10px}
|
|
167
181
|
.fix-target-coverage{flex-basis:100%;color:var(--text-3);font-size:10px;line-height:1.45}
|
|
168
182
|
.chain-proof{font-size:0.78rem;color:var(--text-2);margin-left:6px;font-family:monospace}
|
|
183
|
+
.completeness-banner{margin:16px 32px 0;background:#e3b34111;border:1px solid #e3b34144;border-radius:8px;padding:14px 18px;display:flex;gap:14px;align-items:flex-start}
|
|
184
|
+
.completeness-banner-icon{font-size:22px;flex-shrink:0;line-height:1}
|
|
185
|
+
.completeness-banner-body strong{font-size:13px;color:var(--text);display:block;margin-bottom:4px}
|
|
186
|
+
.completeness-banner-body p{font-size:12px;color:var(--text-2);margin:0}
|
|
187
|
+
.completeness-banner-body ul{margin:8px 0 0;padding:0 0 0 18px;display:flex;flex-direction:column;gap:3px}
|
|
188
|
+
.completeness-banner-body li{font-size:11px;color:var(--text-2);line-height:1.5}
|
|
169
189
|
.break-badge{font-size:10px;font-weight:700;background:#fb850022;color:#fb8500;border:1px solid #fb850066;border-radius:4px;padding:1px 5px}
|
|
170
190
|
.tier-ok{display:inline-flex;align-items:center;gap:4px;font-size:10px;padding:2px 8px;border-radius:4px;background:#3fb95022;color:#3fb950;border:1px solid #3fb95033;margin-bottom:6px}
|
|
171
191
|
.tier-warn{display:inline-flex;align-items:center;gap:4px;font-size:10px;padding:2px 8px;border-radius:4px;background:#e3b34122;color:#e3b341;border:1px solid #e3b34133;margin-bottom:6px}
|
|
@@ -199,10 +219,12 @@ export function renderHtmlReport(data) {
|
|
|
199
219
|
}
|
|
200
220
|
const totalCVEs = new Set(data.findings.flatMap(f => f.vulnerabilities.map(v => v.id))).size;
|
|
201
221
|
const noticesHtml = renderNotices(data.notes, data.warnings);
|
|
222
|
+
const completenessBannerHtml = renderCompletenessBanner(data.completeness);
|
|
202
223
|
const fixPlanHtml = renderFixPlan(data.suggestedFixCommands);
|
|
203
224
|
const skippedKeys = new Set((data.suggestedFixCommands?.skipped ?? []).map(s => `${s.package}@${s.version}`));
|
|
204
225
|
const skippedSectionHtml = renderSkippedSection(data.suggestedFixCommands);
|
|
205
226
|
const skippedDepsHtml = renderSkippedDependenciesSection(data.skippedDependencies);
|
|
227
|
+
const duplicatePackagesHtml = renderDuplicatePackagesSection(data.findings);
|
|
206
228
|
const findingRowsHtml = data.findings.map((f, i) => renderFindingRow(f, i, skippedKeys)).join("\n");
|
|
207
229
|
const dataJson = JSON.stringify(data)
|
|
208
230
|
.replace(/</g, "\\u003c")
|
|
@@ -270,7 +292,9 @@ ${REPORT_STYLES}
|
|
|
270
292
|
<div class="sev-card total"><span class="count">${totalCVEs}</span><span class="label">CVEs</span></div>
|
|
271
293
|
</div>
|
|
272
294
|
|
|
295
|
+
${completenessBannerHtml}
|
|
273
296
|
${fixPlanHtml}
|
|
297
|
+
${duplicatePackagesHtml}
|
|
274
298
|
|
|
275
299
|
<div class="findings-section">
|
|
276
300
|
<div class="findings-header">
|
|
@@ -295,12 +319,13 @@ ${fixPlanHtml}
|
|
|
295
319
|
<th>Fix available</th>
|
|
296
320
|
<th onclick="sortBy('severity')" class="sorted">Severity <span class="sort-arrow" style="color:var(--link)">↓</span></th>
|
|
297
321
|
<th onclick="sortBy('relationship')">Type <span class="sort-arrow">↕</span></th>
|
|
322
|
+
<th>Root</th>
|
|
298
323
|
<th>CVE / Advisory</th>
|
|
299
324
|
</tr>
|
|
300
325
|
</thead>
|
|
301
326
|
<tbody id="findings-tbody">
|
|
302
327
|
${findingRowsHtml}
|
|
303
|
-
<tr id="no-results-row" style="display:none"><td colspan="
|
|
328
|
+
<tr id="no-results-row" style="display:none"><td colspan="7" class="no-results">No findings match your search.</td></tr>
|
|
304
329
|
</tbody>
|
|
305
330
|
</table>
|
|
306
331
|
</div>
|
|
@@ -465,7 +490,7 @@ export function renderFindingRow(finding, idx, skippedKeys) {
|
|
|
465
490
|
const cveLinks = finding.cves.length > 0
|
|
466
491
|
? finding.cves.map(advisoryLink).join(", ")
|
|
467
492
|
: finding.vulnerabilities.map(v => advisoryLink(v.id)).join(", ");
|
|
468
|
-
const isMalicious = finding.vulnerabilities
|
|
493
|
+
const isMalicious = hasMaliciousAdvisory(finding.vulnerabilities);
|
|
469
494
|
const isSkipped = skippedKeys?.has(`${finding.package}@${finding.version}`);
|
|
470
495
|
const fixVersion = finding.validatedFirstFixedVersion ?? finding.firstFixedVersion;
|
|
471
496
|
const fixHtml = isSkipped && fixVersion
|
|
@@ -498,16 +523,20 @@ export function renderFindingRow(finding, idx, skippedKeys) {
|
|
|
498
523
|
const contextColHtml = finding.relationship === "transitive"
|
|
499
524
|
? renderTransitiveContextCol(finding)
|
|
500
525
|
: "";
|
|
526
|
+
const rootDepsHtml = finding.rootDependencies.length > 0
|
|
527
|
+
? finding.rootDependencies.map(name => `<span class="root-dep">${escapeHtml(name)}</span>`).join(", ")
|
|
528
|
+
: `<span class="root-dep-none">-</span>`;
|
|
501
529
|
return ` <tr id="row-${idx}" data-skipped="${isSkipped ? '1' : '0'}" onclick="toggleRow(${idx})">
|
|
502
530
|
<td><span class="expand-icon" id="icon-${idx}">▶</span></td>
|
|
503
531
|
<td><div class="pkg-name">${escapeHtml(finding.package)}</div><div class="pkg-version">${escapeHtml(finding.version)}</div></td>
|
|
504
532
|
<td>${fixHtml}</td>
|
|
505
533
|
<td><span class="sev-badge ${escapeHtml(finding.severity)}">${escapeHtml(finding.severity)}</span></td>
|
|
506
534
|
<td>${renderRelBadge(finding)}</td>
|
|
535
|
+
<td>${rootDepsHtml}</td>
|
|
507
536
|
<td>${cveLinks}</td>
|
|
508
537
|
</tr>
|
|
509
538
|
<tr id="detail-${idx}" class="detail-row">
|
|
510
|
-
<td colspan="
|
|
539
|
+
<td colspan="7">
|
|
511
540
|
<div class="expanded-inner">
|
|
512
541
|
<div class="detail-col" style="max-width:320px">
|
|
513
542
|
<h4>Description</h4>
|
|
@@ -534,21 +563,22 @@ function renderTransitiveContextCol(finding) {
|
|
|
534
563
|
const hasFixAvailable = finding.runnableFixCommand != null ||
|
|
535
564
|
finding.recommendedNpmTransitiveRemediation != null ||
|
|
536
565
|
finding.recommendedParentUpgrade != null;
|
|
566
|
+
const rootNames = finding.rootDependencies.join(", ");
|
|
537
567
|
if (hasFixAvailable) {
|
|
538
|
-
const
|
|
539
|
-
? `<p style="font-size:12px;color:var(--text-2);margin-top:4px">
|
|
568
|
+
const rootLine = rootNames
|
|
569
|
+
? `<p style="font-size:12px;color:var(--text-2);margin-top:4px">Root: ${escapeHtml(rootNames)}</p>`
|
|
540
570
|
: "";
|
|
541
571
|
return `<div class="detail-col" style="max-width:200px">
|
|
542
572
|
<h4>Context</h4>
|
|
543
573
|
<span class="tier-ok">✓ Fix available</span>
|
|
544
|
-
${
|
|
574
|
+
${rootLine}
|
|
545
575
|
</div>`;
|
|
546
576
|
}
|
|
547
|
-
if (
|
|
577
|
+
if (rootNames) {
|
|
548
578
|
return `<div class="detail-col" style="max-width:200px">
|
|
549
579
|
<h4>Context</h4>
|
|
550
580
|
<span class="tier-warn">⚠ No safe version identified</span>
|
|
551
|
-
<p style="font-size:12px;color:var(--text-2);margin-top:4px">
|
|
581
|
+
<p style="font-size:12px;color:var(--text-2);margin-top:4px">Root: ${escapeHtml(rootNames)}</p>
|
|
552
582
|
</div>`;
|
|
553
583
|
}
|
|
554
584
|
return `<div class="detail-col" style="max-width:200px">
|
|
@@ -557,6 +587,33 @@ function renderTransitiveContextCol(finding) {
|
|
|
557
587
|
<p style="font-size:12px;color:var(--text-2);margin-top:4px">Run <code>npm ls ${escapeHtml(finding.package)}</code> to find which package pulls it in.</p>
|
|
558
588
|
</div>`;
|
|
559
589
|
}
|
|
590
|
+
export function renderCompletenessBanner(completeness) {
|
|
591
|
+
if (completeness == null || completeness.complete)
|
|
592
|
+
return "";
|
|
593
|
+
const { hasDetectionGap, hasRemediationGap } = getCompletenessImpact(completeness);
|
|
594
|
+
let bannerText;
|
|
595
|
+
if (hasDetectionGap && hasRemediationGap) {
|
|
596
|
+
bannerText = "Some vulnerability findings may be incomplete, and some remediation guidance may also be unavailable because the following issues occurred:";
|
|
597
|
+
}
|
|
598
|
+
else if (hasDetectionGap) {
|
|
599
|
+
bannerText = "Some vulnerability findings may be incomplete because the following issues occurred:";
|
|
600
|
+
}
|
|
601
|
+
else if (hasRemediationGap) {
|
|
602
|
+
bannerText = "Vulnerability findings are available, but remediation guidance may be incomplete because the following issues occurred:";
|
|
603
|
+
}
|
|
604
|
+
else {
|
|
605
|
+
bannerText = "The scan result may be incomplete because the following issues occurred:";
|
|
606
|
+
}
|
|
607
|
+
const diagRows = completeness.diagnostics.map(d => `<li class="diag-item ${escapeHtml(d.severity)} ${escapeHtml(d.impact)}">${escapeHtml(d.message)}</li>`).join("\n");
|
|
608
|
+
return `<div class="completeness-banner">
|
|
609
|
+
<div class="completeness-banner-icon">⚠</div>
|
|
610
|
+
<div class="completeness-banner-body">
|
|
611
|
+
<strong>Scan data is incomplete</strong>
|
|
612
|
+
<p>${bannerText}</p>
|
|
613
|
+
<ul>${diagRows}</ul>
|
|
614
|
+
</div>
|
|
615
|
+
</div>`;
|
|
616
|
+
}
|
|
560
617
|
function renderNotices(notes, warnings) {
|
|
561
618
|
if (notes.length === 0 && warnings.length === 0)
|
|
562
619
|
return "";
|
|
@@ -607,6 +664,70 @@ ${rows}
|
|
|
607
664
|
</div>
|
|
608
665
|
</div>`;
|
|
609
666
|
}
|
|
667
|
+
/**
|
|
668
|
+
* Groups vulnerable findings by package name and keeps only the packages that
|
|
669
|
+
* are installed at more than one version. This is the "same package, multiple
|
|
670
|
+
* versions" view: it shows where duplicate copies of a vulnerable package crept
|
|
671
|
+
* into the dependency tree so they can be consolidated onto one fixed version.
|
|
672
|
+
*/
|
|
673
|
+
export function collectDuplicatePackages(findings) {
|
|
674
|
+
const byName = new Map();
|
|
675
|
+
for (const finding of findings) {
|
|
676
|
+
let versions = byName.get(finding.package);
|
|
677
|
+
if (!versions) {
|
|
678
|
+
versions = new Map();
|
|
679
|
+
byName.set(finding.package, versions);
|
|
680
|
+
}
|
|
681
|
+
// First finding for a given version wins; a second advisory on the same
|
|
682
|
+
// install does not add a duplicate row.
|
|
683
|
+
if (!versions.has(finding.version))
|
|
684
|
+
versions.set(finding.version, finding);
|
|
685
|
+
}
|
|
686
|
+
const duplicates = [];
|
|
687
|
+
for (const [name, versions] of byName) {
|
|
688
|
+
if (versions.size > 1)
|
|
689
|
+
duplicates.push({ name, versions: [...versions.values()] });
|
|
690
|
+
}
|
|
691
|
+
// Most versions first, then alphabetical, so the output is stable.
|
|
692
|
+
duplicates.sort((a, b) => b.versions.length - a.versions.length || a.name.localeCompare(b.name));
|
|
693
|
+
return duplicates;
|
|
694
|
+
}
|
|
695
|
+
function duplicateOrigin(finding) {
|
|
696
|
+
if (finding.relationship === "direct")
|
|
697
|
+
return "direct dependency";
|
|
698
|
+
if (finding.primaryParent)
|
|
699
|
+
return `via ${finding.primaryParent}`;
|
|
700
|
+
return finding.relationship === "transitive" ? "transitive dependency" : "unknown origin";
|
|
701
|
+
}
|
|
702
|
+
export function renderDuplicatePackagesSection(findings) {
|
|
703
|
+
const duplicates = collectDuplicatePackages(findings);
|
|
704
|
+
if (duplicates.length === 0)
|
|
705
|
+
return "";
|
|
706
|
+
const cards = duplicates
|
|
707
|
+
.map(dup => {
|
|
708
|
+
const versionRows = [...dup.versions]
|
|
709
|
+
.sort((a, b) => severityOrder[b.severity] - severityOrder[a.severity] || a.version.localeCompare(b.version))
|
|
710
|
+
.map(f => ` <div class="dup-version"><span class="sev-badge ${escapeHtml(f.severity)}">${escapeHtml(f.severity)}</span><span class="dup-ver">${escapeHtml(f.version)}</span><span class="dup-origin">${escapeHtml(duplicateOrigin(f))}</span></div>`)
|
|
711
|
+
.join("\n");
|
|
712
|
+
return ` <div class="dup-pkg">
|
|
713
|
+
<div class="dup-pkg-name">${escapeHtml(dup.name)} <span class="dup-count">${dup.versions.length} versions</span></div>
|
|
714
|
+
<div class="dup-versions">
|
|
715
|
+
${versionRows}
|
|
716
|
+
</div>
|
|
717
|
+
</div>`;
|
|
718
|
+
})
|
|
719
|
+
.join("\n");
|
|
720
|
+
return `<div class="fix-plan">
|
|
721
|
+
<div class="fix-plan-header">
|
|
722
|
+
<h2><span class="icon">⧉</span> Duplicate package versions</h2>
|
|
723
|
+
<span class="badge">${duplicates.length} ${pluralize(duplicates.length, "package")}</span>
|
|
724
|
+
</div>
|
|
725
|
+
<div class="dup-pkgs">
|
|
726
|
+
<div class="dup-pkgs-hint">These vulnerable packages are installed at more than one version in this dependency tree. Consolidating each onto a single fixed version reduces how many places you have to patch.</div>
|
|
727
|
+
${cards}
|
|
728
|
+
</div>
|
|
729
|
+
</div>`;
|
|
730
|
+
}
|
|
610
731
|
export function renderFixPlan(plan) {
|
|
611
732
|
if (!plan || plan.sections.length === 0)
|
|
612
733
|
return "";
|
|
@@ -614,8 +735,8 @@ export function renderFixPlan(plan) {
|
|
|
614
735
|
const skippedCount = plan.skipped.length;
|
|
615
736
|
const commandRows = plan.sections.map(section => {
|
|
616
737
|
const targetRows = section.targets.map(t => {
|
|
617
|
-
const displayVersion = t.
|
|
618
|
-
const isMajor = t.currentVersion ?
|
|
738
|
+
const displayVersion = t.targetVersion;
|
|
739
|
+
const isMajor = t.currentVersion ? isBreakingUpgrade(t.currentVersion, t.targetVersion) : false;
|
|
619
740
|
const breakBadge = isMajor ? ` <span class="break-badge">⚠ breaking</span>` : "";
|
|
620
741
|
const versionHtml = t.currentVersion
|
|
621
742
|
? `<span class="fix-target-pkg">${escapeHtml(t.package)}@${escapeHtml(t.currentVersion)}</span><span class="fix-target-arrow">→</span><span class="fix-target-to">${escapeHtml(displayVersion)}</span>`
|
|
@@ -14,6 +14,10 @@ function detailHtml(finding) {
|
|
|
14
14
|
if (finding.deprecated) {
|
|
15
15
|
lines.push(`npm deprecated: ${esc(finding.deprecated.message)}`);
|
|
16
16
|
}
|
|
17
|
+
if (finding.staleness) {
|
|
18
|
+
const year = new Date(finding.staleness.lastPublish).getUTCFullYear();
|
|
19
|
+
lines.push(`Last release: ${year} (${finding.staleness.ageYears} years ago)`);
|
|
20
|
+
}
|
|
17
21
|
if (lines.length === 0)
|
|
18
22
|
lines.push(esc(finding.message));
|
|
19
23
|
return lines.join("<br>");
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { getCliVersion } from "../utils/version-info.js";
|
|
2
|
+
import { severityToSarifLevel } from "../utils/severity.js";
|
|
3
|
+
import { sarifFingerprintHash } from "../utils/sarif.js";
|
|
4
|
+
const DM_RULES = [
|
|
5
|
+
{
|
|
6
|
+
id: "DM001",
|
|
7
|
+
name: "Dependency maintenance risk",
|
|
8
|
+
shortDescription: "Parent dependency constraints block transitive CVE fix",
|
|
9
|
+
helpUri: "https://owasp.org/cve-lite-cli/docs/maintenance-risk/dm001",
|
|
10
|
+
},
|
|
11
|
+
];
|
|
12
|
+
const DM_RULE_INDEX = new Map(DM_RULES.map((r, i) => [r.id, i]));
|
|
13
|
+
export function buildMaintenanceSarifComponent() {
|
|
14
|
+
return {
|
|
15
|
+
name: "cve-lite-cli-maintenance",
|
|
16
|
+
version: getCliVersion(),
|
|
17
|
+
informationUri: "https://github.com/OWASP/cve-lite-cli",
|
|
18
|
+
rules: DM_RULES.map(r => ({
|
|
19
|
+
id: r.id,
|
|
20
|
+
name: r.name,
|
|
21
|
+
shortDescription: { text: r.shortDescription },
|
|
22
|
+
helpUri: r.helpUri,
|
|
23
|
+
})),
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
export function buildMaintenanceSarifResults(findings, lockfileUri, toolComponentIndex = 0) {
|
|
27
|
+
return findings.map(f => {
|
|
28
|
+
const ruleIndex = DM_RULE_INDEX.get(f.ruleId);
|
|
29
|
+
if (ruleIndex === undefined) {
|
|
30
|
+
throw new Error(`DM_RULE_INDEX: unknown ruleId \"${f.ruleId}\" - add it to DM_RULES`);
|
|
31
|
+
}
|
|
32
|
+
return {
|
|
33
|
+
ruleId: f.ruleId,
|
|
34
|
+
ruleIndex,
|
|
35
|
+
rule: { id: f.ruleId, toolComponent: { index: toolComponentIndex } },
|
|
36
|
+
kind: "open",
|
|
37
|
+
level: severityToSarifLevel(f.severity),
|
|
38
|
+
message: { text: f.message },
|
|
39
|
+
locations: [
|
|
40
|
+
{
|
|
41
|
+
physicalLocation: {
|
|
42
|
+
artifactLocation: { uri: lockfileUri, uriBaseId: "%SRCROOT%" },
|
|
43
|
+
region: { startLine: 1 },
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
],
|
|
47
|
+
partialFingerprints: {
|
|
48
|
+
primaryLocationLineHash: sarifFingerprintHash(`${f.ruleId}:${f.package.name}:${f.package.version}`),
|
|
49
|
+
},
|
|
50
|
+
properties: {
|
|
51
|
+
package: f.package.name,
|
|
52
|
+
version: f.package.version,
|
|
53
|
+
severity: f.severity,
|
|
54
|
+
...(f.staleness ? { lastPublish: f.staleness.lastPublish, ageYears: f.staleness.ageYears } : {}),
|
|
55
|
+
},
|
|
56
|
+
};
|
|
57
|
+
});
|
|
58
|
+
}
|
|
@@ -12,13 +12,70 @@ function pad(s, width) {
|
|
|
12
12
|
function truncate(s, max) {
|
|
13
13
|
return s.length > max ? s.slice(0, max - 1) + "…" : s;
|
|
14
14
|
}
|
|
15
|
+
// Word-wrap a detail line to the column width so the actionable tail (e.g. the
|
|
16
|
+
// "- upgrade to X" target) spills onto a continuation row instead of truncating
|
|
17
|
+
// to a useless "upgrade to 1…". A single word longer than the width is hard-broken.
|
|
18
|
+
function wrap(text, width) {
|
|
19
|
+
const out = [];
|
|
20
|
+
let line = "";
|
|
21
|
+
for (const word of text.split(" ")) {
|
|
22
|
+
let w = word;
|
|
23
|
+
while (w.length > width) {
|
|
24
|
+
if (line.length > 0) {
|
|
25
|
+
out.push(line);
|
|
26
|
+
line = "";
|
|
27
|
+
}
|
|
28
|
+
out.push(w.slice(0, width));
|
|
29
|
+
w = w.slice(width);
|
|
30
|
+
}
|
|
31
|
+
if (w.length === 0) {
|
|
32
|
+
continue;
|
|
33
|
+
}
|
|
34
|
+
if (line.length === 0) {
|
|
35
|
+
line = w;
|
|
36
|
+
}
|
|
37
|
+
else if (line.length + 1 + w.length <= width) {
|
|
38
|
+
line += " " + w;
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
out.push(line);
|
|
42
|
+
line = w;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
if (line.length > 0) {
|
|
46
|
+
out.push(line);
|
|
47
|
+
}
|
|
48
|
+
return out.length > 0 ? out : [""];
|
|
49
|
+
}
|
|
50
|
+
// Terminal only: reduce a freeform npm deprecation message for a width-capped box
|
|
51
|
+
// cell. Strip URLs (they truncate to a useless "https://gi…"; the full message and
|
|
52
|
+
// URL are kept in the HTML/JSON/SARIF outputs), and only surface the remaining text
|
|
53
|
+
// when it carries actionable guidance - a "use X instead" replacement. A generic
|
|
54
|
+
// "<pkg> has been deprecated" adds nothing over the bare flag.
|
|
55
|
+
function formatDeprecationFlag(message) {
|
|
56
|
+
const cleaned = message
|
|
57
|
+
.replace(/https?:\/\/\S+/g, "")
|
|
58
|
+
.replace(/[,;]?\s*(see|at)\s*$/i, "")
|
|
59
|
+
.replace(/\s+/g, " ")
|
|
60
|
+
.trim()
|
|
61
|
+
.replace(/[.,;:]+$/, "");
|
|
62
|
+
const hasGuidance = /\b(instead|use\s|replaced|migrate|switch to)\b/i.test(cleaned);
|
|
63
|
+
if (hasGuidance && cleaned.length > 0) {
|
|
64
|
+
return `Deprecated: ${cleaned}`;
|
|
65
|
+
}
|
|
66
|
+
return "Deprecated";
|
|
67
|
+
}
|
|
15
68
|
function buildDetailLines(finding) {
|
|
16
69
|
const lines = [];
|
|
17
70
|
for (const d of finding.drag ?? []) {
|
|
18
71
|
lines.push(`Drags ${d.constrainedPackage}@${d.installedVersion} below fix ${d.fixVersion} - upgrade to ${d.parentTargetVersion}`);
|
|
19
72
|
}
|
|
20
73
|
if (finding.deprecated) {
|
|
21
|
-
lines.push(
|
|
74
|
+
lines.push(formatDeprecationFlag(finding.deprecated.message));
|
|
75
|
+
}
|
|
76
|
+
if (finding.staleness) {
|
|
77
|
+
const year = new Date(finding.staleness.lastPublish).getUTCFullYear();
|
|
78
|
+
lines.push(`Last release: ${year} (${finding.staleness.ageYears} years ago)`);
|
|
22
79
|
}
|
|
23
80
|
if (lines.length === 0) {
|
|
24
81
|
lines.push(finding.message);
|
|
@@ -51,7 +108,8 @@ export function renderMaintenanceFindings(findings, options) {
|
|
|
51
108
|
continue;
|
|
52
109
|
lines.push(`${formatSeverityLabel(sev.toUpperCase())} (${bucket.length})`);
|
|
53
110
|
const sorted = [...bucket].sort((a, b) => a.package.name.localeCompare(b.package.name));
|
|
54
|
-
const
|
|
111
|
+
const detailsByFinding = sorted.map(f => buildDetailLines(f).flatMap(l => wrap(l, COL_DET_MAX)));
|
|
112
|
+
const allDetailLines = detailsByFinding.flat();
|
|
55
113
|
const pkgWidth = Math.min(COL_PKG_MAX, Math.max(7, ...sorted.map(f => `${f.package.name}@${f.package.version}`.length)));
|
|
56
114
|
const detWidth = Math.min(COL_DET_MAX, Math.max(7, ...allDetailLines.map(l => l.length)));
|
|
57
115
|
const ruleWidth = COL_RULE_MAX;
|
|
@@ -60,14 +118,14 @@ export function renderMaintenanceFindings(findings, options) {
|
|
|
60
118
|
lines.push(hr("┌", "┬", "┐"));
|
|
61
119
|
lines.push(row("Rule", "Package", "Details"));
|
|
62
120
|
lines.push(hr("├", "┼", "┤"));
|
|
63
|
-
|
|
121
|
+
sorted.forEach((finding, idx) => {
|
|
64
122
|
const pkgLabel = truncate(`${finding.package.name}@${finding.package.version}`, pkgWidth);
|
|
65
|
-
const detailLines =
|
|
123
|
+
const detailLines = detailsByFinding[idx] ?? [];
|
|
66
124
|
lines.push(row("DM001", pkgLabel, detailLines[0] ?? ""));
|
|
67
125
|
for (let i = 1; i < detailLines.length; i++) {
|
|
68
126
|
lines.push(row("", "", detailLines[i] ?? ""));
|
|
69
127
|
}
|
|
70
|
-
}
|
|
128
|
+
});
|
|
71
129
|
lines.push(hr("└", "┴", "┘"));
|
|
72
130
|
lines.push("");
|
|
73
131
|
}
|
|
@@ -1,8 +1,35 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
import {
|
|
3
|
+
import { aggregateMultiFolderCompleteness } from "../scan/completeness.js";
|
|
4
|
+
import { REPORT_STYLES, escapeHtml, openInBrowser, renderFindingRow, renderFixPlan, renderCompletenessBanner, serializeHtmlFinding, } from "./html-reporter.js";
|
|
5
|
+
import { renderOverrideFindingsHtml } from "./override-findings-html.js";
|
|
6
|
+
import { renderMaintenanceFindingsHtml } from "./maintenance-findings-html.js";
|
|
4
7
|
import { loadLogoDataUri } from "./logos.js";
|
|
5
8
|
import { pluralize } from "../utils/string.js";
|
|
9
|
+
export function buildMultiFolderReportData(params) {
|
|
10
|
+
const findings = params.results.flatMap((r, i) => params.serializedByFolder[i].map(f => ({
|
|
11
|
+
...f,
|
|
12
|
+
subfolder: r.subfolder,
|
|
13
|
+
})));
|
|
14
|
+
return {
|
|
15
|
+
multiFolder: true,
|
|
16
|
+
projectPath: params.projectPath,
|
|
17
|
+
scannedAt: new Date().toISOString(),
|
|
18
|
+
cliVersion: params.cliVersion,
|
|
19
|
+
folders: params.results.map(r => r.subfolder),
|
|
20
|
+
findings,
|
|
21
|
+
...(params.includeOverrides
|
|
22
|
+
? {
|
|
23
|
+
overrideFindings: params.results.flatMap(r => r.overrideFindings.map(f => ({ ...f, subfolder: r.subfolder }))),
|
|
24
|
+
}
|
|
25
|
+
: {}),
|
|
26
|
+
...(params.includeMaintenance
|
|
27
|
+
? {
|
|
28
|
+
maintenanceFindings: params.results.flatMap(r => r.maintenanceFindings.map(f => ({ ...f, subfolder: r.subfolder }))),
|
|
29
|
+
}
|
|
30
|
+
: {}),
|
|
31
|
+
};
|
|
32
|
+
}
|
|
6
33
|
function summaryCounts(results) {
|
|
7
34
|
const counts = { critical: 0, high: 0, medium: 0, low: 0, unknown: 0, none: 0 };
|
|
8
35
|
for (const r of results) {
|
|
@@ -23,7 +50,7 @@ function renderFolderNotices(coverage) {
|
|
|
23
50
|
<div class="scan-notes-body"><ul>${items}</ul></div>
|
|
24
51
|
</div>`;
|
|
25
52
|
}
|
|
26
|
-
function renderFolderSection(result, folderIdx, idxOffset, serialized) {
|
|
53
|
+
function renderFolderSection(result, folderIdx, idxOffset, serialized, projectRoot, includeOverrides, includeMaintenance) {
|
|
27
54
|
const counts = { critical: 0, high: 0, medium: 0, low: 0, unknown: 0 };
|
|
28
55
|
for (const f of result.sorted) {
|
|
29
56
|
const sev = f.severity;
|
|
@@ -40,16 +67,28 @@ function renderFolderSection(result, folderIdx, idxOffset, serialized) {
|
|
|
40
67
|
const findingRowsHtml = serialized.map((f, i) => renderFindingRow(f, idxOffset + i)).join("\n");
|
|
41
68
|
const fixPlanHtml = renderFixPlan(result.suggestedFixCommands);
|
|
42
69
|
const noticesHtml = renderFolderNotices(result.coverage);
|
|
70
|
+
const completenessBannerHtml = renderCompletenessBanner(result.completeness);
|
|
71
|
+
const folderAbs = path.join(projectRoot, result.subfolder);
|
|
72
|
+
const overrideHtml = includeOverrides
|
|
73
|
+
? renderOverrideFindingsHtml(result.overrideFindings, folderAbs)
|
|
74
|
+
: "";
|
|
75
|
+
const maintenanceHtml = includeMaintenance
|
|
76
|
+
? renderMaintenanceFindingsHtml(result.maintenanceFindings)
|
|
77
|
+
: "";
|
|
43
78
|
const emptyRow = result.sorted.length === 0
|
|
44
|
-
? `<tr><td colspan="
|
|
79
|
+
? `<tr><td colspan="7" style="text-align:center;padding:24px;color:#8b949e">No findings</td></tr>`
|
|
45
80
|
: "";
|
|
46
81
|
return `
|
|
47
82
|
<details class="folder-section"${isOpen ? " open" : ""}>
|
|
48
83
|
<summary class="folder-summary">
|
|
84
|
+
<svg class="chevron" width="16" height="16" viewBox="0 0 16 16" fill="currentColor">
|
|
85
|
+
<path fill-rule="evenodd" d="M6.22 3.22a.75.75 0 011.06 0l4.25 4.25a.75.75 0 010 1.06l-4.25 4.25a.75.75 0 01-1.06-1.06L9.94 8 6.22 4.28a.75.75 0 010-1.06z"></path>
|
|
86
|
+
</svg>
|
|
49
87
|
<span class="folder-name">${escapeHtml(result.subfolder)}/</span>
|
|
50
88
|
<span class="folder-counts">${escapeHtml(summaryText)}</span>
|
|
51
89
|
</summary>
|
|
52
90
|
<div class="folder-body">
|
|
91
|
+
${completenessBannerHtml}
|
|
53
92
|
${fixPlanHtml}
|
|
54
93
|
${noticesHtml}
|
|
55
94
|
<div class="findings-section" style="margin:16px 32px 32px">
|
|
@@ -74,15 +113,18 @@ function renderFolderSection(result, folderIdx, idxOffset, serialized) {
|
|
|
74
113
|
<th>Fix available</th>
|
|
75
114
|
<th onclick="sortBy('severity',${fi})" class="sorted">Severity <span class="sort-arrow" style="color:#58a6ff">↓</span></th>
|
|
76
115
|
<th onclick="sortBy('relationship',${fi})">Type <span class="sort-arrow">↕</span></th>
|
|
116
|
+
<th>Root</th>
|
|
77
117
|
<th>CVE / Advisory</th>
|
|
78
118
|
</tr>
|
|
79
119
|
</thead>
|
|
80
120
|
<tbody id="findings-tbody-${fi}" data-offset="${idxOffset}">
|
|
81
121
|
${emptyRow}${findingRowsHtml}
|
|
82
|
-
<tr id="no-results-row-${fi}" style="display:none"><td colspan="
|
|
122
|
+
<tr id="no-results-row-${fi}" style="display:none"><td colspan="7" class="no-results">No findings match your search.</td></tr>
|
|
83
123
|
</tbody>
|
|
84
124
|
</table>
|
|
85
125
|
</div>
|
|
126
|
+
${overrideHtml}
|
|
127
|
+
${maintenanceHtml}
|
|
86
128
|
</div>
|
|
87
129
|
</details>`;
|
|
88
130
|
}
|
|
@@ -94,8 +136,18 @@ export async function writeMultiFolderHtmlReport(params) {
|
|
|
94
136
|
const totalFindings = params.results.reduce((sum, r) => sum + r.sorted.length, 0);
|
|
95
137
|
const totalCVEs = params.results.reduce((sum, r) => sum + r.sorted.reduce((s, f) => s + f.cveAliases.length, 0), 0);
|
|
96
138
|
const folderCount = params.results.length;
|
|
139
|
+
const aggregateCompleteness = aggregateMultiFolderCompleteness(params.results);
|
|
140
|
+
const aggregateBannerHtml = renderCompletenessBanner(aggregateCompleteness);
|
|
97
141
|
// Pre-serialize findings once per folder for both HTML rendering and JS filter/sort
|
|
98
142
|
const allSerialized = params.results.map(r => r.sorted.map(f => serializeHtmlFinding(f, r.suggestedFixCommands)));
|
|
143
|
+
const reportData = buildMultiFolderReportData({
|
|
144
|
+
results: params.results,
|
|
145
|
+
serializedByFolder: allSerialized,
|
|
146
|
+
projectPath: params.projectPath,
|
|
147
|
+
cliVersion: params.cliVersion,
|
|
148
|
+
includeOverrides: params.includeOverrides,
|
|
149
|
+
includeMaintenance: params.includeMaintenance,
|
|
150
|
+
});
|
|
99
151
|
// Compact per-folder findings for JavaScript (only fields needed for filter/sort/search)
|
|
100
152
|
const folderFindingsJson = JSON.stringify(allSerialized.map(findings => findings.map(f => ({
|
|
101
153
|
package: f.package,
|
|
@@ -111,7 +163,7 @@ export async function writeMultiFolderHtmlReport(params) {
|
|
|
111
163
|
let idxOffset = 0;
|
|
112
164
|
const folderSectionsHtml = params.results
|
|
113
165
|
.map((r, fi) => {
|
|
114
|
-
const html = renderFolderSection(r, fi, idxOffset, allSerialized[fi]);
|
|
166
|
+
const html = renderFolderSection(r, fi, idxOffset, allSerialized[fi], params.projectPath, params.includeOverrides, params.includeMaintenance);
|
|
115
167
|
idxOffset += r.sorted.length;
|
|
116
168
|
return html;
|
|
117
169
|
})
|
|
@@ -129,12 +181,13 @@ ${REPORT_STYLES}
|
|
|
129
181
|
.folder-section{margin:0 32px 16px;background:#161b22;border:1px solid #30363d;border-radius:8px;overflow:hidden}
|
|
130
182
|
.folder-summary{display:flex;align-items:center;gap:12px;padding:12px 18px;cursor:pointer;user-select:none;list-style:none;background:#1c2128;border-bottom:1px solid #30363d}
|
|
131
183
|
.folder-summary::-webkit-details-marker{display:none}
|
|
132
|
-
.folder-summary
|
|
133
|
-
details[open] .folder-summary
|
|
184
|
+
.folder-summary .chevron{transition:transform .15s;flex-shrink:0;color:#8b949e}
|
|
185
|
+
details[open] > .folder-summary .chevron{transform:rotate(90deg)}
|
|
134
186
|
.folder-name{font-size:13px;font-weight:600;color:#e6edf3;font-family:'SF Mono','Cascadia Code','Fira Code',monospace}
|
|
135
187
|
.folder-counts{font-size:11px;color:#8b949e;margin-left:auto}
|
|
136
188
|
.folder-body{padding:0}
|
|
137
189
|
.folder-body .fix-plan{margin:24px 32px 0}
|
|
190
|
+
.folder-body .override-hygiene,.folder-body .maintenance-risk{margin:0 32px 24px}
|
|
138
191
|
</style>
|
|
139
192
|
</head>
|
|
140
193
|
<body>
|
|
@@ -178,6 +231,8 @@ details[open] .folder-summary::before{transform:rotate(90deg)}
|
|
|
178
231
|
<div class="sev-card total"><span class="count">${totalCVEs}</span><span class="label">CVEs</span></div>
|
|
179
232
|
</div>
|
|
180
233
|
|
|
234
|
+
${aggregateBannerHtml}
|
|
235
|
+
|
|
181
236
|
${folderSectionsHtml}
|
|
182
237
|
|
|
183
238
|
<div class="report-footer">
|
|
@@ -314,6 +369,8 @@ document.addEventListener('click', function(e) {
|
|
|
314
369
|
</body>
|
|
315
370
|
</html>`;
|
|
316
371
|
const indexPath = path.join(params.outputDir, "index.html");
|
|
372
|
+
const jsonPath = path.join(params.outputDir, "report.json");
|
|
373
|
+
fs.writeFileSync(jsonPath, JSON.stringify(reportData, null, 2), "utf8");
|
|
317
374
|
fs.writeFileSync(indexPath, html, "utf8");
|
|
318
375
|
if (params.autoOpen)
|
|
319
376
|
openInBrowser(indexPath);
|
|
@@ -30,17 +30,26 @@ export function printMultiFolderResults(results, options) {
|
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
printCoverage([...result.scanInput.notes, ...result.coverage]);
|
|
33
|
-
printFinalStatus(result.sorted);
|
|
33
|
+
printFinalStatus(result.sorted, 0, result.completeness);
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
|
-
printCompactOutput(result.sorted, result.scanInput, { offline, all: !!options.all, subfolder: result.subfolder });
|
|
36
|
+
printCompactOutput(result.sorted, result.scanInput, { offline, all: !!options.all, subfolder: result.subfolder, completeness: result.completeness });
|
|
37
37
|
}
|
|
38
38
|
if (i < results.length - 1) {
|
|
39
39
|
console.log(chalk.gray("\n" + "─".repeat(50)));
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
const totalFindings = results.reduce((sum, r) => sum + r.sorted.length, 0);
|
|
43
|
+
const totalSuppressed = results.reduce((sum, r) => sum + (r.suppressedCount ?? 0), 0);
|
|
43
44
|
const folderNames = results.map(r => `${r.subfolder}/`).join(", ");
|
|
44
45
|
console.log(chalk.gray(`\nScanned ${results.length} ${pluralize(results.length, "folder")}: ${folderNames}`));
|
|
45
46
|
console.log(chalk.gray(`${totalFindings} total ${pluralize(totalFindings, "finding")} across all folders`));
|
|
47
|
+
if (totalSuppressed > 0) {
|
|
48
|
+
if (totalFindings === 0) {
|
|
49
|
+
console.log(chalk.green(`No new findings above baseline - ${totalSuppressed} existing ${pluralize(totalSuppressed, "finding")} suppressed`));
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
console.log(chalk.yellow(`${totalFindings} new ${pluralize(totalFindings, "finding")} above baseline - ${totalSuppressed} existing ${pluralize(totalSuppressed, "finding")} suppressed`));
|
|
53
|
+
}
|
|
54
|
+
}
|
|
46
55
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { relative } from "node:path";
|
|
2
2
|
import { SEVERITY_ORDER } from "../utils/severity.js";
|
|
3
|
+
import { OVERRIDES_COMMAND } from "../constants.js";
|
|
3
4
|
function esc(s) {
|
|
4
5
|
return s
|
|
5
6
|
.replace(/&/g, "&")
|
|
@@ -29,11 +30,11 @@ export function renderOverrideFindingsHtml(findings, projectPath) {
|
|
|
29
30
|
: esc(f.location.file);
|
|
30
31
|
const relPath = projectPath ? relative(process.cwd(), projectPath) : "";
|
|
31
32
|
const projectInfix = relPath && relPath !== "." ? ` ${relPath}` : "";
|
|
32
|
-
const
|
|
33
|
-
? f.fix.runnableCommand.replace(
|
|
34
|
-
:
|
|
35
|
-
const fixHtml =
|
|
36
|
-
? `<div class="fix-cmd-inline" style="margin-top:6px"><code>${esc(
|
|
33
|
+
const fixCommand = f.fix && f.fix.runnableCommand
|
|
34
|
+
? f.fix.runnableCommand.replace(OVERRIDES_COMMAND, `cve-lite${projectInfix} overrides`)
|
|
35
|
+
: null;
|
|
36
|
+
const fixHtml = fixCommand
|
|
37
|
+
? `<div class="fix-cmd-inline" style="margin-top:6px"><code>${esc(fixCommand)}</code><button class="copy-btn" data-cmd="${esc(fixCommand)}">Copy</button></div>`
|
|
37
38
|
: "";
|
|
38
39
|
return (` <tr class="finding ${esc(f.severity)}">` +
|
|
39
40
|
`<td><span class="dep-node">${esc(f.ruleId)}</span></td>` +
|