snyk 1.672.0 → 1.676.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/fix/validate-fix-command-is-supported.js +5 -2
- package/dist/cli/commands/fix/validate-fix-command-is-supported.js.map +1 -1
- package/dist/lib/formatters/test/format-test-results.js +26 -0
- package/dist/lib/formatters/test/format-test-results.js.map +1 -1
- package/dist/lib/plugins/sast/analysis.js +4 -8
- package/dist/lib/plugins/sast/analysis.js.map +1 -1
- package/dist/lib/snyk-test/legacy.d.ts +2 -0
- package/dist/lib/snyk-test/legacy.js.map +1 -1
- package/dist/lib/snyk-test/run-test.js +4 -2
- package/dist/lib/snyk-test/run-test.js.map +1 -1
- package/package.json +4 -4
|
@@ -4,9 +4,9 @@ exports.validateFixCommandIsSupported = void 0;
|
|
|
4
4
|
const Debug = require("debug");
|
|
5
5
|
const ecosystems_1 = require("../../../lib/ecosystems");
|
|
6
6
|
const feature_flags_1 = require("../../../lib/feature-flags");
|
|
7
|
-
const command_not_supported_1 = require("../../../lib/errors/command-not-supported");
|
|
8
7
|
const not_supported_by_ecosystem_1 = require("../../../lib/errors/not-supported-by-ecosystem");
|
|
9
8
|
const errors_1 = require("../../../lib/errors");
|
|
9
|
+
const chalk_1 = require("chalk");
|
|
10
10
|
const debug = Debug('snyk-fix');
|
|
11
11
|
const snykFixFeatureFlag = 'cliSnykFix';
|
|
12
12
|
async function validateFixCommandIsSupported(options) {
|
|
@@ -23,7 +23,10 @@ async function validateFixCommandIsSupported(options) {
|
|
|
23
23
|
throw errors_1.AuthFailedError(snykFixSupported.error, snykFixSupported.code);
|
|
24
24
|
}
|
|
25
25
|
if (!snykFixSupported.ok) {
|
|
26
|
-
|
|
26
|
+
const snykFixErrorMessage = chalk_1.default.red(`\`snyk fix\` is not supported ${options.org ? `for org '${options.org}'` : ''}.`) +
|
|
27
|
+
'\nSee documentation on how to enable this beta feature: https://support.snyk.io/hc/en-us/articles/4403417279505-Automatic-remediation-with-snyk-fix';
|
|
28
|
+
const unsupportedError = new Error(snykFixErrorMessage);
|
|
29
|
+
throw unsupportedError;
|
|
27
30
|
}
|
|
28
31
|
return true;
|
|
29
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-fix-command-is-supported.js","sourceRoot":"","sources":["../../../../src/cli/commands/fix/validate-fix-command-is-supported.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAE/B,wDAA8D;AAE9D,8DAA0E;AAC1E
|
|
1
|
+
{"version":3,"file":"validate-fix-command-is-supported.js","sourceRoot":"","sources":["../../../../src/cli/commands/fix/validate-fix-command-is-supported.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAE/B,wDAA8D;AAE9D,8DAA0E;AAC1E,+FAAqG;AAErG,gDAAsD;AACtD,iCAA0B;AAE1B,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;AAChC,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAEjC,KAAK,UAAU,6BAA6B,CACjD,OAA8B;IAE9B,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,MAAM,IAAI,gEAAmC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;KACrE;IAED,MAAM,SAAS,GAAG,gCAAmB,CAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,SAAS,EAAE;QACb,MAAM,IAAI,gEAAmC,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;KACtE;IAED,MAAM,gBAAgB,GAAG,MAAM,4CAA4B,CACzD,kBAAkB,EAClB,OAAO,CAAC,GAAG,CACZ,CAAC;IAEF,KAAK,CAAC,+BAA+B,EAAE,gBAAgB,CAAC,CAAC;IAEzD,IAAI,gBAAgB,CAAC,IAAI,KAAK,GAAG,IAAI,gBAAgB,CAAC,IAAI,KAAK,GAAG,EAAE;QAClE,MAAM,wBAAe,CAAC,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;KACtE;IAED,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE;QACxB,MAAM,mBAAmB,GACvB,eAAK,CAAC,GAAG,CACP,iCACE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAC7C,GAAG,CACJ;YACD,qJAAqJ,CAAC;QACxJ,MAAM,gBAAgB,GAAG,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACxD,MAAM,gBAAgB,CAAC;KACxB;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AApCD,sEAoCC"}
|
|
@@ -17,6 +17,7 @@ const json_1 = require("../../json");
|
|
|
17
17
|
const open_source_sarif_output_1 = require("../open-source-sarif-output");
|
|
18
18
|
const get_severity_value_1 = require("../get-severity-value");
|
|
19
19
|
const show_fix_tip_1 = require("../show-fix-tip");
|
|
20
|
+
const dist_1 = require("snyk-docker-plugin/dist");
|
|
20
21
|
function formatJsonOutput(jsonData, options) {
|
|
21
22
|
const jsonDataClone = cloneDeep(jsonData);
|
|
22
23
|
if (options['group-issues']) {
|
|
@@ -114,6 +115,7 @@ function getDisplayedOutput(res, options, testedInfoText, localPackageTest, proj
|
|
|
114
115
|
chalk_1.default.blue.bold(reachableVulnsText);
|
|
115
116
|
const fixTip = show_fix_tip_1.showFixTip(projectType, res, options);
|
|
116
117
|
const fixAdvice = fixTip ? `\n\n${fixTip}` : '';
|
|
118
|
+
const dockerfileWarning = getDockerfileWarning(res.scanResult);
|
|
117
119
|
const dockerSuggestion = getDockerSuggestionText(options, config);
|
|
118
120
|
const vulns = res.vulnerabilities || [];
|
|
119
121
|
const groupedVulns = groupVulnerabilities(vulns);
|
|
@@ -150,6 +152,7 @@ function getDisplayedOutput(res, options, testedInfoText, localPackageTest, proj
|
|
|
150
152
|
multiProjAdvice +
|
|
151
153
|
ignoredIssues +
|
|
152
154
|
dockerAdvice +
|
|
155
|
+
dockerfileWarning +
|
|
153
156
|
dockerSuggestion +
|
|
154
157
|
dockerCTA);
|
|
155
158
|
}
|
|
@@ -180,6 +183,29 @@ function getDockerSuggestionText(options, config) {
|
|
|
180
183
|
}
|
|
181
184
|
return dockerSuggestion;
|
|
182
185
|
}
|
|
186
|
+
function getDockerfileWarning(scanResult) {
|
|
187
|
+
if (!scanResult) {
|
|
188
|
+
return '';
|
|
189
|
+
}
|
|
190
|
+
const fact = scanResult.facts.find((fact) => fact.type === 'dockerfileAnalysis');
|
|
191
|
+
if (!fact) {
|
|
192
|
+
return '';
|
|
193
|
+
}
|
|
194
|
+
const dockerfileAnalysisFact = fact;
|
|
195
|
+
if (!dockerfileAnalysisFact.data.error) {
|
|
196
|
+
return '';
|
|
197
|
+
}
|
|
198
|
+
let userMessage = chalk_1.default.yellow('\n\nWarning: Unable to analyse Dockerfile provided through `--file`.');
|
|
199
|
+
switch (dockerfileAnalysisFact.data.error.code) {
|
|
200
|
+
case dist_1.DockerFileAnalysisErrorCode.BASE_IMAGE_NAME_NOT_FOUND:
|
|
201
|
+
userMessage += chalk_1.default.yellow('\n Dockerfile must begin with a FROM instruction. This may be after parser directives, comments, and globally scoped ARGs.');
|
|
202
|
+
break;
|
|
203
|
+
case dist_1.DockerFileAnalysisErrorCode.BASE_IMAGE_NON_RESOLVABLE:
|
|
204
|
+
userMessage += chalk_1.default.yellow('\n Dockerfile must have default values for all ARG instructions.');
|
|
205
|
+
break;
|
|
206
|
+
}
|
|
207
|
+
return userMessage;
|
|
208
|
+
}
|
|
183
209
|
function groupVulnerabilities(vulns) {
|
|
184
210
|
return vulns.reduce((map, curr) => {
|
|
185
211
|
if (!map[curr.id]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-test-results.js","sourceRoot":"","sources":["../../../../src/lib/formatters/test/format-test-results.ts"],"names":[],"mappings":";;;AAMA,gEAGgC;AAOhC,iCAA0B;AAC1B,uCAAuC;AACvC,MAAM,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC1C,6CAA6C;AAC7C,wFAAiF;AACjF,gEAAsD;AACtD,sCAAuD;AACvD,kDAAiE;AACjE,8CAAwD;AACxD,qDAA8D;AAC9D,qCAAsD;AACtD,0EAA6E;AAC7E,8DAAyD;AACzD,kDAA6C;
|
|
1
|
+
{"version":3,"file":"format-test-results.js","sourceRoot":"","sources":["../../../../src/lib/formatters/test/format-test-results.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,16 +42,12 @@ async function getCodeAnalysis(root, options) {
|
|
|
42
42
|
const severity = options.severityThreshold
|
|
43
43
|
? severityToAnalysisSeverity(options.severityThreshold)
|
|
44
44
|
: code_client_1.AnalysisSeverity.info;
|
|
45
|
-
const paths = [root];
|
|
46
|
-
const sarif = true;
|
|
47
45
|
const result = await code_client_1.analyzeFolders({
|
|
48
|
-
baseURL,
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
paths,
|
|
52
|
-
sarif,
|
|
46
|
+
connection: { baseURL, sessionToken, source: 'snyk-cli' },
|
|
47
|
+
analysisOptions: { severity },
|
|
48
|
+
fileOptions: { paths: [root] },
|
|
53
49
|
});
|
|
54
|
-
return result.
|
|
50
|
+
return result === null || result === void 0 ? void 0 : result.analysisResults.sarif;
|
|
55
51
|
}
|
|
56
52
|
function severityToAnalysisSeverity(severity) {
|
|
57
53
|
if (severity === legacy_1.SEVERITY.CRITICAL) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analysis.js","sourceRoot":"","sources":["../../../../src/lib/plugins/sast/analysis.ts"],"names":[],"mappings":";;;AAAA,mDAAqE;AAErE,mDAAkD;AAClD,+CAAsC;AACtC,uCAAuC;AACvC,yCAA0C;AAE1C,mCAAiD;AACjD,sGAAkG;AAClG,mDAAgD;AAChD,+CAAyC;AAElC,KAAK,UAAU,8BAA8B,CAClD,IAAY,EACZ,OAAgB;IAEhB,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC;IACzB,8BAAsB,CAAC,YAAY,CAAC,CAAC;IACrC,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1D,OAAO,CAAC,QAAQ,EAAE,CAAC;IACnB,OAAO,oBAAoB,CAAC,YAAY,CAAC,CAAC;AAC5C,CAAC;AAVD,wEAUC;AAED,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,OAAgB;IAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC;IAE7C,uGAAuG;IACvG,iEAAiE;IACjE,gEAAgE;IAChE,4EAA4E;IAC5E,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;QACpD,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;KAC3E;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE;QACtD,OAAO,CAAC,GAAG,CAAC,WAAW;YACrB,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;KACtD;IAED,MAAM,QAAQ,GAAG,+BAAc,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,QAAQ,EAAE;QACZ,wBAAS,CAAC;YACR,4BAA4B,EAAE,EAAE;SACjC,CAAC,CAAC;KACJ;IAED,MAAM,YAAY,GAAG,eAAG,EAAE,IAAI,EAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB;QACxC,CAAC,CAAC,0BAA0B,CAAC,OAAO,CAAC,iBAAiB,CAAC;QACvD,CAAC,CAAC,8BAAgB,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"analysis.js","sourceRoot":"","sources":["../../../../src/lib/plugins/sast/analysis.ts"],"names":[],"mappings":";;;AAAA,mDAAqE;AAErE,mDAAkD;AAClD,+CAAsC;AACtC,uCAAuC;AACvC,yCAA0C;AAE1C,mCAAiD;AACjD,sGAAkG;AAClG,mDAAgD;AAChD,+CAAyC;AAElC,KAAK,UAAU,8BAA8B,CAClD,IAAY,EACZ,OAAgB;IAEhB,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC;IACzB,8BAAsB,CAAC,YAAY,CAAC,CAAC;IACrC,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1D,OAAO,CAAC,QAAQ,EAAE,CAAC;IACnB,OAAO,oBAAoB,CAAC,YAAY,CAAC,CAAC;AAC5C,CAAC;AAVD,wEAUC;AAED,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,OAAgB;IAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC;IAE7C,uGAAuG;IACvG,iEAAiE;IACjE,gEAAgE;IAChE,4EAA4E;IAC5E,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;QACpD,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;KAC3E;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE;QACtD,OAAO,CAAC,GAAG,CAAC,WAAW;YACrB,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;KACtD;IAED,MAAM,QAAQ,GAAG,+BAAc,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,QAAQ,EAAE;QACZ,wBAAS,CAAC;YACR,4BAA4B,EAAE,EAAE;SACjC,CAAC,CAAC;KACJ;IAED,MAAM,YAAY,GAAG,eAAG,EAAE,IAAI,EAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB;QACxC,CAAC,CAAC,0BAA0B,CAAC,OAAO,CAAC,iBAAiB,CAAC;QACvD,CAAC,CAAC,8BAAgB,CAAC,IAAI,CAAC;IAE1B,MAAM,MAAM,GAAG,MAAM,4BAAc,CAAC;QAClC,UAAU,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE;QACzD,eAAe,EAAE,EAAE,QAAQ,EAAE;QAC7B,WAAW,EAAE,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE;KAC/B,CAAC,CAAC;IAEH,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,eAAe,CAAC,KAAM,CAAC;AACxC,CAAC;AAED,SAAS,0BAA0B,CAAC,QAAkB;IACpD,IAAI,QAAQ,KAAK,iBAAQ,CAAC,QAAQ,EAAE;QAClC,MAAM,IAAI,wEAAkC,CAAC,iBAAQ,CAAC,QAAQ,CAAC,CAAC;KACjE;IACD,MAAM,aAAa,GAAG;QACpB,GAAG,EAAE,CAAC;QACN,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,CAAC;KACR,CAAC;IACF,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,oBAAoB,CAAC,YAAiB;IAC7C,IAAI,gBAAgB,CAAC;IAErB,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IACrD,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAE7C,IAAI,KAAK,EAAE;QACT,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC9C,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;KAC1E;IACD,IAAI,OAAO,IAAI,gBAAgB,EAAE;QAC/B,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,sBAAsB,CACnD,OAAO,EACP,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAC9B,CAAC;KACH;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,mBAAmB,CAC1B,KAA4B;IAE5B,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;;QAClD,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QACxC,MAAM,cAAc,SAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,0CAAE,IAAI,CACjD,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,UAAU,CACpD,CAAC;QACF,IAAI,cAAc,EAAE;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;SACpB;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,sBAAsB,CAC7B,OAAiB,EACjB,aAAuB;IAEvB,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAa,EAAE,MAAc,EAAE,EAAE;QACvE,MAAM,gBAAgB,GAAG,aAAa,CAAC,IAAI,CACzC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,MAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,CAClD,CAAC;QACF,IAAI,gBAAgB,EAAE;YACpB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAClB;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,eAAe,CAAC;AACzB,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as depGraphLib from '@snyk/dep-graph';
|
|
2
|
+
import { ScanResult } from '../ecosystems/types';
|
|
2
3
|
import { SupportedPackageManagers } from '../package-managers';
|
|
3
4
|
import { Options, SupportedProjectTypes, TestOptions } from '../types';
|
|
4
5
|
interface Pkg {
|
|
@@ -164,6 +165,7 @@ export interface TestResult extends LegacyVulnApiResult {
|
|
|
164
165
|
targetFilePath?: string;
|
|
165
166
|
displayTargetFile?: string;
|
|
166
167
|
foundProjectCount?: number;
|
|
168
|
+
scanResult?: ScanResult;
|
|
167
169
|
}
|
|
168
170
|
interface UpgradePathItem {
|
|
169
171
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/lib/snyk-test/legacy.ts"],"names":[],"mappings":";;;AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/lib/snyk-test/legacy.ts"],"names":[],"mappings":";;;AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAKxC,qCAAsC;AActC,IAAY,QAKX;AALD,WAAY,QAAQ;IAClB,uBAAW,CAAA;IACX,6BAAiB,CAAA;IACjB,yBAAa,CAAA;IACb,iCAAqB,CAAA;AACvB,CAAC,EALW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAKnB;AAED,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,qCAAqB,CAAA;IACrB,mCAAmB,CAAA;IACnB,+CAA+B,CAAA;IAC/B,mCAAmB,CAAA;AACrB,CAAC,EALW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAKvB;AA+SD,SAAS,iCAAiC,CACxC,GAAyB,EACzB,QAA8B,EAC9B,cAAiD,EACjD,OAA8B;IAE9B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAE1B,MAAM,eAAe,GAAG,IAAI,GAAG,EAAoB,CAAC;IAEpD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QACjD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC7C,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE;gBACrD,KAAK,MAAM,WAAW,IAAI,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE;oBACvD,MAAM,cAAc,GAAG,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBAC7D,MAAM,cAAc,GAAG,iBAAiB,CACtC,QAAQ,CAAC,OAAO,EAChB,cAAc,CACf,CAAC;oBACF,eAAe,CAAC,cAAc,CAAC,GAAG,mBAAmB,CACnD,WAAW,CAAC,IAAI,CACjB,CAAC;iBACH;aACF;SACF;KACF;IAED,4EAA4E;IAC5E,4DAA4D;IAC5D,IAAI,KAAK,GAAqB,EAAE,CAAC;IAEjC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QACjD,KAAK,MAAM,WAAW,IAAI,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC9D,MAAM,cAAc,GAAG,mBAAmB,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;YAClE,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC7C,MAAM,cAAc,GAAG,iBAAiB,CACtC,QAAQ,CAAC,OAAO,EAChB,cAAc,CACf,CAAC;gBACF,MAAM,WAAW,GAAG,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;gBAE1D,+EAA+E;gBAC/E,+CAA+C;gBAC/C,kFAAkF;gBAClF,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAClC,EAAE,EACF,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EACnC;oBACE,IAAI,EAAE,cAAc;oBACpB,WAAW;oBACX,YAAY,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;oBAClD,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW;oBACzC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;oBACtB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAiB;oBACtC,qBAAqB,EAAE,QAAQ,CAAC,OAAO,CAAC,qBAAqB;iBAC9D,CAC8B,CAAC,CAAC,4CAA4C;gBAE/E,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aAC5B;SACF;KACF;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IAEhC,IAAI,SAAS,IAAI,SAAS,CAAC,aAAa,EAAE;QACxC,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAAC;QAC9C,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE;YACxD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC7C,MAAM,aAAa,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI;oBACrC,GAAG;oBACH,OAAO,CAAC,GAAG,CAAC,OAAO,CAAW,CAAC;gBACjC,MAAM,cAAc,GAAI,MAAM,CAAC,MAAM,CACnC,EAAE,EACF,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAC1C;oBACE,IAAI,EAAE,CAAC,UAAU,EAAE,aAAa,CAAC;oBACjC,WAAW,EAAE,EAAE;oBACf,YAAY,EAAE,KAAK;oBACnB,WAAW,EAAE,KAAK;oBAClB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;oBACtB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAiB;oBACtC,qBAAqB,EAAE,QAAQ,CAAC,OAAO,CAAC,qBAAqB;iBAC9D,CACwB,CAAC,CAAC,mDAAmD;gBAChF,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aAC5B;SACF;KACF;IAED,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;IAE5B,MAAM,iBAAiB,GACrB,OAAO,CAAC,iBAAiB,KAAK,QAAQ,CAAC,GAAG;QACxC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC;IAEhC,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,0BAA0B,CAAC,EAAE;QACzE,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAE,IAAoB,CAAC,qBAAqB,CAAC,CAAC;KAC7E;IAED,MAAM,SAAS,GAAwB;QACrC,eAAe,EAAE,KAAK;QACtB,EAAE,EAAE,KAAK,CAAC,MAAM,KAAK,CAAC;QACtB,eAAe,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG,CAAC;QAC9C,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,SAAS,EAAE,CAAC,IAAI,CAAC,QAAQ;QACzB,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI;QAC3C,cAAc;QACd,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI;QAC3C,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,UAAU,CAAC,KAAK,EAAE,iBAAiB,CAAC;QAC7C,iBAAiB;QACjB,WAAW,EAAE,MAAM,CAAC,WAAW;KAChC,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC;AAsEQ,8EAAiC;AApE1C,SAAS,iBAAiB,CAAC,OAAe,EAAE,QAAkB;IAC5D,OAAO,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAc;IACzC,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,mBAAmB,CAC1B,WAA8B;IAE9B,OAAO,WAAW;SACf,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;SACjC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,KAAK,CAAC;SACd;QAED,OAAO,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IAC3C,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,aAAa,CAAC,GAAQ;IAC7B,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,EAAE,CAAC;AAC7C,CAAC;AAED,SAAS,UAAU,CAAC,KAAe,EAAE,iBAA4B;IAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;IAC3B,IAAI,SAAS,GAAG,EAAE,GAAG,KAAK,CAAC;IAC3B,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,MAAM,eAAe,GAAG,mBAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAC7D,IAAI,iBAAiB,EAAE;QACrB,eAAe;aACZ,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;aACjD,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;KACN;IAED,IAAI,CAAC,KAAK,EAAE;QACV,IAAI,eAAe,CAAC,MAAM,EAAE;YAC1B,OAAO,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,2BAA2B,CAAC;SACtE;QACD,OAAO,0BAA0B,CAAC;KACnC;IAED,IAAI,eAAe,CAAC,MAAM,EAAE;QAC1B,SAAS,IAAI,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;KAC/D;IAED,OAAO,GAAG,SAAS,0BAA0B,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;AACnE,CAAC;AAED,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK;IACrB,MAAM,GAAG,GAAG;QACV,CAAC,EAAE,KAAK;QACR,OAAO,EAAE,GAAG;KACb,CAAC;IAEF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;IAElC,IAAI,KAAK,GAAG,CAAC,EAAE;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;KAC9D;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -70,6 +70,7 @@ function prepareEcosystemResponseForParsing(payload, response, options) {
|
|
|
70
70
|
foundProjectCount: undefined,
|
|
71
71
|
payloadPolicy: payloadBody === null || payloadBody === void 0 ? void 0 : payloadBody.policy,
|
|
72
72
|
platform,
|
|
73
|
+
scanResult: payloadBody,
|
|
73
74
|
};
|
|
74
75
|
}
|
|
75
76
|
function prepareLanguagesResponseForParsing(payload) {
|
|
@@ -165,7 +166,7 @@ async function sendAndParseResults(payloads, spinnerLbl, root, options) {
|
|
|
165
166
|
/** sendTestPayload() deletes the request.body from the payload once completed. */
|
|
166
167
|
const payloadCopy = Object.assign({}, payload);
|
|
167
168
|
const res = await sendTestPayload(payload);
|
|
168
|
-
const { depGraph, payloadPolicy, pkgManager, targetFile, projectName, foundProjectCount, displayTargetFile, dockerfilePackages, platform, } = prepareResponseForParsing(payloadCopy, res, options);
|
|
169
|
+
const { depGraph, payloadPolicy, pkgManager, targetFile, projectName, foundProjectCount, displayTargetFile, dockerfilePackages, platform, scanResult, } = prepareResponseForParsing(payloadCopy, res, options);
|
|
169
170
|
const ecosystem = ecosystems_1.getEcosystem(options);
|
|
170
171
|
if (ecosystem && options['print-deps']) {
|
|
171
172
|
await spinner.clear(spinnerLbl)();
|
|
@@ -177,7 +178,8 @@ async function sendAndParseResults(payloads, spinnerLbl, root, options) {
|
|
|
177
178
|
projectName,
|
|
178
179
|
foundProjectCount,
|
|
179
180
|
displayTargetFile,
|
|
180
|
-
platform
|
|
181
|
+
platform,
|
|
182
|
+
scanResult }));
|
|
181
183
|
}
|
|
182
184
|
return results;
|
|
183
185
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-test.js","sourceRoot":"","sources":["../../../src/lib/snyk-test/run-test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run-test.js","sourceRoot":"","sources":["../../../src/lib/snyk-test/run-test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "snyk",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.676.0",
|
|
4
4
|
"description": "snyk library and cli utility",
|
|
5
5
|
"main": "dist/lib/index.js",
|
|
6
6
|
"files": [
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
"@open-policy-agent/opa-wasm": "^1.2.0",
|
|
77
77
|
"@snyk/cli-interface": "2.11.0",
|
|
78
78
|
"@snyk/cloud-config-parser": "^1.9.2",
|
|
79
|
-
"@snyk/code-client": "
|
|
79
|
+
"@snyk/code-client": "4.0.0",
|
|
80
80
|
"@snyk/dep-graph": "^1.27.1",
|
|
81
81
|
"@snyk/fix": "1.650.0",
|
|
82
82
|
"@snyk/gemfile": "1.2.0",
|
|
@@ -138,7 +138,7 @@
|
|
|
138
138
|
"snyk-try-require": "1.3.1",
|
|
139
139
|
"source-map-support": "^0.5.11",
|
|
140
140
|
"strip-ansi": "^5.2.0",
|
|
141
|
-
"tar": "^6.1.
|
|
141
|
+
"tar": "^6.1.2",
|
|
142
142
|
"tempy": "^1.0.1",
|
|
143
143
|
"update-notifier": "^5.1.0",
|
|
144
144
|
"uuid": "^8.3.2",
|
|
@@ -203,5 +203,5 @@
|
|
|
203
203
|
"registry": "https://registry.npmjs.org/",
|
|
204
204
|
"access": "public"
|
|
205
205
|
},
|
|
206
|
-
"gitHead": "
|
|
206
|
+
"gitHead": "c9f28ebbc6c263d7f732e68f6da83e0c128c7a97"
|
|
207
207
|
}
|