snyk 1.305.1 → 1.306.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/dist/cli/commands/test/formatters/format-reachability.js +42 -0
- package/dist/cli/commands/test/formatters/format-reachability.js.map +1 -0
- package/dist/cli/commands/test/formatters/legacy-format-issue.js +13 -0
- package/dist/cli/commands/test/formatters/legacy-format-issue.js.map +1 -1
- package/dist/cli/commands/test/formatters/remediation-based-format-issues.js +10 -3
- package/dist/cli/commands/test/formatters/remediation-based-format-issues.js.map +1 -1
- package/dist/cli/commands/test/index.js +1 -0
- package/dist/cli/commands/test/index.js.map +1 -1
- package/dist/lib/snyk-test/legacy.js +7 -0
- package/dist/lib/snyk-test/legacy.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const wrap = require("wrap-ansi");
|
|
4
|
+
const chalk_1 = require("chalk");
|
|
5
|
+
const legacy_1 = require("../../../../lib/snyk-test/legacy");
|
|
6
|
+
const reachabilityLevels = {
|
|
7
|
+
[legacy_1.REACHABILITY.FUNCTION]: {
|
|
8
|
+
color: chalk_1.default.redBright,
|
|
9
|
+
text: 'Reachable by function call',
|
|
10
|
+
},
|
|
11
|
+
[legacy_1.REACHABILITY.PACKAGE]: {
|
|
12
|
+
color: chalk_1.default.yellow,
|
|
13
|
+
text: 'Reachable by package import',
|
|
14
|
+
},
|
|
15
|
+
[legacy_1.REACHABILITY.UNREACHABLE]: {
|
|
16
|
+
color: chalk_1.default.blueBright,
|
|
17
|
+
text: 'Unreachable',
|
|
18
|
+
},
|
|
19
|
+
[legacy_1.REACHABILITY.NO_INFO]: {
|
|
20
|
+
color: (str) => str,
|
|
21
|
+
text: '',
|
|
22
|
+
},
|
|
23
|
+
};
|
|
24
|
+
function formatReachability(reachability) {
|
|
25
|
+
if (!reachability) {
|
|
26
|
+
return '';
|
|
27
|
+
}
|
|
28
|
+
const reachableInfo = reachabilityLevels[reachability];
|
|
29
|
+
const textFunc = reachableInfo ? reachableInfo.color : (str) => str;
|
|
30
|
+
const text = reachableInfo && reachableInfo.text ? `[${reachableInfo.text}]` : '';
|
|
31
|
+
return wrap(textFunc(text), 100);
|
|
32
|
+
}
|
|
33
|
+
exports.formatReachability = formatReachability;
|
|
34
|
+
function getReachabilityText(reachability) {
|
|
35
|
+
if (!reachability) {
|
|
36
|
+
return '';
|
|
37
|
+
}
|
|
38
|
+
const reachableInfo = reachabilityLevels[reachability];
|
|
39
|
+
return reachableInfo ? reachableInfo.text : '';
|
|
40
|
+
}
|
|
41
|
+
exports.getReachabilityText = getReachabilityText;
|
|
42
|
+
//# sourceMappingURL=format-reachability.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"format-reachability.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/formatters/format-reachability.ts"],"names":[],"mappings":";;AAAA,kCAAkC;AAClC,iCAA0B;AAE1B,6DAAgE;AAEhE,MAAM,kBAAkB,GAEpB;IACF,CAAC,qBAAY,CAAC,QAAQ,CAAC,EAAE;QACvB,KAAK,EAAE,eAAK,CAAC,SAAS;QACtB,IAAI,EAAE,4BAA4B;KACnC;IACD,CAAC,qBAAY,CAAC,OAAO,CAAC,EAAE;QACtB,KAAK,EAAE,eAAK,CAAC,MAAM;QACnB,IAAI,EAAE,6BAA6B;KACpC;IACD,CAAC,qBAAY,CAAC,WAAW,CAAC,EAAE;QAC1B,KAAK,EAAE,eAAK,CAAC,UAAU;QACvB,IAAI,EAAE,aAAa;KACpB;IACD,CAAC,qBAAY,CAAC,OAAO,CAAC,EAAE;QACtB,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG;QACnB,IAAI,EAAE,EAAE;KACT;CACF,CAAC;AAEF,SAAgB,kBAAkB,CAAC,YAA2B;IAC5D,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,EAAE,CAAC;KACX;IACD,MAAM,aAAa,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC;IACpE,MAAM,IAAI,GACR,aAAa,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAEvE,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC;AAVD,gDAUC;AAED,SAAgB,mBAAmB,CAAC,YAA2B;IAC7D,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,EAAE,CAAC;KACX;IACD,MAAM,aAAa,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACvD,OAAO,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AACjD,CAAC;AAND,kDAMC"}
|
|
@@ -7,6 +7,7 @@ const detect_1 = require("../../../../lib/detect");
|
|
|
7
7
|
const snykModule = require("snyk-module");
|
|
8
8
|
const package_managers_1 = require("../../../../lib/package-managers");
|
|
9
9
|
const legal_license_instructions_1 = require("./legal-license-instructions");
|
|
10
|
+
const format_reachability_1 = require("./format-reachability");
|
|
10
11
|
function formatIssues(vuln, options) {
|
|
11
12
|
const vulnID = vuln.list[0].id;
|
|
12
13
|
const packageManager = options.packageManager;
|
|
@@ -34,6 +35,7 @@ function formatIssues(vuln, options) {
|
|
|
34
35
|
' '.repeat(2) +
|
|
35
36
|
legal_license_instructions_1.formatLegalInstructions(vuln.legalInstructionsArray, 2)
|
|
36
37
|
: '',
|
|
38
|
+
reachability: vuln.reachability ? createReachabilityInText(vuln) : '',
|
|
37
39
|
};
|
|
38
40
|
return (`${vulnOutput.issueHeading}\n` +
|
|
39
41
|
`${vulnOutput.description}\n` +
|
|
@@ -41,6 +43,7 @@ function formatIssues(vuln, options) {
|
|
|
41
43
|
`${vulnOutput.introducedThrough}\n` +
|
|
42
44
|
vulnOutput.fromPaths +
|
|
43
45
|
// Optional - not always there
|
|
46
|
+
vulnOutput.reachability +
|
|
44
47
|
vulnOutput.remediationInfo +
|
|
45
48
|
vulnOutput.dockerfilePackage +
|
|
46
49
|
vulnOutput.fixedIn +
|
|
@@ -123,6 +126,16 @@ function createFixedInText(vuln) {
|
|
|
123
126
|
}
|
|
124
127
|
return '';
|
|
125
128
|
}
|
|
129
|
+
function createReachabilityInText(vuln) {
|
|
130
|
+
if (!vuln.reachability) {
|
|
131
|
+
return '';
|
|
132
|
+
}
|
|
133
|
+
const reachabilityText = format_reachability_1.getReachabilityText(vuln.reachability);
|
|
134
|
+
if (!reachabilityText) {
|
|
135
|
+
return '';
|
|
136
|
+
}
|
|
137
|
+
return `\n Reachability: ${reachabilityText}`;
|
|
138
|
+
}
|
|
126
139
|
function createRemediationText(vuln, packageManager) {
|
|
127
140
|
let wizardHintText = '';
|
|
128
141
|
if (package_managers_1.WIZARD_SUPPORTED_PACKAGE_MANAGERS.includes(packageManager)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy-format-issue.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/formatters/legacy-format-issue.ts"],"names":[],"mappings":";;AAAA,4BAA4B;AAC5B,iCAA0B;AAC1B,iDAAiD;AAEjD,mDAAuD;AACvD,0CAA0C;AAC1C,uEAI0C;AAM1C,6EAAuE;
|
|
1
|
+
{"version":3,"file":"legacy-format-issue.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/formatters/legacy-format-issue.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ const chalk_1 = require("chalk");
|
|
|
4
4
|
const config = require("../../../../lib/config");
|
|
5
5
|
const common_1 = require("../../../../lib/snyk-test/common");
|
|
6
6
|
const legal_license_instructions_1 = require("./legal-license-instructions");
|
|
7
|
+
const format_reachability_1 = require("./format-reachability");
|
|
7
8
|
function formatIssuesWithRemediation(vulns, remediationInfo, options) {
|
|
8
9
|
const basicVulnInfo = {};
|
|
9
10
|
const basicLicenseInfo = {};
|
|
@@ -19,6 +20,7 @@ function formatIssuesWithRemediation(vulns, remediationInfo, options) {
|
|
|
19
20
|
note: vuln.note,
|
|
20
21
|
legalInstructions: vuln.legalInstructionsArray,
|
|
21
22
|
paths: vuln.list.map((v) => v.from),
|
|
23
|
+
reachability: vuln.reachability,
|
|
22
24
|
};
|
|
23
25
|
if (vulnData.type === 'license') {
|
|
24
26
|
basicLicenseInfo[vuln.metadata.id] = vulnData;
|
|
@@ -110,7 +112,7 @@ function thisUpgradeFixes(vulnIds, basicVulnInfo, testOptions) {
|
|
|
110
112
|
.sort((a, b) => getSeverityValue(basicVulnInfo[a].severity) -
|
|
111
113
|
getSeverityValue(basicVulnInfo[b].severity))
|
|
112
114
|
.filter((id) => basicVulnInfo[id].type !== 'license')
|
|
113
|
-
.map((id) => formatIssue(id, basicVulnInfo[id].title, basicVulnInfo[id].severity, basicVulnInfo[id].isNew, `${basicVulnInfo[id].name}@${basicVulnInfo[id].version}`, basicVulnInfo[id].paths, testOptions, basicVulnInfo[id].note))
|
|
115
|
+
.map((id) => formatIssue(id, basicVulnInfo[id].title, basicVulnInfo[id].severity, basicVulnInfo[id].isNew, `${basicVulnInfo[id].name}@${basicVulnInfo[id].version}`, basicVulnInfo[id].paths, testOptions, basicVulnInfo[id].note, [], basicVulnInfo[id].reachability))
|
|
114
116
|
.join('\n');
|
|
115
117
|
}
|
|
116
118
|
function processUpgrades(sink, upgradesByDep, deps, basicVulnInfo, testOptions) {
|
|
@@ -184,7 +186,7 @@ function constructUnfixableText(unresolved, basicVulnInfo, testOptions) {
|
|
|
184
186
|
const extraInfo = issue.fixedIn && issue.fixedIn.length
|
|
185
187
|
? `\n This issue was fixed in versions: ${chalk_1.default.bold(issue.fixedIn.join(', '))}`
|
|
186
188
|
: '\n No upgrade or patch available';
|
|
187
|
-
unfixableIssuesTextArray.push(formatIssue(issue.id, issue.title, issue.severity, issue.isNew, `${issue.packageName}@${issue.version}`, issueInfo.paths, testOptions, issueInfo.note) + `${extraInfo}`);
|
|
189
|
+
unfixableIssuesTextArray.push(formatIssue(issue.id, issue.title, issue.severity, issue.isNew, `${issue.packageName}@${issue.version}`, issueInfo.paths, testOptions, issueInfo.note, [], issue.reachability) + `${extraInfo}`);
|
|
188
190
|
}
|
|
189
191
|
if (unfixableIssuesTextArray.length === 1) {
|
|
190
192
|
// seems we still only have
|
|
@@ -196,7 +198,7 @@ function constructUnfixableText(unresolved, basicVulnInfo, testOptions) {
|
|
|
196
198
|
function printPath(path) {
|
|
197
199
|
return path.slice(1).join(' > ');
|
|
198
200
|
}
|
|
199
|
-
function formatIssue(id, title, severity, isNew, vulnerableModule, paths, testOptions, note, legalInstructions) {
|
|
201
|
+
function formatIssue(id, title, severity, isNew, vulnerableModule, paths, testOptions, note, legalInstructions, reachability) {
|
|
200
202
|
const severitiesColourMapping = {
|
|
201
203
|
low: {
|
|
202
204
|
colorFunc(text) {
|
|
@@ -220,6 +222,10 @@ function formatIssue(id, title, severity, isNew, vulnerableModule, paths, testOp
|
|
|
220
222
|
if (legalInstructions) {
|
|
221
223
|
legalLicenseInstructionsText = legal_license_instructions_1.formatLegalInstructions(legalInstructions);
|
|
222
224
|
}
|
|
225
|
+
let reachabilityText = '';
|
|
226
|
+
if (reachability) {
|
|
227
|
+
reachabilityText = `${format_reachability_1.formatReachability(reachability)}`;
|
|
228
|
+
}
|
|
223
229
|
let introducedBy = '';
|
|
224
230
|
if (testOptions.showVulnPaths === 'some' &&
|
|
225
231
|
paths &&
|
|
@@ -243,6 +249,7 @@ function formatIssue(id, title, severity, isNew, vulnerableModule, paths, testOp
|
|
|
243
249
|
}
|
|
244
250
|
}
|
|
245
251
|
return (severitiesColourMapping[severity].colorFunc(` ✗ ${chalk_1.default.bold(title)}${newBadge} [${titleCaseText(severity)} Severity]`) +
|
|
252
|
+
reachabilityText +
|
|
246
253
|
`[${config.ROOT}/vuln/${id}]` +
|
|
247
254
|
name +
|
|
248
255
|
introducedBy +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remediation-based-format-issues.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/formatters/remediation-based-format-issues.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"remediation-based-format-issues.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/formatters/remediation-based-format-issues.ts"],"names":[],"mappings":"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"}
|
|
@@ -408,6 +408,7 @@ function groupVulnerabilities(vulns) {
|
|
|
408
408
|
map[curr.id].dockerBaseImage = curr.dockerBaseImage;
|
|
409
409
|
map[curr.id].nearestFixedInVersion = curr.nearestFixedInVersion;
|
|
410
410
|
map[curr.id].legalInstructionsArray = curr.legalInstructionsArray;
|
|
411
|
+
map[curr.id].reachability = curr.reachability;
|
|
411
412
|
}
|
|
412
413
|
map[curr.id].list.push(curr);
|
|
413
414
|
if (!map[curr.id].isFixable) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/commands/test/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/commands/test/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,13 @@ var SEVERITY;
|
|
|
8
8
|
SEVERITY["MEDIUM"] = "medium";
|
|
9
9
|
SEVERITY["HIGH"] = "high";
|
|
10
10
|
})(SEVERITY = exports.SEVERITY || (exports.SEVERITY = {}));
|
|
11
|
+
var REACHABILITY;
|
|
12
|
+
(function (REACHABILITY) {
|
|
13
|
+
REACHABILITY["FUNCTION"] = "function";
|
|
14
|
+
REACHABILITY["PACKAGE"] = "package";
|
|
15
|
+
REACHABILITY["UNREACHABLE"] = "unreachable";
|
|
16
|
+
REACHABILITY["NO_INFO"] = "no-info";
|
|
17
|
+
})(REACHABILITY = exports.REACHABILITY || (exports.REACHABILITY = {}));
|
|
11
18
|
function convertTestDepGraphResultToLegacy(res, depGraph, packageManager, severityThreshold) {
|
|
12
19
|
const result = res.result;
|
|
13
20
|
const upgradePathsMap = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/lib/snyk-test/legacy.ts"],"names":[],"mappings":";;AAAA,4BAA4B;AAG5B,qCAAsC;AActC,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,uBAAW,CAAA;IACX,6BAAiB,CAAA;IACjB,yBAAa,CAAA;AACf,CAAC,EAJW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAInB;
|
|
1
|
+
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/lib/snyk-test/legacy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED