snyk-cpp-plugin 2.22.0 → 2.22.2
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/index.js +0 -7
- package/dist/display/index.js.map +1 -1
- package/dist/scan.js +8 -4
- package/dist/scan.js.map +1 -1
- package/package.json +1 -1
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) {
|
|
@@ -27,9 +26,6 @@ async function display(scanResults, testResults, errors, options) {
|
|
|
27
26
|
: 'vulnerability'));
|
|
28
27
|
const depGraph = dep_graph_1.createFromJSON(testResult.depGraphData);
|
|
29
28
|
const [dependencies, issues] = display_1.selectDisplayStrategy(options, depGraph, testResult);
|
|
30
|
-
if (testResult.depGraphData.pkgs.length > 1) {
|
|
31
|
-
hasDependencies = true;
|
|
32
|
-
}
|
|
33
29
|
if (testResult.issues.length > 0) {
|
|
34
30
|
hasVulnerabilities = true;
|
|
35
31
|
}
|
|
@@ -44,9 +40,6 @@ async function display(scanResults, testResults, errors, options) {
|
|
|
44
40
|
if (hasVulnerabilities) {
|
|
45
41
|
error_1.exitWith(error_1.ExitCode.VulnerabilitiesFound, output, testResults);
|
|
46
42
|
}
|
|
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
43
|
return output;
|
|
51
44
|
}
|
|
52
45
|
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,UAAU,CAAC,MAAM,CAAC,OAAO,CACvB,CAAC,KAAK,EAAE,EAAE,CACR,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC;gBAC3D,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,eAAe,CAAC,CACvB,CAAC;YACF,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;AAxDD,0BAwDC"}
|
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)
|
|
@@ -46,8 +47,8 @@ async function scan(options) {
|
|
|
46
47
|
});
|
|
47
48
|
}
|
|
48
49
|
const [filePaths, archivePaths] = await find_1.find(projectRoot, excludedPatterns);
|
|
49
|
-
if (
|
|
50
|
-
|
|
50
|
+
if (filePaths.length + archivePaths.length == 0) {
|
|
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/package.json
CHANGED