cve-lite-cli 1.19.0 → 1.19.1
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.
|
@@ -169,7 +169,7 @@ export function buildSuggestedFixCommandPlan(findings, scanInput, options) {
|
|
|
169
169
|
severity: finding.severity,
|
|
170
170
|
adjusted: false,
|
|
171
171
|
adjustmentNote: null,
|
|
172
|
-
reason:
|
|
172
|
+
reason: finding.recommendedNpmTransitiveRemediation.reason,
|
|
173
173
|
command: buildNpmUpdateCommand(finding.recommendedNpmTransitiveRemediation.package, finding.recommendedNpmTransitiveRemediation.workspaces),
|
|
174
174
|
usage: finding.usage ?? null,
|
|
175
175
|
});
|
|
@@ -54,9 +54,21 @@ export async function resolveNpmTransitiveRemediation(args) {
|
|
|
54
54
|
return null;
|
|
55
55
|
const { directParentName, immediateParentName, directParent } = directParentContext;
|
|
56
56
|
const vulnerableName = args.finding.pkg.name;
|
|
57
|
-
|
|
57
|
+
const fixHint = args.finding.validatedFirstFixedVersion ?? args.finding.firstFixedVersion;
|
|
58
|
+
// For deeper chains (directParent → ... → immediateParent → vulnerable), check if the
|
|
59
|
+
// immediate parent's declared range for the vulnerable package already covers a safe version.
|
|
60
|
+
// If so, a lockfile refresh of the vulnerable package itself is sufficient.
|
|
58
61
|
if (directParentName !== immediateParentName) {
|
|
59
|
-
return
|
|
62
|
+
return resolveWithinRangeForDeepChain({
|
|
63
|
+
graph: args.graph,
|
|
64
|
+
immediateParentName,
|
|
65
|
+
vulnerableName,
|
|
66
|
+
installedVersion: args.finding.pkg.version,
|
|
67
|
+
fixHint,
|
|
68
|
+
viaPath,
|
|
69
|
+
packages: args.packages,
|
|
70
|
+
offline: args.offline,
|
|
71
|
+
});
|
|
60
72
|
}
|
|
61
73
|
const parentNodeId = resolveParentNodeId({
|
|
62
74
|
graph: args.graph,
|
|
@@ -67,7 +79,6 @@ export async function resolveNpmTransitiveRemediation(args) {
|
|
|
67
79
|
});
|
|
68
80
|
if (!parentNodeId)
|
|
69
81
|
return null;
|
|
70
|
-
const fixHint = args.finding.validatedFirstFixedVersion ?? args.finding.firstFixedVersion;
|
|
71
82
|
const safeCandidates = args.offline
|
|
72
83
|
? buildOfflineSafeCandidates(args.finding.pkg.version, fixHint)
|
|
73
84
|
: await findSafeChildCandidates(vulnerableName, args.finding.pkg.version, fixHint);
|
|
@@ -280,6 +291,38 @@ function parseCoreVersion(version) {
|
|
|
280
291
|
const [major = "0", minor = "0", patch = "0"] = version.split(/[+-]/)[0].split(".");
|
|
281
292
|
return [Number(major), Number(minor), Number(patch)];
|
|
282
293
|
}
|
|
294
|
+
async function resolveWithinRangeForDeepChain(args) {
|
|
295
|
+
const immediateParent = args.packages.find(p => p.name === args.immediateParentName);
|
|
296
|
+
if (!immediateParent || !looksLikeVersion(immediateParent.version))
|
|
297
|
+
return null;
|
|
298
|
+
const nodeIds = args.graph.nodeIdsFor(args.immediateParentName, immediateParent.version);
|
|
299
|
+
if (nodeIds.length === 0)
|
|
300
|
+
return null;
|
|
301
|
+
const safeCandidates = args.offline
|
|
302
|
+
? buildOfflineSafeCandidates(args.installedVersion, args.fixHint)
|
|
303
|
+
: await findSafeChildCandidates(args.vulnerableName, args.installedVersion, args.fixHint);
|
|
304
|
+
if (safeCandidates.length === 0)
|
|
305
|
+
return null;
|
|
306
|
+
for (const nodeId of nodeIds) {
|
|
307
|
+
const inRangeTarget = findSafeVersionWithinParentRange({
|
|
308
|
+
graph: args.graph,
|
|
309
|
+
parentNodeId: nodeId,
|
|
310
|
+
childName: args.vulnerableName,
|
|
311
|
+
candidates: safeCandidates,
|
|
312
|
+
});
|
|
313
|
+
if (inRangeTarget) {
|
|
314
|
+
return {
|
|
315
|
+
kind: "update-parent-within-range",
|
|
316
|
+
package: args.vulnerableName,
|
|
317
|
+
currentVersion: args.installedVersion,
|
|
318
|
+
targetChildVersion: inRangeTarget,
|
|
319
|
+
viaPath: args.viaPath,
|
|
320
|
+
reason: `${args.immediateParentName}@${immediateParent.version} already allows ${args.vulnerableName}@${inRangeTarget} within the current dependency range`,
|
|
321
|
+
};
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
return null;
|
|
325
|
+
}
|
|
283
326
|
function collectWorkspacesFromAllPaths(dependencyPaths, workspaceMap) {
|
|
284
327
|
if (!workspaceMap)
|
|
285
328
|
return undefined;
|