snyk-cpp-plugin 2.22.1 → 2.22.3
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/display/display.js +14 -5
- package/dist/display/display.js.map +1 -1
- package/dist/display/index.js +0 -10
- package/dist/display/index.js.map +1 -1
- package/dist/scan.js +7 -3
- package/dist/scan.js.map +1 -1
- package/dist/types.d.ts +6 -1
- package/package.json +1 -1
package/dist/display/display.js
CHANGED
|
@@ -95,11 +95,14 @@ function displayIssues(depGraph, issues, issuesData) {
|
|
|
95
95
|
const issuesCount = issues.length == 1 ? '1 issue' : `${issues.length} issues`;
|
|
96
96
|
const hasIssues = issues.length > 0;
|
|
97
97
|
if (hasIssues) {
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
98
|
+
const nonLicenseIssues = issues.filter((issue) => {
|
|
99
|
+
var _a;
|
|
100
|
+
return ((_a = issuesData[issue.issueId]) === null || _a === void 0 ? void 0 : _a.type) !== 'license';
|
|
101
|
+
});
|
|
102
|
+
if (nonLicenseIssues.length > 0) {
|
|
103
|
+
prepareResults(result, nonLicenseIssues, issuesData, 'Issues:');
|
|
101
104
|
}
|
|
102
|
-
const licenseIssues = issues.filter((issue) => issue.type === 'license');
|
|
105
|
+
const licenseIssues = issues.filter((issue) => { var _a; return ((_a = issuesData[issue.issueId]) === null || _a === void 0 ? void 0 : _a.type) === 'license'; });
|
|
103
106
|
if (licenseIssues.length > 0) {
|
|
104
107
|
prepareResults(result, licenseIssues, issuesData, 'License issues:');
|
|
105
108
|
}
|
|
@@ -117,7 +120,7 @@ exports.displayIssues = displayIssues;
|
|
|
117
120
|
function prepareResults(result, issues, issuesData, typeTitle) {
|
|
118
121
|
result.push(chalk.bold(typeTitle));
|
|
119
122
|
for (const { pkgName: name, pkgVersion: version, issueId: vulnId, } of issues) {
|
|
120
|
-
const { title, severity } = issuesData[vulnId];
|
|
123
|
+
const { title, severity, legalInstructionsArray } = issuesData[vulnId];
|
|
121
124
|
const color = common_1.getColorBySeverity(severity);
|
|
122
125
|
const severityAndTitle = color.bold(`\n ✗ [${common_1.capitalize(severity)}] ${title}`);
|
|
123
126
|
const dependencyName = computeDependencyName(name, version);
|
|
@@ -127,6 +130,12 @@ function prepareResults(result, issues, issuesData, typeTitle) {
|
|
|
127
130
|
result.push(severityAndTitle);
|
|
128
131
|
result.push(introducedThrough);
|
|
129
132
|
result.push(urlText);
|
|
133
|
+
if (legalInstructionsArray) {
|
|
134
|
+
result.push(common_1.leftPad(chalk.bold(`Legal instructions:`), 3));
|
|
135
|
+
const { licenseName, legalContent } = legalInstructionsArray[0];
|
|
136
|
+
const legalInstructionsText = common_1.leftPad(`○ for ${licenseName}: ${legalContent}`, 3);
|
|
137
|
+
result.push(legalInstructionsText);
|
|
138
|
+
}
|
|
130
139
|
}
|
|
131
140
|
result.push('');
|
|
132
141
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display.js","sourceRoot":"","sources":["../../lib/display/display.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAW/B,qCAAmE;AACnE,4CAA0C;AAE1C,SAAgB,iBAAiB,CAAC,WAAyB;IACzD,MAAM,MAAM,GAAa,CAAC,KAAK,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;IAC3D,KAAK,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,IAAI,WAAW,EAAE;QACxC,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,KAAK,EAAE;YACjC,KAAK,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE;gBACvC,IAAI,IAAI,KAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,CAAA,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;oBACpD,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;iBAC9C;aACF;SACF;KACF;IACD,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACjB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAfD,8CAeC;AAED,SAAS,mBAAmB,CAC1B,QAAkB,EAClB,OAA4B,EAC5B,aAA6B,EAC7B,qBAA6C;IAE7C,MAAM,oBAAoB,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,KAAK,CAAC;IAC9E,MAAM,WAAW,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC,IAAI,KAAK,CAAC;IAEhE,IAAI,oBAAoB,EAAE;QACxB,OAAO,mBAAmB,CAAC,QAAQ,EAAE,qBAAqB,EAAE,aAAa,CAAC,CAAC;KAC5E;SAAM,IAAI,WAAW,EAAE;QACtB,OAAO,mBAAmB,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;KAC7D;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,qBAAqB,CACnC,OAA4B,EAC5B,QAAkB,EAClB,UAAsB;IAEtB,MAAM,EACJ,aAAa,EACb,MAAM,EACN,UAAU,EACV,qBAAqB,GACtB,GAAG,UAAU,CAAC;IACf,MAAM,iBAAiB,GAAG,mBAAmB,CAC3C,QAAQ,EACR,OAAO,EACP,aAAa,EACb,qBAAqB,CACtB,CAAC;IACF,MAAM,aAAa,GAAG,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IAClE,OAAO,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;AAC5C,CAAC;AAnBD,sDAmBC;AAED,SAAS,qBAAqB,CAAC,IAAY,EAAE,OAAgB;IAC3D,OAAO,GAAG,IAAI,IAAI,OAAO,IAAI,SAAS,EAAE,CAAC;AAC3C,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAY,EAAE,OAAgB;IACzD,OAAO,GAAG,IAAI,IAAI,OAAO,IAAI,EAAE,EAAE,CAAC;AACpC,CAAC;AAED,SAAgB,mBAAmB,CACjC,QAAkB,EAClB,qBAA6C,EAC7C,gBAA+B,EAAE;;IAEjC,IAAI,MAAM,GAAa,EAAE,CAAC;IAC1B,MAAM,YAAY,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,EAAE,CAAC;IAC5C,MAAM,eAAe,GAAG,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,IAAG,CAAC,CAAC;IAEjD,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,MAAM,CAAC;KACf;IAED,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACpD,KAAK,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,YAAY,EAAE;QAC5C,MAAM,YAAY,GAAG,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,cAAc,GAAG,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5D,MAAM,CAAC,IAAI,CAAC,KAAK,gBAAO,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAE/C,IACE,qBAAqB,WACrB,qBAAqB,CAAC,YAAY,CAAC,0CAAE,UAAU,CAAA,EAC/C;YACA,MAAM,CAAC,IAAI,CACT,gBAAO,CACL,eAAe,qBAAqB,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,OAAO,CACnE,CAAC,CACF,EAAE,EACH,CAAC,CACF,CACF,CAAC;SACH;QAED,IAAI,CAAC,gBAAO,CAAC,aAAa,CAAC,EAAE;YAC3B,MAAM,0BAA0B,GAAG,oBAAoB,CACrD,aAAa,EACb,YAAY,CACb,CAAC;YACF,MAAM,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,0BAA0B,CAAC,CAAC;SACrD;KACF;IAED,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACjB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AA/CD,kDA+CC;AAED,SAAS,oBAAoB,CAC3B,aAA4B,EAC5B,YAAoB;IAEpB,MAAM,yBAAyB,GAAG,CAAC,CAAC;IACpC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC,KAAK,CAC1D,CAAC,EACD,yBAAyB,CAC1B,CAAC;IAEF,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE;QAClD,MAAM,CAAC,IAAI,CAAC,gBAAO,CAAC,KAAK,iBAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;KACnD;IAED,IAAI,aAAa,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QAC1C,MAAM,CAAC,IAAI,CACT,gBAAO,CACL,WAAW,aAAa,CAAC,YAAY,CAAC,CAAC,MAAM;YAC3C,yBAAyB,aAAa,EACxC,CAAC,CACF,CACF,CAAC;KACH;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,aAAa,CAC3B,QAAkB,EAClB,MAAe,EACf,UAAsB;IAEtB,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,YAAY,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,EAAE,CAAC;IAC5C,MAAM,oBAAoB,GACxB,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,KAAI,CAAC;QACvB,CAAC,CAAC,cAAc;QAChB,CAAC,CAAC,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,eAAe,CAAC;IAE7C,MAAM,WAAW,GACf,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,SAAS,CAAC;IAE7D,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAEpC,IAAI,SAAS,EAAE;QACb,MAAM,
|
|
1
|
+
{"version":3,"file":"display.js","sourceRoot":"","sources":["../../lib/display/display.ts"],"names":[],"mappings":"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"}
|
package/dist/display/index.js
CHANGED
|
@@ -11,7 +11,6 @@ async function display(scanResults, testResults, errors, options) {
|
|
|
11
11
|
error_1.exitWith(error_1.ExitCode.Error, display_1.displayErrors(errors).join('\n'));
|
|
12
12
|
}
|
|
13
13
|
let result = [];
|
|
14
|
-
let hasDependencies = false;
|
|
15
14
|
let hasVulnerabilities = false;
|
|
16
15
|
try {
|
|
17
16
|
if (options === null || options === void 0 ? void 0 : options.path) {
|
|
@@ -22,14 +21,8 @@ async function display(scanResults, testResults, errors, options) {
|
|
|
22
21
|
result = result.concat(display_1.displaySignatures(scanResults));
|
|
23
22
|
}
|
|
24
23
|
for (const testResult of testResults) {
|
|
25
|
-
testResult.issues.forEach((issue) => (issue.type = issue.issueId.startsWith('snyk:lic:unmanaged:')
|
|
26
|
-
? 'license'
|
|
27
|
-
: 'vulnerability'));
|
|
28
24
|
const depGraph = dep_graph_1.createFromJSON(testResult.depGraphData);
|
|
29
25
|
const [dependencies, issues] = display_1.selectDisplayStrategy(options, depGraph, testResult);
|
|
30
|
-
if (testResult.depGraphData.pkgs.length > 1) {
|
|
31
|
-
hasDependencies = true;
|
|
32
|
-
}
|
|
33
26
|
if (testResult.issues.length > 0) {
|
|
34
27
|
hasVulnerabilities = true;
|
|
35
28
|
}
|
|
@@ -44,9 +37,6 @@ async function display(scanResults, testResults, errors, options) {
|
|
|
44
37
|
if (hasVulnerabilities) {
|
|
45
38
|
error_1.exitWith(error_1.ExitCode.VulnerabilitiesFound, output, testResults);
|
|
46
39
|
}
|
|
47
|
-
if (!hasDependencies) {
|
|
48
|
-
error_1.exitWith(error_1.ExitCode.NoSupportedFiles, `${output}\nCould not find any source code matching the Snyk database of open source dependencies in ${options === null || options === void 0 ? void 0 : options.path}\nPlease see our documentation for supported languages and target files: ${chalk.underline('https://snyk.co/udVgQ')} and make sure you are in the right directory.`);
|
|
49
|
-
}
|
|
50
40
|
return output;
|
|
51
41
|
}
|
|
52
42
|
exports.display = display;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/display/index.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,oCAAiC;AACjC,+CAAiD;AAEjD,uCAImB;AACnB,0CAAoD;AAE7C,KAAK,UAAU,OAAO,CAC3B,WAAyB,EACzB,WAAyB,EACzB,MAAgB,EAChB,OAAiB;IAEjB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,gBAAQ,CAAC,gBAAQ,CAAC,KAAK,EAAE,uBAAa,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;KAC5D;IAED,IAAI,MAAM,GAAa,EAAE,CAAC;IAE1B,IAAI,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/display/index.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,oCAAiC;AACjC,+CAAiD;AAEjD,uCAImB;AACnB,0CAAoD;AAE7C,KAAK,UAAU,OAAO,CAC3B,WAAyB,EACzB,WAAyB,EACzB,MAAgB,EAChB,OAAiB;IAEjB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,gBAAQ,CAAC,gBAAQ,CAAC,KAAK,EAAE,uBAAa,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;KAC5D;IAED,IAAI,MAAM,GAAa,EAAE,CAAC;IAE1B,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAE/B,IAAI;QACF,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,EAAE;YACjB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,OAAO,CAAC,IAAI,OAAO,CAAC,CAAC;YAClE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAChC;QAED,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,EAAE;YAClB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,2BAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;SACxD;QAED,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAM,QAAQ,GAAG,0BAAc,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YACzD,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,+BAAqB,CAClD,OAAO,EACP,QAAQ,EACR,UAAU,CACX,CAAC;YAEF,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBAChC,kBAAkB,GAAG,IAAI,CAAC;aAC3B;YAED,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SAC9C;KACF;IAAC,OAAO,KAAK,EAAE;QACd,aAAK,CAAC,KAAK,CAAC,OAAO,IAAI,iCAAiC,KAAK,EAAE,CAAC,CAAC;QACjE,gBAAQ,CAAC,gBAAQ,CAAC,KAAK,EAAE,2BAA2B,CAAC,CAAC;KACvD;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjC,IAAI,kBAAkB,EAAE;QACtB,gBAAQ,CAAC,gBAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;KAC9D;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAlDD,0BAkDC"}
|
package/dist/scan.js
CHANGED
|
@@ -14,6 +14,7 @@ const fs_1 = require("./utils/fs");
|
|
|
14
14
|
const common_1 = require("./common");
|
|
15
15
|
const dotSnyk = require("./utils/dotsnyk");
|
|
16
16
|
const invariants_1 = require("./utils/dotsnyk/invariants");
|
|
17
|
+
const error_1 = require("./utils/error");
|
|
17
18
|
function toRelativePaths(basedir, signatures, extractionWorkspace) {
|
|
18
19
|
signatures.forEach((s) => {
|
|
19
20
|
const src = extractionWorkspace && s.path.includes(extractionWorkspace)
|
|
@@ -47,7 +48,7 @@ async function scan(options) {
|
|
|
47
48
|
}
|
|
48
49
|
const [filePaths, archivePaths] = await find_1.find(projectRoot, excludedPatterns);
|
|
49
50
|
if (filePaths.length + archivePaths.length == 0) {
|
|
50
|
-
|
|
51
|
+
error_1.exitWith(error_1.ExitCode.NoSupportedFiles, `There were no files in the target directory that could be scanned. Check if the directory is empty or if an ignore policy is active.`);
|
|
51
52
|
}
|
|
52
53
|
let extractionWorkspace = undefined;
|
|
53
54
|
if (0 < extractionDepthLimit && 0 < archivePaths.length) {
|
|
@@ -104,8 +105,11 @@ async function scan(options) {
|
|
|
104
105
|
scanResults,
|
|
105
106
|
};
|
|
106
107
|
}
|
|
107
|
-
catch (
|
|
108
|
-
|
|
108
|
+
catch (err) {
|
|
109
|
+
if (err.code != undefined) {
|
|
110
|
+
throw err;
|
|
111
|
+
}
|
|
112
|
+
throw new Error(`Could not scan C/C++ project: ${err}`);
|
|
109
113
|
}
|
|
110
114
|
}
|
|
111
115
|
exports.scan = scan;
|
package/dist/scan.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../lib/scan.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,6BAA6B;AAC7B,+BAAwC;AAYxC,mCAAgC;AAChC,iCAA8B;AAC9B,qDAA0C;AAC1C,6CAA6D;AAC7D,+BAAkC;AAClC,uCAAoC;AACpC,mCAAgD;AAChD,qCAA8D;AAC9D,2CAA2C;AAE3C,2DAAsE;
|
|
1
|
+
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../lib/scan.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -56,15 +56,20 @@ export interface Issue {
|
|
|
56
56
|
fixInfo: {
|
|
57
57
|
nearestFixedInVersion?: string;
|
|
58
58
|
};
|
|
59
|
-
type?: string;
|
|
60
59
|
}
|
|
61
60
|
export interface IssuesData {
|
|
62
61
|
[issueId: string]: {
|
|
63
62
|
id: string;
|
|
64
63
|
severity: string;
|
|
65
64
|
title: string;
|
|
65
|
+
type?: string | undefined;
|
|
66
|
+
legalInstructionsArray?: LegalInstruction[];
|
|
66
67
|
};
|
|
67
68
|
}
|
|
69
|
+
export interface LegalInstruction {
|
|
70
|
+
licenseName: string;
|
|
71
|
+
legalContent: string;
|
|
72
|
+
}
|
|
68
73
|
export interface TestResult {
|
|
69
74
|
issues: Issue[];
|
|
70
75
|
issuesData: IssuesData;
|
package/package.json
CHANGED