snyk 1.169.1 → 1.171.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.
- package/dist/cli/args.js +17 -19
- package/dist/cli/args.js.map +1 -1
- package/dist/cli/commands/help.js +29 -13
- package/dist/cli/commands/help.js.map +1 -1
- package/dist/cli/commands/monitor.js +1 -5
- package/dist/cli/commands/monitor.js.map +1 -1
- package/dist/cli/commands/test.js +2 -9
- package/dist/cli/commands/test.js.map +1 -1
- package/dist/cli/index.js +6 -3
- package/dist/cli/index.js.map +1 -1
- package/dist/lib/errors/file-flag-bad-input.js +14 -0
- package/dist/lib/errors/file-flag-bad-input.js.map +1 -0
- package/dist/lib/errors/index.js +4 -2
- package/dist/lib/errors/index.js.map +1 -1
- package/dist/lib/monitor.js +4 -1
- package/dist/lib/monitor.js.map +1 -1
- package/package.json +2 -2
- package/dist/lib/docker-promotion.js +0 -24
- package/dist/lib/docker-promotion.js.map +0 -1
package/dist/cli/args.js
CHANGED
|
@@ -13,42 +13,40 @@ function dashToCamelCase(dash) {
|
|
|
13
13
|
? dash
|
|
14
14
|
: dash.replace(/-[a-z]/g, (m) => m[1].toUpperCase());
|
|
15
15
|
}
|
|
16
|
-
function args(
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
acc._doubleDashArgs.push(arg);
|
|
16
|
+
function args(rawArgv) {
|
|
17
|
+
const argv = {
|
|
18
|
+
_: [],
|
|
19
|
+
};
|
|
20
|
+
for (let arg of rawArgv.slice(2)) {
|
|
21
|
+
if (argv._doubleDashArgs) {
|
|
22
|
+
argv._doubleDashArgs.push(arg);
|
|
24
23
|
}
|
|
25
24
|
else if (arg === '--') {
|
|
26
|
-
|
|
25
|
+
argv._doubleDashArgs = [];
|
|
27
26
|
}
|
|
28
|
-
else if (arg
|
|
27
|
+
else if (arg[0] === '-') {
|
|
29
28
|
arg = arg.slice(1);
|
|
30
29
|
if (alias[arg] !== undefined) {
|
|
31
|
-
|
|
30
|
+
argv[alias[arg]] = true;
|
|
32
31
|
}
|
|
33
|
-
else if (arg
|
|
32
|
+
else if (arg[0] === '-') {
|
|
34
33
|
arg = arg.slice(1);
|
|
35
34
|
if (arg.indexOf('=') === -1) {
|
|
36
|
-
|
|
35
|
+
argv[arg] = true;
|
|
37
36
|
}
|
|
38
37
|
else {
|
|
39
38
|
const parts = arg.split('=');
|
|
40
|
-
|
|
39
|
+
argv[parts.shift()] = parts.join('=');
|
|
41
40
|
}
|
|
42
41
|
}
|
|
43
42
|
else {
|
|
44
|
-
|
|
43
|
+
argv[arg] = true;
|
|
45
44
|
}
|
|
46
45
|
}
|
|
47
46
|
else {
|
|
48
|
-
|
|
47
|
+
argv._.push(arg);
|
|
49
48
|
}
|
|
50
|
-
|
|
51
|
-
}, { _: [] });
|
|
49
|
+
}
|
|
52
50
|
// By passing `-d` to the CLI, we enable the debugging output.
|
|
53
51
|
// It needs to happen BEFORE any of the `debug(namespace)` calls needed to create loggers.
|
|
54
52
|
// Therefore, the code used by the CLI should create the loggers in a lazy fashion
|
|
@@ -69,7 +67,7 @@ function args(processargv) {
|
|
|
69
67
|
const cli = require('./commands');
|
|
70
68
|
// the first argument is the command we'll execute, everything else will be
|
|
71
69
|
// an argument to our command, like `snyk help protect`
|
|
72
|
-
let command = argv._.shift();
|
|
70
|
+
let command = argv._.shift(); // can actually be undefined
|
|
73
71
|
// alias switcheroo - allows us to have
|
|
74
72
|
if (cli.aliases[command]) {
|
|
75
73
|
command = cli.aliases[command];
|
package/dist/cli/args.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/cli/args.ts"],"names":[],"mappings":";;AAAA,iCAAiC;AAEjC,qCAAsC;AAQtC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;AACxF,KAAK,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,yBAAyB;AAC5C,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC;AAEjB,uEAAuE;AACvE,wFAAwF;AACxF,MAAM,wBAAwB,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;AAEhE,SAAS,eAAe,CAAC,IAAI;IAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;QAC1B,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AACzD,CAAC;
|
|
1
|
+
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/cli/args.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
|
+
const fs = require("then-fs");
|
|
12
|
+
const path = require("path");
|
|
13
|
+
const Debug = require("debug");
|
|
14
|
+
const debug = Debug('snyk');
|
|
5
15
|
function help(item) {
|
|
6
|
-
|
|
7
|
-
item
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
17
|
+
if (!item || item === true || typeof item !== 'string') {
|
|
18
|
+
item = 'usage';
|
|
19
|
+
}
|
|
20
|
+
// cleanse the filename to only contain letters
|
|
21
|
+
// aka: /\W/g but figured this was easier to read
|
|
22
|
+
item = item.replace(/[^a-z-]/gi, '');
|
|
23
|
+
const filename = path.resolve(__dirname, '../../../help', item + '.txt');
|
|
24
|
+
try {
|
|
25
|
+
yield fs.readFile(filename, 'utf8');
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
debug(error);
|
|
29
|
+
return `'${item}' help can't be found at location: ${filename}`;
|
|
30
|
+
}
|
|
16
31
|
});
|
|
17
32
|
}
|
|
33
|
+
exports.help = help;
|
|
18
34
|
//# sourceMappingURL=help.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/commands/help.
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/cli/commands/help.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,8BAA8B;AAC9B,6BAA6B;AAC7B,+BAA+B;AAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;AAE5B,SAAsB,IAAI,CAAC,IAAsB;;QAC/C,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACtD,IAAI,GAAG,OAAO,CAAC;SAChB;QAED,+CAA+C;QAC/C,iDAAiD;QACjD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAErC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,CAAC;QACzE,IAAI;YACF,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SACrC;QAAC,OAAO,KAAK,EAAE;YACd,KAAK,CAAC,KAAK,CAAC,CAAC;YACb,OAAO,IAAI,IAAI,sCAAsC,QAAQ,EAAE,CAAC;SACjE;IACH,CAAC;CAAA;AAhBD,oBAgBC"}
|
|
@@ -22,7 +22,6 @@ const spinner = require("../../lib/spinner");
|
|
|
22
22
|
const detect = require("../../lib/detect");
|
|
23
23
|
const plugins = require("../../lib/plugins");
|
|
24
24
|
const module_info_1 = require("../../lib/module-info"); // TODO(kyegupov): fix import
|
|
25
|
-
const docker = require("../../lib/docker-promotion");
|
|
26
25
|
const types_1 = require("../../lib/types");
|
|
27
26
|
const SEPARATOR = '\n-------------------------------------------------------\n';
|
|
28
27
|
// This is used instead of `let x; try { x = await ... } catch { cleanup }` to avoid
|
|
@@ -170,7 +169,7 @@ function monitor(...args0) {
|
|
|
170
169
|
function formatMonitorOutput(packageManager, res, manageUrl, options, subProjectName, advertiseSubprojectsCount) {
|
|
171
170
|
const issues = res.licensesPolicy ? 'issues' : 'vulnerabilities';
|
|
172
171
|
const humanReadableName = subProjectName ? `${res.path} (${subProjectName})` : res.path;
|
|
173
|
-
|
|
172
|
+
const strOutput = chalk_1.default.bold.white('\nMonitoring ' + humanReadableName + '...\n\n') +
|
|
174
173
|
(packageManager === 'yarn' ?
|
|
175
174
|
'A yarn.lock file was detected - continuing as a Yarn project.\n' : '') +
|
|
176
175
|
'Explore this snapshot at ' + res.uri + '\n\n' +
|
|
@@ -188,9 +187,6 @@ function formatMonitorOutput(packageManager, res, manageUrl, options, subProject
|
|
|
188
187
|
'and are now on a free 14-day premium trial.\n' +
|
|
189
188
|
'View plans here: ' + manageUrl + '\n\n') :
|
|
190
189
|
'');
|
|
191
|
-
if (docker.shouldSuggestDocker(options)) {
|
|
192
|
-
strOutput += chalk_1.default.bold.white(docker.suggestionText);
|
|
193
|
-
}
|
|
194
190
|
return options.json ?
|
|
195
191
|
JSON.stringify(_.assign({}, res, {
|
|
196
192
|
manageUrl,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../src/cli/commands/monitor.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;AAEzB,4BAA4B;AAC5B,8BAA8B;AAC9B,mDAA6D;AAC7D,mCAAoC,CAAC,6BAA6B;AAClE,+CAAyD;AACzD,2CAA2C;AAC3C,2BAA2B;AAC3B,iCAA0B;AAC1B,iCAAiC;AACjC,6CAA6C;AAE7C,2CAA2C;AAC3C,6CAA6C;AAC7C,uDAAiD,CAAC,6BAA6B;AAC/E,
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../src/cli/commands/monitor.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;AAEzB,4BAA4B;AAC5B,8BAA8B;AAC9B,mDAA6D;AAC7D,mCAAoC,CAAC,6BAA6B;AAClE,+CAAyD;AACzD,2CAA2C;AAC3C,2BAA2B;AAC3B,iCAA0B;AAC1B,iCAAiC;AACjC,6CAA6C;AAE7C,2CAA2C;AAC3C,6CAA6C;AAC7C,uDAAiD,CAAC,6BAA6B;AAC/E,2CAAuG;AAGvG,MAAM,SAAS,GAAG,6DAA6D,CAAC;AA0BhF,oFAAoF;AACpF,iDAAiD;AACjD,SAAe,gBAAgB,CAAI,CAAa,EAAE,OAAmB;;QACnE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;CAAA;AAED,iGAAiG;AACjG,uBAAuB;AACvB,SAAe,OAAO,CAAC,GAAG,KAAiB;;QACzC,IAAI,IAAI,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;QACtB,IAAI,OAAO,GAAmB,EAAE,CAAC;QACjC,MAAM,OAAO,GAAkC,EAAE,CAAC;QAClD,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,QAAQ,EAAE;YAC7C,OAAO,GAAG,IAAI,CAAC,GAAG,EAAmC,CAAC;SACvD;QAED,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE5B,oDAAoD;QACpD,IAAI,IAAI,CAAC,MAAM,KAAM,CAAC,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;SAC7B;QAED,IAAI,OAAO,CAAC,EAAE,EAAE;YACd,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;SACtB;QAED,IAAI,OAAO,CAAC,kBAAkB,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,EAAE;YAC1D,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;SAC3F;QACD,MAAM,kBAAc,CAAC,cAAc,CAAC,CAAC;QACrC,qEAAqE;QACrE,KAAK,MAAM,IAAI,IAAI,IAAgB,EAAE;YACnC,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACrC,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;oBAC9B,MAAM,IAAI,KAAK,CACb,GAAG,GAAG,IAAI,GAAG,0CAA0C,CAAC,CAAC;iBAC5D;gBAED,IAAI,cAAc,GAAG,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAEhE,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,yCAAyC;oBAC1F,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAErD,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBAE3D,MAAM,UAAU,GAAG,wBAAU,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBAEtD,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CACnC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;gBAE9C,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC;gBAEhE,MAAM,yBAAyB,GAC7B,YAAY,GAAG,YAAY,GAAG,oBAAoB,GAAG,WAAW,CAAC;gBAEnE,MAAM,0BAA0B,GAC9B,+BAA+B,GAAG,WAAW,GAAG,MAAM,CAAC;gBAEzD,MAAM,OAAO,CAAC,yBAAyB,CAAC,CAAC;gBAEzC,6CAA6C;gBAE7C,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBAExE,qDAAqD;gBACrD,MAAM,aAAa,GAA4C,MAAM,gBAAgB,CACjF,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,oBAAO,OAAO,EAAK,aAAa,EAAG,EACtE,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC;gBAE9C,MAAM,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,aAAa,CAAC,CAAC;gBAE9D,MAAM,OAAO,CAAC,0BAA0B,CAAC,CAAC;gBAC1C,IAAI,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE;oBACvC,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC;iBACtD;gBACD,MAAM,IAAI,GAAG;oBACX,QAAQ,EAAE,KAAK;oBACf,gBAAgB,EAAE,cAAc;oBAChC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;oBACrC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,IAAI,MAAM,CAAC,YAAY;oBAC9D,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM;iBAC7B,CAAC;gBAEF,gFAAgF;gBAEhF,uFAAuF;gBACvF,8CAA8C;gBAE9C,IAAI,iBAAiB,GAA0B,EAAE,CAAC;gBAClD,IAAI,yBAAyB,GAAkB,IAAI,CAAC;gBACpD,IAAI,qBAAa,CAAC,aAAa,CAAC,EAAE;oBAChC,iBAAiB,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,CAC5C,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAC,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAC,CAAC,CAAC,CAAC;iBAC5E;qBAAM;oBACL,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC;2BAC7B,aAAa,CAAC,MAAM,CAAC,IAAI;2BACzB,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe;2BACzC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzD,yBAAyB,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;qBAC9E;oBACD,iBAAiB,GAAG,CAAC,aAAa,CAAC,CAAC;iBACrC;gBAED,gDAAgD;gBAChD,KAAK,MAAM,WAAW,IAAI,iBAAiB,EAAE;oBAC3C,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAChC,iBAAW,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,EAChD,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC;oBAE7C,MAAM,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,GAAG,CAAC,CAAC;oBAErD,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;oBAChB,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACvC,IAAI,MAAM,GAAG,EAAE,CAAC;oBAChB,IAAI,GAAG,CAAC,GAAG,EAAE;wBACX,MAAM,GAAG,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC;qBAC5B;oBACD,QAAQ,CAAC,QAAQ,GAAG,MAAM,GAAG,SAAS,CAAC;oBACvC,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAEvC,QAAQ,CAAC,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,GAAG,CAAC,EAAE,CAAC;oBAClD,MAAM,cAAc,GAAG,CAAE,aAAqC,CAAC,QAAQ,CAAC;wBACtE,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI;wBAC1B,CAAC,CAAC,SAAS,CAAC;oBACd,MAAM,SAAS,GAAG,mBAAmB,CACnC,cAAc,EACd,GAAG,EACH,SAAS,EACT,OAAO,EACP,cAAc,EACd,yBAAyB,CAC1B,CAAC;oBACF,OAAO,CAAC,IAAI,CAAC,EAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAC,CAAC,CAAC;iBACjE;gBACD,qBAAqB;aACtB;YAAC,OAAO,GAAG,EAAE;gBACZ,sCAAsC;gBACtC,OAAO,CAAC,IAAI,CAAC,EAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAC,CAAC,CAAC;aAC5C;SACF;QACD,+CAA+C;QAC/C,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,IAAI,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBACtC,IAAI,MAAM,CAAC,EAAE,EAAE;oBACb,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBACzC,IAAI,MAAM,CAAC,cAAc,EAAE;wBACzB,QAAQ,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;qBACjD;oBACD,OAAO,QAAQ,CAAC;iBACjB;gBACD,OAAO,EAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAC,CAAC;YACpE,CAAC,CAAC,CAAC;YACH,oDAAoD;YACpD,UAAU,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAClE,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAEjD,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAClC,OAAO,IAAI,CAAC;aACb;YAED,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;SACvB;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACjC,IAAI,GAAG,CAAC,EAAE,EAAE;gBACV,OAAO,GAAG,CAAC,IAAI,CAAC;aACjB;YAED,MAAM,YAAY,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;gBACvD,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;gBACtC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC;YAE5D,OAAO,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC,IAAI,GAAG,SAAS,CAAC;gBAC7D,YAAY,CAAC;QACjB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,CAAC;QAE1B,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAClC,OAAO,MAAM,CAAC;SACf;QAED,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;CAAA;AAED,SAAS,mBAAmB,CACxB,cAAc,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,cAAuB,EAAE,yBAAuC;IAE3G,MAAM,MAAM,GAAG,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC;IACjE,MAAM,iBAAiB,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,KAAK,cAAc,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;IACxF,MAAM,SAAS,GAAG,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,iBAAiB,GAAG,SAAS,CAAC;QACjF,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC;YAC1B,iEAAiE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,2BAA2B,GAAG,GAAG,CAAC,GAAG,GAAG,MAAM;QAChD,CAAC,yBAAyB,CAAC,CAAC;YAC1B,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,2CAA2C,yBAAyB,KAAK;gBAC1F,2DAA2D,CAAC,CAAC,CAAC;YAC9D,EAAE,CAAC;QACL,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAChB,sCAAsC,GAAG,MAAM,GAAG,WAAW;gBAC7D,iDAAiD,CAAC,CAAC;YACnD,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,mDAAmD;gBAChE,oCAAoC,GAAG,SAAS,GAAG,MAAM,CAAC,CAAC;QAC/D,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACjB,eAAK,CAAC,MAAM,CAAC,4CAA4C;gBACvD,+CAA+C;gBAC/C,mBAAmB,GAAG,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC;YAC7C,EAAE,CAAC,CAAC;IAER,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;QACnB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE;YAC/B,SAAS;YACT,cAAc;SACf,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACpB,CAAC"}
|
|
@@ -16,14 +16,11 @@ const config = require("../../lib/config");
|
|
|
16
16
|
const is_ci_1 = require("../../lib/is-ci");
|
|
17
17
|
const api_token_1 = require("../../lib/api-token");
|
|
18
18
|
const common_1 = require("../../lib/snyk-test/common");
|
|
19
|
-
const docker = require("../../lib/docker-promotion");
|
|
20
19
|
const Debug = require("debug");
|
|
21
20
|
const detect_1 = require("../../lib/detect");
|
|
22
21
|
const debug = Debug('snyk');
|
|
23
22
|
const SEPARATOR = '\n-------------------------------------------------------\n';
|
|
24
23
|
// TODO: avoid using `as any` whenever it's possible
|
|
25
|
-
// arguments array is 0 or more `path` strings followed by
|
|
26
|
-
// an optional `option` object
|
|
27
24
|
function test(...args) {
|
|
28
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
26
|
const resultOptions = [];
|
|
@@ -216,10 +213,6 @@ function displayResult(res, options) {
|
|
|
216
213
|
pathOrDepsText += options.path;
|
|
217
214
|
}
|
|
218
215
|
const testedInfoText = `Tested ${pathOrDepsText} for known ${issuesText}`;
|
|
219
|
-
let dockerSuggestion = '';
|
|
220
|
-
if (docker.shouldSuggestDocker(options)) {
|
|
221
|
-
dockerSuggestion += chalk_1.default.bold.white(docker.suggestionText);
|
|
222
|
-
}
|
|
223
216
|
let multiProjAdvice = '';
|
|
224
217
|
if (options.advertiseSubprojectsCount) {
|
|
225
218
|
multiProjAdvice = chalk_1.default.bold.white(`\n\nThis project has multiple sub-projects (${options.advertiseSubprojectsCount}), ` +
|
|
@@ -238,8 +231,7 @@ function displayResult(res, options) {
|
|
|
238
231
|
'your CI/test.';
|
|
239
232
|
return (prefix + meta + summaryOKText + multiProjAdvice + (is_ci_1.isCI() ? '' :
|
|
240
233
|
dockerAdvice +
|
|
241
|
-
nextStepsText
|
|
242
|
-
dockerSuggestion));
|
|
234
|
+
nextStepsText));
|
|
243
235
|
}
|
|
244
236
|
// NOT OK => We found some vulns, let's format the vulns info
|
|
245
237
|
const vulnCount = res.vulnerabilities && res.vulnerabilities.length;
|
|
@@ -266,6 +258,7 @@ function displayResult(res, options) {
|
|
|
266
258
|
if (options.canSuggestRemediation && common_1.WIZARD_SUPPORTED_PMS.indexOf(packageManager) > -1) {
|
|
267
259
|
summary += chalk_1.default.bold.green('\n\nRun `snyk wizard` to address these issues.');
|
|
268
260
|
}
|
|
261
|
+
let dockerSuggestion = '';
|
|
269
262
|
if (options.docker &&
|
|
270
263
|
(config.disableSuggestions !== 'true')) {
|
|
271
264
|
const optOutSuggestions = '\n\nTo remove this message in the future, please run `snyk config set disableSuggestions=true`';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/cli/commands/test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/cli/commands/test.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/index.js
CHANGED
|
@@ -24,7 +24,7 @@ const errors = require("../lib/errors/legacy-errors");
|
|
|
24
24
|
const ansiEscapes = require("ansi-escapes");
|
|
25
25
|
const detect_1 = require("../lib/detect");
|
|
26
26
|
const updater_1 = require("../lib/updater");
|
|
27
|
-
const
|
|
27
|
+
const errors_1 = require("../lib/errors");
|
|
28
28
|
const debug = Debug('snyk');
|
|
29
29
|
const EXIT_CODES = {
|
|
30
30
|
VULNS_FOUND: 1,
|
|
@@ -125,7 +125,7 @@ function checkRuntime() {
|
|
|
125
125
|
function checkPaths(args) {
|
|
126
126
|
for (const path of args.options._) {
|
|
127
127
|
if (typeof path === 'string' && detect_1.isPathToPackageFile(path)) {
|
|
128
|
-
throw
|
|
128
|
+
throw errors_1.MissingTargetFileError(path);
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
}
|
|
@@ -138,9 +138,12 @@ function main() {
|
|
|
138
138
|
let failed = false;
|
|
139
139
|
let exitCode = EXIT_CODES.ERROR;
|
|
140
140
|
try {
|
|
141
|
-
if (args.options.file && args.options.file.match(/\.sln$/)) {
|
|
141
|
+
if (args.options.file && typeof args.options.file === 'string' && args.options.file.match(/\.sln$/)) {
|
|
142
142
|
sln.updateArgs(args);
|
|
143
143
|
}
|
|
144
|
+
else if (typeof args.options.file === 'boolean') {
|
|
145
|
+
throw new errors_1.FileFlagBadInputError();
|
|
146
|
+
}
|
|
144
147
|
checkPaths(args);
|
|
145
148
|
res = yield runCommand(args);
|
|
146
149
|
}
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,uCAAqC;AACrC,+BAA+B;AAE/B,wCAAwC;AACxC,qCAAqC;AACrC,0EAA0E;AAC1E,8CAA8C;AAC9C,wCAAwC;AACxC,kCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const custom_error_1 = require("./custom-error");
|
|
4
|
+
class FileFlagBadInputError extends custom_error_1.CustomError {
|
|
5
|
+
constructor() {
|
|
6
|
+
super(FileFlagBadInputError.ERROR_MESSAGE);
|
|
7
|
+
this.code = FileFlagBadInputError.ERROR_CODE;
|
|
8
|
+
this.userMessage = FileFlagBadInputError.ERROR_MESSAGE;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
FileFlagBadInputError.ERROR_CODE = 422;
|
|
12
|
+
FileFlagBadInputError.ERROR_MESSAGE = 'Empty --file argument. Did you mean --file=path/to/file ?';
|
|
13
|
+
exports.FileFlagBadInputError = FileFlagBadInputError;
|
|
14
|
+
//# sourceMappingURL=file-flag-bad-input.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"file-flag-bad-input.js","sourceRoot":"","sources":["../../../src/lib/errors/file-flag-bad-input.ts"],"names":[],"mappings":";;AAAA,iDAA2C;AAE3C,MAAa,qBAAsB,SAAQ,0BAAW;IAIlD;QACI,KAAK,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC,UAAU,CAAC;QAC7C,IAAI,CAAC,WAAW,GAAG,qBAAqB,CAAC,aAAa,CAAC;IAC3D,CAAC;;AAPc,gCAAU,GAAW,GAAG,CAAC;AACzB,mCAAa,GAAW,2DAA2D,CAAC;AAFvG,sDASC"}
|
package/dist/lib/errors/index.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
var
|
|
4
|
-
exports.
|
|
3
|
+
var file_flag_bad_input_1 = require("./file-flag-bad-input");
|
|
4
|
+
exports.FileFlagBadInputError = file_flag_bad_input_1.FileFlagBadInputError;
|
|
5
5
|
var missing_targetfile_error_1 = require("./missing-targetfile-error");
|
|
6
6
|
exports.MissingTargetFileError = missing_targetfile_error_1.MissingTargetFileError;
|
|
7
|
+
var no_supported_manifests_found_1 = require("./no-supported-manifests-found");
|
|
8
|
+
exports.NoSupportedManifestsFoundError = no_supported_manifests_found_1.NoSupportedManifestsFoundError;
|
|
7
9
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/errors/index.ts"],"names":[],"mappings":";;AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/errors/index.ts"],"names":[],"mappings":";;AAAA,6DAA4D;AAApD,sDAAA,qBAAqB,CAAA;AAC7B,uEAAkE;AAA1D,4DAAA,sBAAsB,CAAA;AAC9B,+EAA8E;AAAtE,wEAAA,8BAA8B,CAAA"}
|
package/dist/lib/monitor.js
CHANGED
|
@@ -40,6 +40,9 @@ function monitor(root, meta, info, targetFile) {
|
|
|
40
40
|
analytics.add('packageManager', packageManager);
|
|
41
41
|
const target = yield projectMetadata.getInfo(pkg);
|
|
42
42
|
const targetFileRelativePath = targetFile ? path.relative(root, targetFile) : '';
|
|
43
|
+
if (target && target.branch) {
|
|
44
|
+
analytics.add('targetBranch', target.branch);
|
|
45
|
+
}
|
|
43
46
|
// TODO(kyegupov): async/await
|
|
44
47
|
return new Promise((resolve, reject) => {
|
|
45
48
|
request({
|
|
@@ -62,7 +65,7 @@ function monitor(root, meta, info, targetFile) {
|
|
|
62
65
|
dockerfileLayers: pkg.docker ? pkg.docker.dockerfileLayers : undefined,
|
|
63
66
|
projectName: meta['project-name'],
|
|
64
67
|
},
|
|
65
|
-
policy: policy.toString(),
|
|
68
|
+
policy: policy ? policy.toString() : undefined,
|
|
66
69
|
package: pkg,
|
|
67
70
|
// we take the targetFile from the plugin,
|
|
68
71
|
// because we want to send it only for specific package-managers
|
package/dist/lib/monitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/lib/monitor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/lib/monitor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"snyk-config": "^2.2.1",
|
|
72
72
|
"snyk-docker-plugin": "1.25.0",
|
|
73
73
|
"snyk-go-plugin": "1.7.2",
|
|
74
|
-
"snyk-gradle-plugin": "2.11.
|
|
74
|
+
"snyk-gradle-plugin": "2.11.2",
|
|
75
75
|
"snyk-module": "1.9.1",
|
|
76
76
|
"snyk-mvn-plugin": "2.3.0",
|
|
77
77
|
"snyk-nodejs-lockfile-parser": "1.13.0",
|
|
@@ -125,5 +125,5 @@
|
|
|
125
125
|
]
|
|
126
126
|
},
|
|
127
127
|
"snyk": true,
|
|
128
|
-
"version": "1.
|
|
128
|
+
"version": "1.171.1"
|
|
129
129
|
}
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
const fs = require('fs');
|
|
3
|
-
const config = require('./config');
|
|
4
|
-
const suggestionText = '\n\nWe noticed that there is a Dockerfile in the current directory.' +
|
|
5
|
-
'\nConsider using Snyk to scan your docker images.' +
|
|
6
|
-
'\n\nExample: $ snyk test --docker <image> --file=Dockerfile' +
|
|
7
|
-
'\n\nTo remove this message in the future, please run `snyk config set disableSuggestions=true`';
|
|
8
|
-
module.exports = {
|
|
9
|
-
shouldSuggestDocker: shouldSuggestDocker,
|
|
10
|
-
suggestionText: suggestionText,
|
|
11
|
-
};
|
|
12
|
-
function shouldSuggestDocker(options) {
|
|
13
|
-
const dateToStopDockerPromotion = new Date('2019-01-01');
|
|
14
|
-
try {
|
|
15
|
-
return (!options.docker &&
|
|
16
|
-
fs.existsSync('Dockerfile') &&
|
|
17
|
-
(config.disableSuggestions !== 'true') &&
|
|
18
|
-
(Date.now() < dateToStopDockerPromotion));
|
|
19
|
-
}
|
|
20
|
-
catch (e) {
|
|
21
|
-
return false;
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
//# sourceMappingURL=docker-promotion.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"docker-promotion.js","sourceRoot":"","sources":["../../src/lib/docker-promotion.js"],"names":[],"mappings":";AAAA,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEnC,MAAM,cAAc,GAClB,qEAAqE;IACrE,mDAAmD;IACnD,6DAA6D;IAC7D,gGAAgG,CAAC;AAGnG,MAAM,CAAC,OAAO,GAAG;IACf,mBAAmB,EAAE,mBAAmB;IACxC,cAAc,EAAE,cAAc;CAC/B,CAAC;AAEF,SAAS,mBAAmB,CAAC,OAAO;IAClC,MAAM,yBAAyB,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC;IAEzD,IAAI;QACF,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM;YACrB,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;YAC3B,CAAC,MAAM,CAAC,kBAAkB,KAAK,MAAM,CAAC;YACtC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,yBAAyB,CAAC,CAAC,CAAC;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
|