snyk 1.663.0 → 1.667.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/index.js +4 -3
- package/dist/cli/commands/fix/index.js.map +1 -1
- package/dist/cli/commands/protect/prompts.js +5 -5
- package/dist/cli/commands/protect/prompts.js.map +1 -1
- package/dist/cli/commands/protect/wizard.js +2 -2
- package/dist/cli/commands/protect/wizard.js.map +1 -1
- package/dist/cli/commands/test/iac-local-execution/analytics.d.ts +1 -0
- package/dist/cli/commands/test/iac-local-execution/analytics.js +2 -0
- package/dist/cli/commands/test/iac-local-execution/analytics.js.map +1 -1
- package/dist/cli/commands/test/iac-local-execution/index.js +11 -0
- package/dist/cli/commands/test/iac-local-execution/index.js.map +1 -1
- package/dist/cli/commands/test/iac-local-execution/measurable-methods.d.ts +2 -1
- package/dist/cli/commands/test/iac-local-execution/measurable-methods.js +4 -1
- package/dist/cli/commands/test/iac-local-execution/measurable-methods.js.map +1 -1
- package/dist/cli/commands/test/iac-local-execution/usage-tracking.d.ts +13 -0
- package/dist/cli/commands/test/iac-local-execution/usage-tracking.js +42 -0
- package/dist/cli/commands/test/iac-local-execution/usage-tracking.js.map +1 -0
- package/dist/cli/commands/test/validate-test-options.js +2 -2
- package/dist/cli/commands/test/validate-test-options.js.map +1 -1
- package/dist/lib/analytics.js +10 -14
- package/dist/lib/analytics.js.map +1 -1
- package/dist/lib/common.d.ts +1 -0
- package/dist/lib/common.js +8 -0
- package/dist/lib/common.js.map +1 -0
- package/dist/lib/ecosystems/polling.d.ts +22 -0
- package/dist/lib/ecosystems/polling.js +76 -0
- package/dist/lib/ecosystems/polling.js.map +1 -0
- package/dist/lib/ecosystems/resolve-test-facts.d.ts +5 -0
- package/dist/lib/ecosystems/resolve-test-facts.js +39 -0
- package/dist/lib/ecosystems/resolve-test-facts.js.map +1 -0
- package/dist/lib/errors/index.d.ts +1 -0
- package/dist/lib/errors/index.js +2 -0
- package/dist/lib/errors/index.js.map +1 -1
- package/dist/lib/errors/{non-existing-package-error.d.ts → not-found-error.d.ts} +2 -2
- package/dist/lib/errors/not-found-error.js +15 -0
- package/dist/lib/errors/not-found-error.js.map +1 -0
- package/dist/lib/formatters/iac-output.js +2 -2
- package/dist/lib/formatters/iac-output.js.map +1 -1
- package/dist/lib/formatters/legacy-format-issue.js +1 -2
- package/dist/lib/formatters/legacy-format-issue.js.map +1 -1
- package/dist/lib/formatters/remediation-based-format-issues.js +2 -2
- package/dist/lib/formatters/remediation-based-format-issues.js.map +1 -1
- package/dist/lib/formatters/test/display-result.js +2 -1
- package/dist/lib/formatters/test/display-result.js.map +1 -1
- package/dist/lib/plugins/get-deps-from-plugin.js +2 -1
- package/dist/lib/plugins/get-deps-from-plugin.js.map +1 -1
- package/dist/lib/plugins/get-multi-plugin-result.js +2 -1
- package/dist/lib/plugins/get-multi-plugin-result.js.map +1 -1
- package/dist/lib/plugins/sast/format/output-format.js +7 -6
- package/dist/lib/plugins/sast/format/output-format.js.map +1 -1
- package/dist/lib/protect/apply-patch.js +2 -2
- package/dist/lib/protect/apply-patch.js.map +1 -1
- package/dist/lib/snyk-test/common.d.ts +1 -33
- package/dist/lib/snyk-test/common.js +5 -58
- package/dist/lib/snyk-test/common.js.map +1 -1
- package/dist/lib/snyk-test/legacy.d.ts +1 -1
- package/dist/lib/snyk-test/run-test.js +3 -3
- package/dist/lib/snyk-test/run-test.js.map +1 -1
- package/dist/lib/theme.d.ts +19 -0
- package/dist/lib/theme.js +24 -0
- package/dist/lib/theme.js.map +1 -0
- package/package.json +5 -5
- package/dist/lib/errors/non-existing-package-error.js +0 -15
- package/dist/lib/errors/non-existing-package-error.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/lib/common.ts"],"names":[],"mappings":";;;AAAO,KAAK,UAAU,KAAK,CAAC,EAAU;IACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAFD,sBAEC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Options } from '../types';
|
|
2
|
+
import { ScanResult } from './types';
|
|
3
|
+
import { TestDependenciesResult, TestDepGraphMeta } from '../snyk-test/legacy';
|
|
4
|
+
declare type ResolveAndTestFactsStatus = 'CANCELLED' | 'ERROR' | 'PENDING' | 'RUNNING' | 'OK';
|
|
5
|
+
interface PollingTask {
|
|
6
|
+
pollInterval: number;
|
|
7
|
+
maxAttempts: number;
|
|
8
|
+
}
|
|
9
|
+
interface ResolveAndTestFactsResponse {
|
|
10
|
+
token: string;
|
|
11
|
+
pollingTask: PollingTask;
|
|
12
|
+
result?: TestDependenciesResult;
|
|
13
|
+
meta?: TestDepGraphMeta;
|
|
14
|
+
status?: ResolveAndTestFactsStatus;
|
|
15
|
+
code?: number;
|
|
16
|
+
error?: string;
|
|
17
|
+
message?: string;
|
|
18
|
+
userMessage?: string;
|
|
19
|
+
}
|
|
20
|
+
export declare function requestPollingToken(options: Options, isAsync: boolean, scanResult: ScanResult): Promise<ResolveAndTestFactsResponse>;
|
|
21
|
+
export declare function pollingWithTokenUntilDone(token: string, type: string, options: Options, pollInterval: number, attemptsCount: number, maxAttempts?: number): Promise<ResolveAndTestFactsResponse>;
|
|
22
|
+
export {};
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.pollingWithTokenUntilDone = exports.requestPollingToken = void 0;
|
|
4
|
+
const config = require("../config");
|
|
5
|
+
const is_ci_1 = require("../is-ci");
|
|
6
|
+
const promise_1 = require("../request/promise");
|
|
7
|
+
const common_1 = require("../snyk-test/common");
|
|
8
|
+
const api_token_1 = require("../api-token");
|
|
9
|
+
const common_2 = require("../common");
|
|
10
|
+
async function requestPollingToken(options, isAsync, scanResult) {
|
|
11
|
+
const payload = {
|
|
12
|
+
method: 'POST',
|
|
13
|
+
url: `${config.API}/test-dependencies`,
|
|
14
|
+
json: true,
|
|
15
|
+
headers: {
|
|
16
|
+
'x-is-ci': is_ci_1.isCI(),
|
|
17
|
+
authorization: api_token_1.getAuthHeader(),
|
|
18
|
+
},
|
|
19
|
+
body: {
|
|
20
|
+
isAsync,
|
|
21
|
+
scanResult,
|
|
22
|
+
},
|
|
23
|
+
qs: common_1.assembleQueryString(options),
|
|
24
|
+
};
|
|
25
|
+
const response = await promise_1.makeRequest(payload);
|
|
26
|
+
throwIfRequestPollingTokenFailed(response);
|
|
27
|
+
return response;
|
|
28
|
+
}
|
|
29
|
+
exports.requestPollingToken = requestPollingToken;
|
|
30
|
+
function throwIfRequestPollingTokenFailed(res) {
|
|
31
|
+
const { token, status, pollingTask } = res;
|
|
32
|
+
const { maxAttempts, pollInterval } = pollingTask;
|
|
33
|
+
const isMissingPollingTask = !!maxAttempts && !!pollInterval;
|
|
34
|
+
if (!token && !status && isMissingPollingTask) {
|
|
35
|
+
throw 'Something went wrong, invalid response.';
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
async function pollingWithTokenUntilDone(token, type, options, pollInterval, attemptsCount, maxAttempts = Infinity) {
|
|
39
|
+
const payload = {
|
|
40
|
+
method: 'GET',
|
|
41
|
+
url: `${config.API}/test-dependencies/${token}`,
|
|
42
|
+
json: true,
|
|
43
|
+
headers: {
|
|
44
|
+
'x-is-ci': is_ci_1.isCI(),
|
|
45
|
+
authorization: api_token_1.getAuthHeader(),
|
|
46
|
+
},
|
|
47
|
+
qs: Object.assign(Object.assign({}, common_1.assembleQueryString(options)), { type }),
|
|
48
|
+
};
|
|
49
|
+
const response = await promise_1.makeRequest(payload);
|
|
50
|
+
if (pollingRequestHasFailed(response)) {
|
|
51
|
+
throw response;
|
|
52
|
+
}
|
|
53
|
+
const taskCompleted = response.result && response.meta;
|
|
54
|
+
if (taskCompleted) {
|
|
55
|
+
return response;
|
|
56
|
+
}
|
|
57
|
+
attemptsCount++;
|
|
58
|
+
checkPollingAttempts(maxAttempts)(attemptsCount);
|
|
59
|
+
await common_2.sleep(pollInterval);
|
|
60
|
+
return await pollingWithTokenUntilDone(token, type, options, pollInterval, attemptsCount, maxAttempts);
|
|
61
|
+
}
|
|
62
|
+
exports.pollingWithTokenUntilDone = pollingWithTokenUntilDone;
|
|
63
|
+
function checkPollingAttempts(maxAttempts) {
|
|
64
|
+
return (attemptsCount) => {
|
|
65
|
+
if (attemptsCount > maxAttempts) {
|
|
66
|
+
throw new Error('Exceeded Polling maxAttempts');
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
function pollingRequestHasFailed(response) {
|
|
71
|
+
const { token, result, meta, status, error, code, message } = response;
|
|
72
|
+
const hasError = !!error && !!code && !!message;
|
|
73
|
+
const pollingContextIsMissing = !token && !result && !meta && !status;
|
|
74
|
+
return !!pollingContextIsMissing || hasError;
|
|
75
|
+
}
|
|
76
|
+
//# sourceMappingURL=polling.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"polling.js","sourceRoot":"","sources":["../../../src/lib/ecosystems/polling.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.resolveAndTestFacts = void 0;
|
|
4
|
+
const spinner = require("../../lib/spinner");
|
|
5
|
+
const polling_1 = require("./polling");
|
|
6
|
+
async function resolveAndTestFacts(ecosystem, scans, options) {
|
|
7
|
+
var _a, _b, _c;
|
|
8
|
+
const results = [];
|
|
9
|
+
const errors = [];
|
|
10
|
+
for (const [path, scanResults] of Object.entries(scans)) {
|
|
11
|
+
await spinner(`Resolving and Testing fileSignatures in ${path}`);
|
|
12
|
+
for (const scanResult of scanResults) {
|
|
13
|
+
try {
|
|
14
|
+
const res = await polling_1.requestPollingToken(options, true, scanResult);
|
|
15
|
+
const { maxAttempts, pollInterval } = res.pollingTask;
|
|
16
|
+
const attemptsCount = 0;
|
|
17
|
+
const response = await polling_1.pollingWithTokenUntilDone(res.token, ecosystem, options, pollInterval, attemptsCount, maxAttempts);
|
|
18
|
+
results.push({
|
|
19
|
+
issues: (_a = response === null || response === void 0 ? void 0 : response.result) === null || _a === void 0 ? void 0 : _a.issues,
|
|
20
|
+
issuesData: (_b = response === null || response === void 0 ? void 0 : response.result) === null || _b === void 0 ? void 0 : _b.issuesData,
|
|
21
|
+
depGraphData: (_c = response === null || response === void 0 ? void 0 : response.result) === null || _c === void 0 ? void 0 : _c.depGraphData,
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
catch (error) {
|
|
25
|
+
const hasStatusCodeError = error.code >= 400 && error.code <= 500;
|
|
26
|
+
if (hasStatusCodeError) {
|
|
27
|
+
errors.push(error.message);
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
const failedPath = path ? `in ${path}` : '.';
|
|
31
|
+
errors.push(`Could not test dependencies ${failedPath}`);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
spinner.clearAll();
|
|
36
|
+
return [results, errors];
|
|
37
|
+
}
|
|
38
|
+
exports.resolveAndTestFacts = resolveAndTestFacts;
|
|
39
|
+
//# sourceMappingURL=resolve-test-facts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-test-facts.js","sourceRoot":"","sources":["../../../src/lib/ecosystems/resolve-test-facts.ts"],"names":[],"mappings":";;;AACA,6CAA6C;AAE7C,uCAA2E;AAEpE,KAAK,UAAU,mBAAmB,CACvC,SAAoB,EACpB,KAEC,EACD,OAAgB;;IAEhB,MAAM,OAAO,GAAU,EAAE,CAAC;IAC1B,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACvD,MAAM,OAAO,CAAC,2CAA2C,IAAI,EAAE,CAAC,CAAC;QACjE,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,IAAI;gBACF,MAAM,GAAG,GAAG,MAAM,6BAAmB,CAAC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;gBACjE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,WAAW,CAAC;gBACtD,MAAM,aAAa,GAAG,CAAC,CAAC;gBACxB,MAAM,QAAQ,GAAG,MAAM,mCAAyB,CAC9C,GAAG,CAAC,KAAK,EACT,SAAS,EACT,OAAO,EACP,YAAY,EACZ,aAAa,EACb,WAAW,CACZ,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC;oBACX,MAAM,QAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,MAAM;oBAChC,UAAU,QAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,UAAU;oBACxC,YAAY,QAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,YAAY;iBAC7C,CAAC,CAAC;aACJ;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,kBAAkB,GAAG,KAAK,CAAC,IAAI,IAAI,GAAG,IAAI,KAAK,CAAC,IAAI,IAAI,GAAG,CAAC;gBAClE,IAAI,kBAAkB,EAAE;oBACtB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC3B,SAAS;iBACV;gBACD,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;gBAC7C,MAAM,CAAC,IAAI,CAAC,+BAA+B,UAAU,EAAE,CAAC,CAAC;aAC1D;SACF;KACF;IACD,OAAO,CAAC,QAAQ,EAAE,CAAC;IACnB,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC3B,CAAC;AA3CD,kDA2CC"}
|
|
@@ -23,3 +23,4 @@ export { UnsupportedOptionCombinationError } from './unsupported-option-combinat
|
|
|
23
23
|
export { FeatureNotSupportedByPackageManagerError } from './feature-not-supported-by-package-manager-error';
|
|
24
24
|
export { DockerImageNotFoundError } from './docker-image-not-found-error';
|
|
25
25
|
export { NotSupportedIacFileError, NotSupportedIacFileErrorMsg, IllegalIacFileErrorMsg, NotSupportedIacAllProjects, } from './invalid-iac-file';
|
|
26
|
+
export { NotFoundError } from './not-found-error';
|
package/dist/lib/errors/index.js
CHANGED
|
@@ -53,4 +53,6 @@ Object.defineProperty(exports, "NotSupportedIacFileError", { enumerable: true, g
|
|
|
53
53
|
Object.defineProperty(exports, "NotSupportedIacFileErrorMsg", { enumerable: true, get: function () { return invalid_iac_file_1.NotSupportedIacFileErrorMsg; } });
|
|
54
54
|
Object.defineProperty(exports, "IllegalIacFileErrorMsg", { enumerable: true, get: function () { return invalid_iac_file_1.IllegalIacFileErrorMsg; } });
|
|
55
55
|
Object.defineProperty(exports, "NotSupportedIacAllProjects", { enumerable: true, get: function () { return invalid_iac_file_1.NotSupportedIacAllProjects; } });
|
|
56
|
+
var not_found_error_1 = require("./not-found-error");
|
|
57
|
+
Object.defineProperty(exports, "NotFoundError", { enumerable: true, get: function () { return not_found_error_1.NotFoundError; } });
|
|
56
58
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/errors/index.ts"],"names":[],"mappings":";;AAAA,yDAA2D;AAAlD,yHAAA,oBAAoB,OAAA;AAC7B,6DAA8D;AAArD,4HAAA,qBAAqB,OAAA;AAC9B,uEAAoE;AAA3D,kIAAA,sBAAsB,OAAA;AAC/B,+EAAgF;AAAvE,8IAAA,8BAA8B,OAAA;AACvC,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,iDAA+C;AAAtC,6GAAA,YAAY,OAAA;AACrB,uEAAoE;AAA3D,kIAAA,sBAAsB,OAAA;AAC/B,6EAAwE;AAA/D,sIAAA,uBAAuB,OAAA;AAChC,mEAA+D;AAAtD,6HAAA,mBAAmB,OAAA;AAC5B,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAC5B,6FAAwF;AAA/E,sJAAA,+BAA+B,OAAA;AACxC,iHAA0G;AAAjG,wKAAA,uCAAuC,OAAA;AAChD,mFAA+E;AAAtE,6IAAA,2BAA2B,OAAA;AACpC,yFAAqF;AAA5E,mJAAA,8BAA8B,OAAA;AACvC,uEAAkE;AAAzD,gIAAA,oBAAoB,OAAA;AAC7B,6DAAyD;AAAhD,uHAAA,gBAAgB,OAAA;AACzB,6EAAgE;AAAvD,8HAAA,eAAe,OAAA;AACxB,yFAAqF;AAA5E,mJAAA,8BAA8B,OAAA;AACvC,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;AAC3B,yDAAsD;AAA7C,oHAAA,eAAe,OAAA;AACxB,mEAAoE;AAA3D,kIAAA,wBAAwB,OAAA;AACjC,+FAA2F;AAAlF,yJAAA,iCAAiC,OAAA;AAC1C,mHAA4G;AAAnG,0KAAA,wCAAwC,OAAA;AACjD,+EAA0E;AAAjE,wIAAA,wBAAwB,OAAA;AACjC,uDAK4B;AAJ1B,4HAAA,wBAAwB,OAAA;AACxB,+HAAA,2BAA2B,OAAA;AAC3B,0HAAA,sBAAsB,OAAA;AACtB,8HAAA,0BAA0B,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/errors/index.ts"],"names":[],"mappings":";;AAAA,yDAA2D;AAAlD,yHAAA,oBAAoB,OAAA;AAC7B,6DAA8D;AAArD,4HAAA,qBAAqB,OAAA;AAC9B,uEAAoE;AAA3D,kIAAA,sBAAsB,OAAA;AAC/B,+EAAgF;AAAvE,8IAAA,8BAA8B,OAAA;AACvC,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,iDAA+C;AAAtC,6GAAA,YAAY,OAAA;AACrB,uEAAoE;AAA3D,kIAAA,sBAAsB,OAAA;AAC/B,6EAAwE;AAA/D,sIAAA,uBAAuB,OAAA;AAChC,mEAA+D;AAAtD,6HAAA,mBAAmB,OAAA;AAC5B,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAC5B,6FAAwF;AAA/E,sJAAA,+BAA+B,OAAA;AACxC,iHAA0G;AAAjG,wKAAA,uCAAuC,OAAA;AAChD,mFAA+E;AAAtE,6IAAA,2BAA2B,OAAA;AACpC,yFAAqF;AAA5E,mJAAA,8BAA8B,OAAA;AACvC,uEAAkE;AAAzD,gIAAA,oBAAoB,OAAA;AAC7B,6DAAyD;AAAhD,uHAAA,gBAAgB,OAAA;AACzB,6EAAgE;AAAvD,8HAAA,eAAe,OAAA;AACxB,yFAAqF;AAA5E,mJAAA,8BAA8B,OAAA;AACvC,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;AAC3B,yDAAsD;AAA7C,oHAAA,eAAe,OAAA;AACxB,mEAAoE;AAA3D,kIAAA,wBAAwB,OAAA;AACjC,+FAA2F;AAAlF,yJAAA,iCAAiC,OAAA;AAC1C,mHAA4G;AAAnG,0KAAA,wCAAwC,OAAA;AACjD,+EAA0E;AAAjE,wIAAA,wBAAwB,OAAA;AACjC,uDAK4B;AAJ1B,4HAAA,wBAAwB,OAAA;AACxB,+HAAA,2BAA2B,OAAA;AAC3B,0HAAA,sBAAsB,OAAA;AACtB,8HAAA,0BAA0B,OAAA;AAE5B,qDAAkD;AAAzC,gHAAA,aAAa,OAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CustomError } from './custom-error';
|
|
2
|
-
export declare class
|
|
2
|
+
export declare class NotFoundError extends CustomError {
|
|
3
3
|
private static ERROR_CODE;
|
|
4
4
|
private static ERROR_MESSAGE;
|
|
5
|
-
constructor();
|
|
5
|
+
constructor(userMessage: any);
|
|
6
6
|
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NotFoundError = void 0;
|
|
4
|
+
const custom_error_1 = require("./custom-error");
|
|
5
|
+
class NotFoundError extends custom_error_1.CustomError {
|
|
6
|
+
constructor(userMessage) {
|
|
7
|
+
super(userMessage || NotFoundError.ERROR_MESSAGE);
|
|
8
|
+
this.code = NotFoundError.ERROR_CODE;
|
|
9
|
+
this.userMessage = userMessage || NotFoundError.ERROR_MESSAGE;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
exports.NotFoundError = NotFoundError;
|
|
13
|
+
NotFoundError.ERROR_CODE = 404;
|
|
14
|
+
NotFoundError.ERROR_MESSAGE = "Couldn't find the requested resource";
|
|
15
|
+
//# sourceMappingURL=not-found-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"not-found-error.js","sourceRoot":"","sources":["../../../src/lib/errors/not-found-error.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAE7C,MAAa,aAAc,SAAQ,0BAAW;IAI5C,YAAY,WAAW;QACrB,KAAK,CAAC,WAAW,IAAI,aAAa,CAAC,aAAa,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,WAAW,IAAI,aAAa,CAAC,aAAa,CAAC;IAChE,CAAC;;AARH,sCASC;AARgB,wBAAU,GAAG,GAAG,CAAC;AACjB,2BAAa,GAAG,sCAAsC,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.mapIacTestResponseToSarifResults = exports.extractReportingDescriptor = exports.createSarifOutputForIac = exports.capitalizePackageManager = exports.getIacDisplayErrorFileOutput = exports.getIacDisplayedOutput = void 0;
|
|
4
4
|
const chalk_1 = require("chalk");
|
|
5
|
+
const theme_1 = require("../theme");
|
|
5
6
|
const Debug = require("debug");
|
|
6
7
|
const pathLib = require("path");
|
|
7
8
|
const url_1 = require("url");
|
|
@@ -22,8 +23,7 @@ function formatIacIssue(issue, isNew, path) {
|
|
|
22
23
|
const pathStr = remediation_based_format_issues_1.printPath(path);
|
|
23
24
|
introducedBy = `\n introduced by ${pathStr}`;
|
|
24
25
|
}
|
|
25
|
-
|
|
26
|
-
return (severityColor.colorFunc(` ✗ ${chalk_1.default.bold(issue.title)}${newBadge} [${legacy_format_issue_1.titleCaseText(issue.severity)} Severity]`) +
|
|
26
|
+
return (common_1.colorTextBySeverity(issue.severity, ` ${theme_1.icon.ISSUE} ${chalk_1.default.bold(issue.title)}${newBadge} [${legacy_format_issue_1.titleCaseText(issue.severity)} Severity]`) +
|
|
27
27
|
` [${issue.id}]` +
|
|
28
28
|
name +
|
|
29
29
|
introducedBy +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iac-output.js","sourceRoot":"","sources":["../../../src/lib/formatters/iac-output.ts"],"names":[],"mappings":";;;AAAA,iCAA0B;AAC1B,+BAA+B;AAC/B,gCAAgC;AAChC,6BAAoC;AACpC,gDAAiD;AAMjD,uFAA8D;AAC9D,+DAAsD;AAEtD,uDAAsD;AACtD,uDAAiE;AAEjE,6CAAiD;AACjD,6DAAwD;AACxD,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;AAElC,SAAS,cAAc,CACrB,KAAwB,EACxB,KAAc,EACd,IAAc;IAEd,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IACvC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAErE,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,IAAI,EAAE;QACR,kEAAkE;QAClE,MAAM,OAAO,GAAG,2CAAS,CAAC,IAAI,CAAC,CAAC;QAChC,YAAY,GAAG,uBAAuB,OAAO,EAAE,CAAC;KACjD;IAED,
|
|
1
|
+
{"version":3,"file":"iac-output.js","sourceRoot":"","sources":["../../../src/lib/formatters/iac-output.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,12 +63,11 @@ exports.formatIssues = formatIssues;
|
|
|
63
63
|
function createSeverityBasedIssueHeading({ severity, originalSeverity, type, packageName, isNew, }) {
|
|
64
64
|
// Example: ✗ Medium severity vulnerability found in xmldom
|
|
65
65
|
const vulnTypeText = type === 'license' ? 'issue' : 'vulnerability';
|
|
66
|
-
const severityColor = common_1.getLegacySeveritiesColour(severity);
|
|
67
66
|
let originalSeverityStr = '';
|
|
68
67
|
if (originalSeverity && originalSeverity !== severity) {
|
|
69
68
|
originalSeverityStr = ` (originally ${titleCaseText(originalSeverity)})`;
|
|
70
69
|
}
|
|
71
|
-
return (
|
|
70
|
+
return (common_1.colorTextBySeverity(severity, '✗ ' +
|
|
72
71
|
titleCaseText(severity) +
|
|
73
72
|
` severity${originalSeverityStr} ` +
|
|
74
73
|
vulnTypeText +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy-format-issue.js","sourceRoot":"","sources":["../../../src/lib/formatters/legacy-format-issue.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACpC,iCAA0B;AAE1B,2CAA2C;AAE3C,6CAAiD;AACjD,6CAA+D;AAC/D,iEAIoC;AAOpC,6EAAuE;AACvE,+DAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"legacy-format-issue.js","sourceRoot":"","sources":["../../../src/lib/formatters/legacy-format-issue.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.formatIssue = exports.printPath = exports.formatIssuesWithRemediation = void 0;
|
|
4
4
|
const chalk_1 = require("chalk");
|
|
5
|
+
const theme_1 = require("../theme");
|
|
5
6
|
const config = require("../../lib/config");
|
|
6
7
|
const common_1 = require("../../lib/snyk-test/common");
|
|
7
8
|
const legal_license_instructions_1 = require("./legal-license-instructions");
|
|
@@ -213,7 +214,6 @@ function printPath(path) {
|
|
|
213
214
|
}
|
|
214
215
|
exports.printPath = printPath;
|
|
215
216
|
function formatIssue(id, title, severity, isNew, vulnerableModule, paths, testOptions, note, originalSeverity, legalInstructions, reachability, sampleReachablePaths) {
|
|
216
|
-
const severityColor = common_1.getSeveritiesColour(severity);
|
|
217
217
|
const newBadge = isNew ? ' (new)' : '';
|
|
218
218
|
const name = vulnerableModule ? ` in ${chalk_1.default.bold(vulnerableModule)}` : '';
|
|
219
219
|
let legalLicenseInstructionsText;
|
|
@@ -251,7 +251,7 @@ function formatIssue(id, title, severity, isNew, vulnerableModule, paths, testOp
|
|
|
251
251
|
if (originalSeverity && originalSeverity !== severity) {
|
|
252
252
|
originalSeverityStr = ` (originally ${titleCaseText(originalSeverity)})`;
|
|
253
253
|
}
|
|
254
|
-
return (
|
|
254
|
+
return (common_1.colorTextBySeverity(severity, ` ${theme_1.icon.ISSUE} ${chalk_1.default.bold(title)}${newBadge} [${titleCaseText(severity)} Severity${originalSeverityStr}]`) +
|
|
255
255
|
reachabilityText +
|
|
256
256
|
`[${config.ROOT}/vuln/${id}]` +
|
|
257
257
|
name +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remediation-based-format-issues.js","sourceRoot":"","sources":["../../../src/lib/formatters/remediation-based-format-issues.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"remediation-based-format-issues.js","sourceRoot":"","sources":["../../../src/lib/formatters/remediation-based-format-issues.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.displayResult = void 0;
|
|
4
4
|
const pathLib = require("path");
|
|
5
5
|
const chalk_1 = require("chalk");
|
|
6
|
+
const theme_1 = require("../../theme");
|
|
6
7
|
const is_ci_1 = require("../../../lib/is-ci");
|
|
7
8
|
const detect_1 = require("../../../lib/detect");
|
|
8
9
|
const formatters_1 = require("../../../lib/formatters");
|
|
@@ -46,7 +47,7 @@ function displayResult(res, options, foundProjectCount) {
|
|
|
46
47
|
const vulnPathsText = options.showVulnPaths
|
|
47
48
|
? 'no vulnerable paths found.'
|
|
48
49
|
: 'none were found.';
|
|
49
|
-
const summaryOKText =
|
|
50
|
+
const summaryOKText = theme_1.color.status.success(`${theme_1.icon.VALID} ${testedInfoText}, ${vulnPathsText}`);
|
|
50
51
|
const nextStepsText = localPackageTest
|
|
51
52
|
? '\n\nNext steps:' +
|
|
52
53
|
'\n- Run `snyk monitor` to be notified ' +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"display-result.js","sourceRoot":"","sources":["../../../../src/lib/formatters/test/display-result.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,iCAA0B;
|
|
1
|
+
{"version":3,"file":"display-result.js","sourceRoot":"","sources":["../../../../src/lib/formatters/test/display-result.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.warnSomeGradleManifestsNotScanned = exports.getDepsFromPlugin = void 0;
|
|
|
4
4
|
const debugModule = require("debug");
|
|
5
5
|
const pathLib = require("path");
|
|
6
6
|
const chalk_1 = require("chalk");
|
|
7
|
+
const theme_1 = require("../theme");
|
|
7
8
|
const cli_interface_1 = require("@snyk/cli-interface");
|
|
8
9
|
const find_files_1 = require("../find-files");
|
|
9
10
|
const errors_1 = require("../errors");
|
|
@@ -94,7 +95,7 @@ function warnSomeGradleManifestsNotScanned(scannedProjects, allFilesFound, root)
|
|
|
94
95
|
const diff = detectedGradleFiles.filter((file) => !scannedGradleFiles.includes(file));
|
|
95
96
|
if (diff.length > 0) {
|
|
96
97
|
debug(`These Gradle manifests did not return any dependency results:\n${diff.join(',\n')}`);
|
|
97
|
-
return
|
|
98
|
+
return `${theme_1.icon.ISSUE} ${diff.length}/${detectedGradleFiles.length} detected Gradle manifests did not return dependencies. They may have errored or were not included as part of a multi-project build. You may need to scan them individually with --file=path/to/file. Run with \`-d\` for more info.`;
|
|
98
99
|
}
|
|
99
100
|
return null;
|
|
100
101
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-deps-from-plugin.js","sourceRoot":"","sources":["../../../src/lib/plugins/get-deps-from-plugin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"get-deps-from-plugin.js","sourceRoot":"","sources":["../../../src/lib/plugins/get-deps-from-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const cloneDeep = require('lodash.clonedeep');
|
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const cliInterface = require("@snyk/cli-interface");
|
|
7
7
|
const chalk_1 = require("chalk");
|
|
8
|
+
const theme_1 = require("../theme");
|
|
8
9
|
const debugModule = require("debug");
|
|
9
10
|
const detect_1 = require("../detect");
|
|
10
11
|
const get_single_plugin_result_1 = require("./get-single-plugin-result");
|
|
@@ -42,7 +43,7 @@ async function getMultiPluginResult(root, options, targetFiles) {
|
|
|
42
43
|
error: err,
|
|
43
44
|
errMessage: err.message || 'Something went wrong getting dependencies',
|
|
44
45
|
});
|
|
45
|
-
debug(chalk_1.default.bold.red(`\n
|
|
46
|
+
debug(chalk_1.default.bold.red(`\n${theme_1.icon.ISSUE} Failed to get dependencies for ${targetFile}\nERROR: ${err.message}\n`));
|
|
46
47
|
}
|
|
47
48
|
}
|
|
48
49
|
if (!allResults.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-multi-plugin-result.js","sourceRoot":"","sources":["../../../src/lib/plugins/get-multi-plugin-result.ts"],"names":[],"mappings":";;;AAAA,MAAM,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9C,6BAA6B;AAC7B,oDAAoD;AACpD,iCAA0B;AAC1B,qCAAqC;AAGrC,sCAAyD;AAEzD,yEAAmE;AACnE,6GAAgG;AAChG,yGAA6F;AAG7F,sCAAiD;AAEjD,MAAM,KAAK,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;AAmBhC,KAAK,UAAU,oBAAoB,CACxC,IAAY,EACZ,OAAiD,EACjD,WAAqB;IAErB,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,MAAM,aAAa,GAA6B,EAAE,CAAC;IAEnD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QACxC,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACpD,YAAY,CAAC,cAAc,GAAG,qCAA4B,CACxD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAC1B,CAAC;QACF,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,gDAAqB,CAC5C,IAAI,EACJ,YAAY,EACZ,YAAY,CAAC,IAAI,CAClB,CAAC;YACF,IAAI,yBAAuE,CAAC;YAE5E,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;gBACxD,yBAAyB,GAAG,6EAAgC,CAC1D,UAAU,EACV,YAAY,CAAC,cAAc,CAC5B,CAAC;aACH;iBAAM;gBACL,yBAAyB,GAAG,UAAU,CAAC;aACxC;YAED,MAAM,qCAAqC,GAAG,0EAA+B,CAC3E,yBAAyB,EACzB,YAAY,CAAC,cAAc,EAC3B,YAAY,CAAC,IAAI,CAClB,CAAC;YACF,qEAAqE;YACrE,qBAAqB;YACrB,4DAA4D;YAC3D,OAAe,CAAC,YAAY,GAAG,yBAAyB,CAAC,eAAe,CAAC,GAAG,CAC3E,CAAC,cAAc,EAAE,EAAE,wBAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,0CAAE,IAAI,GAAA,CAClD,CAAC;YAEF,UAAU,CAAC,IAAI,CAAC,GAAG,qCAAqC,CAAC,eAAe,CAAC,CAAC;SAC3E;QAAC,OAAO,GAAG,EAAE;YACZ,qEAAqE;YACrE,aAAa,CAAC,IAAI,CAAC;gBACjB,UAAU;gBACV,KAAK,EAAE,GAAG;gBACV,UAAU,EAAE,GAAG,CAAC,OAAO,IAAI,2CAA2C;aACvE,CAAC,CAAC;YACH,KAAK,CACH,eAAK,CAAC,IAAI,CAAC,GAAG,CACZ,
|
|
1
|
+
{"version":3,"file":"get-multi-plugin-result.js","sourceRoot":"","sources":["../../../src/lib/plugins/get-multi-plugin-result.ts"],"names":[],"mappings":";;;AAAA,MAAM,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9C,6BAA6B;AAC7B,oDAAoD;AACpD,iCAA0B;AAC1B,oCAAgC;AAChC,qCAAqC;AAGrC,sCAAyD;AAEzD,yEAAmE;AACnE,6GAAgG;AAChG,yGAA6F;AAG7F,sCAAiD;AAEjD,MAAM,KAAK,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;AAmBhC,KAAK,UAAU,oBAAoB,CACxC,IAAY,EACZ,OAAiD,EACjD,WAAqB;IAErB,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,MAAM,aAAa,GAA6B,EAAE,CAAC;IAEnD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QACxC,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACpD,YAAY,CAAC,cAAc,GAAG,qCAA4B,CACxD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAC1B,CAAC;QACF,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,gDAAqB,CAC5C,IAAI,EACJ,YAAY,EACZ,YAAY,CAAC,IAAI,CAClB,CAAC;YACF,IAAI,yBAAuE,CAAC;YAE5E,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;gBACxD,yBAAyB,GAAG,6EAAgC,CAC1D,UAAU,EACV,YAAY,CAAC,cAAc,CAC5B,CAAC;aACH;iBAAM;gBACL,yBAAyB,GAAG,UAAU,CAAC;aACxC;YAED,MAAM,qCAAqC,GAAG,0EAA+B,CAC3E,yBAAyB,EACzB,YAAY,CAAC,cAAc,EAC3B,YAAY,CAAC,IAAI,CAClB,CAAC;YACF,qEAAqE;YACrE,qBAAqB;YACrB,4DAA4D;YAC3D,OAAe,CAAC,YAAY,GAAG,yBAAyB,CAAC,eAAe,CAAC,GAAG,CAC3E,CAAC,cAAc,EAAE,EAAE,wBAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,0CAAE,IAAI,GAAA,CAClD,CAAC;YAEF,UAAU,CAAC,IAAI,CAAC,GAAG,qCAAqC,CAAC,eAAe,CAAC,CAAC;SAC3E;QAAC,OAAO,GAAG,EAAE;YACZ,qEAAqE;YACrE,aAAa,CAAC,IAAI,CAAC;gBACjB,UAAU;gBACV,KAAK,EAAE,GAAG;gBACV,UAAU,EAAE,GAAG,CAAC,OAAO,IAAI,2CAA2C;aACvE,CAAC,CAAC;YACH,KAAK,CACH,eAAK,CAAC,IAAI,CAAC,GAAG,CACZ,KAAK,YAAI,CAAC,KAAK,mCAAmC,UAAU,YAAY,GAAG,CAAC,OAAO,IAAI,CACxF,CACF,CAAC;SACH;KACF;IAED,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;QACtB,MAAM,IAAI,6BAAoB,CAC5B,sCAAsC,WAAW,CAAC,MAAM,mFAAmF,CAC5I,CAAC;KACH;IAED,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,oBAAoB;SAC3B;QACD,eAAe,EAAE,UAAU;QAC3B,aAAa;KACd,CAAC;AACJ,CAAC;AAxED,oDAwEC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getPrefix = exports.getMeta = exports.getCodeDisplayedOutput = void 0;
|
|
4
4
|
const Debug = require("debug");
|
|
5
5
|
const chalk_1 = require("chalk");
|
|
6
|
+
const theme_1 = require("../../../theme");
|
|
6
7
|
const common_1 = require("../../../snyk-test/common");
|
|
7
8
|
const right_pad_1 = require("../../../right-pad");
|
|
8
9
|
const debug = Debug('code-output');
|
|
@@ -14,7 +15,7 @@ function getCodeDisplayedOutput(codeTest, meta, prefix) {
|
|
|
14
15
|
issues = getIssues(results, rulesMap);
|
|
15
16
|
}
|
|
16
17
|
const issuesText = issues.low.join('') + issues.medium.join('') + issues.high.join('');
|
|
17
|
-
const summaryOKText =
|
|
18
|
+
const summaryOKText = theme_1.color.status.success(`${theme_1.icon.VALID} Test completed`);
|
|
18
19
|
const codeIssueSummary = getCodeIssuesSummary(issues);
|
|
19
20
|
return (prefix +
|
|
20
21
|
issuesText +
|
|
@@ -28,18 +29,18 @@ function getCodeDisplayedOutput(codeTest, meta, prefix) {
|
|
|
28
29
|
exports.getCodeDisplayedOutput = getCodeDisplayedOutput;
|
|
29
30
|
function getCodeIssuesSummary(issues) {
|
|
30
31
|
const lowSeverityText = issues.low.length
|
|
31
|
-
? common_1.
|
|
32
|
+
? common_1.colorTextBySeverity(common_1.SEVERITY.LOW, ` ${issues.low.length} [Low] `)
|
|
32
33
|
: '';
|
|
33
34
|
const mediumSeverityText = issues.medium.length
|
|
34
|
-
? common_1.
|
|
35
|
+
? common_1.colorTextBySeverity(common_1.SEVERITY.MEDIUM, ` ${issues.medium.length} [Medium] `)
|
|
35
36
|
: '';
|
|
36
37
|
const highSeverityText = issues.high.length
|
|
37
|
-
? common_1.
|
|
38
|
+
? common_1.colorTextBySeverity(common_1.SEVERITY.HIGH, `${issues.high.length} [High] `)
|
|
38
39
|
: '';
|
|
39
40
|
const codeIssueCount = issues.low.length + issues.medium.length + issues.high.length;
|
|
40
41
|
const codeIssueFound = `${codeIssueCount} Code issue${codeIssueCount > 0 ? 's' : ''} found`;
|
|
41
42
|
const issuesBySeverityText = highSeverityText + mediumSeverityText + lowSeverityText;
|
|
42
|
-
const vulnPathsText =
|
|
43
|
+
const vulnPathsText = theme_1.color.status.success(`${theme_1.icon.VALID} Awesome! No issues were found.`);
|
|
43
44
|
return codeIssueCount > 0
|
|
44
45
|
? codeIssueFound + '\n' + issuesBySeverityText
|
|
45
46
|
: vulnPathsText;
|
|
@@ -61,7 +62,7 @@ function getIssues(results, rulesMap) {
|
|
|
61
62
|
debug('Rule ID does not exist in the rules list');
|
|
62
63
|
}
|
|
63
64
|
const ruleName = ((_b = rulesMap[ruleId].shortDescription) === null || _b === void 0 ? void 0 : _b.text) || rulesMap[ruleId].name;
|
|
64
|
-
const ruleIdSeverityText = common_1.
|
|
65
|
+
const ruleIdSeverityText = common_1.colorTextBySeverity(severity, ` ${theme_1.icon.ISSUE} [${severity}] ${ruleName}`);
|
|
65
66
|
const artifactLocationUri = location.artifactLocation.uri;
|
|
66
67
|
const startLine = location.region.startLine;
|
|
67
68
|
const text = res.message.text;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output-format.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/sast/format/output-format.ts"],"names":[],"mappings":";;;AACA,+BAA+B;AAC/B,iCAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"output-format.js","sourceRoot":"","sources":["../../../../../src/lib/plugins/sast/format/output-format.ts"],"names":[],"mappings":"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"}
|