snyk 1.669.0 → 1.673.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/bin/snyk +2 -0
- package/dist/cli/commands/auth/index.js +3 -3
- package/dist/cli/commands/auth/index.js.map +1 -1
- package/dist/cli/commands/auth/is-authed.js +2 -2
- package/dist/cli/commands/auth/is-authed.js.map +1 -1
- package/dist/cli/commands/test/iac-local-execution/org-settings/get-iac-org-settings.js +2 -2
- package/dist/cli/commands/test/iac-local-execution/org-settings/get-iac-org-settings.js.map +1 -1
- package/dist/cli/commands/test/iac-local-execution/parsers/path.d.ts +1 -0
- package/dist/cli/commands/test/iac-local-execution/parsers/path.js +37 -0
- package/dist/cli/commands/test/iac-local-execution/parsers/path.js.map +1 -0
- package/dist/cli/commands/test/iac-local-execution/results-formatter.js +2 -1
- package/dist/cli/commands/test/iac-local-execution/results-formatter.js.map +1 -1
- package/dist/cli/commands/test/iac-local-execution/usage-tracking.js +2 -2
- package/dist/cli/commands/test/iac-local-execution/usage-tracking.js.map +1 -1
- package/dist/cli/index.js +0 -0
- package/dist/lib/analytics/index.js +2 -2
- package/dist/lib/analytics/index.js.map +1 -1
- package/dist/lib/authorization.js +2 -2
- package/dist/lib/authorization.js.map +1 -1
- package/dist/lib/feature-flags.js +2 -2
- package/dist/lib/feature-flags.js.map +1 -1
- package/dist/lib/iac/iac-parser.js +2 -2
- package/dist/lib/iac/iac-parser.js.map +1 -1
- package/dist/lib/monitor/index.js +4 -4
- package/dist/lib/monitor/index.js.map +1 -1
- package/dist/lib/plugins/sast/checks.js +3 -3
- package/dist/lib/plugins/sast/checks.js.map +1 -1
- package/dist/lib/protect/fetch-patch.js +2 -2
- package/dist/lib/protect/fetch-patch.js.map +1 -1
- package/dist/lib/request/index.d.ts +3 -3
- package/dist/lib/request/index.js +6 -4
- package/dist/lib/request/index.js.map +1 -1
- package/dist/lib/request/promise.js +1 -1
- package/dist/lib/request/promise.js.map +1 -1
- package/dist/lib/request/request.d.ts +1 -2
- package/dist/lib/request/request.js +84 -80
- package/dist/lib/request/request.js.map +1 -1
- package/dist/lib/snyk-test/legacy.d.ts +2 -2
- package/dist/lib/snyk-test/legacy.js +8 -4
- package/dist/lib/snyk-test/legacy.js.map +1 -1
- package/dist/lib/snyk-test/run-test.js +3 -6
- package/dist/lib/snyk-test/run-test.js.map +1 -1
- package/package.json +8 -5
package/bin/snyk
ADDED
|
@@ -10,7 +10,7 @@ const is_ci_1 = require("../../../lib/is-ci");
|
|
|
10
10
|
const is_docker_1 = require("../../../lib/is-docker");
|
|
11
11
|
const args_1 = require("../../args");
|
|
12
12
|
const config = require("../../../lib/config");
|
|
13
|
-
const
|
|
13
|
+
const request_1 = require("../../../lib/request");
|
|
14
14
|
const errors_1 = require("../../../lib/errors");
|
|
15
15
|
const errors_2 = require("../../../lib/errors");
|
|
16
16
|
const token_expired_error_1 = require("../../../lib/errors/token-expired-error");
|
|
@@ -76,7 +76,7 @@ async function testAuthComplete(token, ipFamily) {
|
|
|
76
76
|
}
|
|
77
77
|
return new Promise((resolve, reject) => {
|
|
78
78
|
debug(payload);
|
|
79
|
-
|
|
79
|
+
request_1.makeRequest(payload, (error, res, body) => {
|
|
80
80
|
debug(error, (res || {}).statusCode, body);
|
|
81
81
|
if (error) {
|
|
82
82
|
return reject(error);
|
|
@@ -148,7 +148,7 @@ async function getIpFamily() {
|
|
|
148
148
|
const family = 6;
|
|
149
149
|
try {
|
|
150
150
|
// Dispatch a FORCED IPv6 request to test client's ISP and network capability
|
|
151
|
-
await
|
|
151
|
+
await request_1.makeRequest({
|
|
152
152
|
url: config.API + '/verify/callback',
|
|
153
153
|
family,
|
|
154
154
|
method: 'post',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/commands/auth/index.ts"],"names":[],"mappings":";AAAA,2BAA2B;AAC3B,6BAA6B;AAC7B,+BAAoC;AACpC,+BAA+B;AAC/B,6CAAsC;AACtC,qCAAqC;AACrC,2CAAwC;AACxC,8CAA0C;AAC1C,sDAAkD;AAClD,qCAA6C;AAC7C,8CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/commands/auth/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.verifyAPI = exports.isAuthed = void 0;
|
|
4
4
|
const snyk = require("../../../lib");
|
|
5
5
|
const config = require("../../../lib/config");
|
|
6
|
-
const
|
|
6
|
+
const request_1 = require("../../../lib/request");
|
|
7
7
|
function isAuthed() {
|
|
8
8
|
const token = snyk.config.get('api');
|
|
9
9
|
return verifyAPI(token).then((res) => {
|
|
@@ -21,7 +21,7 @@ function verifyAPI(api) {
|
|
|
21
21
|
json: true,
|
|
22
22
|
};
|
|
23
23
|
return new Promise((resolve, reject) => {
|
|
24
|
-
|
|
24
|
+
request_1.makeRequest(payload, (error, res, body) => {
|
|
25
25
|
if (error) {
|
|
26
26
|
return reject(error);
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-authed.js","sourceRoot":"","sources":["../../../../src/cli/commands/auth/is-authed.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,8CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"is-authed.js","sourceRoot":"","sources":["../../../../src/cli/commands/auth/is-authed.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,8CAA8C;AAC9C,kDAAmD;AAEnD,SAAgB,QAAQ;IACtB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACrC,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE;QACxC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC;AALD,4BAKC;AAED,SAAgB,SAAS,CAAC,GAAG;IAC3B,MAAM,OAAO,GAAG;QACd,IAAI,EAAE;YACJ,GAAG;SACJ;QACD,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,eAAe;QACjC,IAAI,EAAE,IAAI;KACX,CAAC;IAEF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,qBAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACxC,IAAI,KAAK,EAAE;gBACT,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;aACtB;YAED,OAAO,CAAC;gBACN,GAAG;gBACH,IAAI;aACL,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAtBD,8BAsBC"}
|
|
@@ -5,7 +5,7 @@ const types_1 = require("../types");
|
|
|
5
5
|
const config = require("../../../../../lib/config");
|
|
6
6
|
const is_ci_1 = require("../../../../../lib/is-ci");
|
|
7
7
|
const api_token_1 = require("../../../../../lib/api-token");
|
|
8
|
-
const
|
|
8
|
+
const request_1 = require("../../../../../lib/request");
|
|
9
9
|
const errors_1 = require("../../../../../lib/errors");
|
|
10
10
|
const error_utils_1 = require("../error-utils");
|
|
11
11
|
function getIacOrgSettings(publicOrgId) {
|
|
@@ -20,7 +20,7 @@ function getIacOrgSettings(publicOrgId) {
|
|
|
20
20
|
},
|
|
21
21
|
};
|
|
22
22
|
return new Promise((resolve, reject) => {
|
|
23
|
-
|
|
23
|
+
request_1.makeRequest(payload, (error, res) => {
|
|
24
24
|
if (error) {
|
|
25
25
|
return reject(error);
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-iac-org-settings.js","sourceRoot":"","sources":["../../../../../../src/cli/commands/test/iac-local-execution/org-settings/get-iac-org-settings.ts"],"names":[],"mappings":";;;AAAA,oCAAyD;AAEzD,oDAAoD;AACpD,oDAAgD;AAChD,4DAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"get-iac-org-settings.js","sourceRoot":"","sources":["../../../../../../src/cli/commands/test/iac-local-execution/org-settings/get-iac-org-settings.ts"],"names":[],"mappings":";;;AAAA,oCAAyD;AAEzD,oDAAoD;AACpD,oDAAgD;AAChD,4DAAmD;AACnD,wDAAyD;AACzD,sDAAwD;AACxD,gDAAoD;AAEpD,SAAgB,iBAAiB,CAC/B,WAAoB;IAEpB,MAAM,OAAO,GAAY;QACvB,MAAM,EAAE,KAAK;QACb,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,mBAAmB;QACrC,IAAI,EAAE,IAAI;QACV,EAAE,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE;QACxB,OAAO,EAAE;YACP,SAAS,EAAE,YAAI,EAAE;YACjB,aAAa,EAAE,SAAS,eAAG,EAAE,EAAE;SAChC;KACF,CAAC;IAEF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,qBAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAClC,IAAI,KAAK,EAAE;gBACT,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;aACtB;YACD,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,EAAE;gBAChD,OAAO,MAAM,CAAC,IAAI,8BAA8B,EAAE,CAAC,CAAC;aACrD;YACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAzBD,8CAyBC;AAED,MAAa,8BAA+B,SAAQ,oBAAW;IAC7D,YAAY,OAAgB;QAC1B,KAAK,CAAC,OAAO,IAAI,2CAA2C,CAAC,CAAC;QAC9D,IAAI,CAAC,IAAI,GAAG,qBAAa,CAAC,8BAA8B,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,gCAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW;YACd,sOAAsO,CAAC;IAC3O,CAAC;CACF;AARD,wEAQC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const parsePath: (expr: string) => string[];
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parsePath = void 0;
|
|
4
|
+
const peg = require("pegjs");
|
|
5
|
+
const grammar = `
|
|
6
|
+
start
|
|
7
|
+
= element+
|
|
8
|
+
|
|
9
|
+
element
|
|
10
|
+
= component:component "."? { return component; }
|
|
11
|
+
|
|
12
|
+
component
|
|
13
|
+
= $(identifier index?)
|
|
14
|
+
|
|
15
|
+
identifier
|
|
16
|
+
= $([^'"\\[\\]\\.]+)
|
|
17
|
+
|
|
18
|
+
index
|
|
19
|
+
= $("[" ['"]? [^'"\\]]+ ['"]? "]")
|
|
20
|
+
`;
|
|
21
|
+
exports.parsePath = createPathParser();
|
|
22
|
+
function createPathParser() {
|
|
23
|
+
const parser = peg.generate(grammar);
|
|
24
|
+
return (expr) => {
|
|
25
|
+
try {
|
|
26
|
+
return parser.parse(expr);
|
|
27
|
+
}
|
|
28
|
+
catch (e) {
|
|
29
|
+
// I haven't actually been able to write a testcase that triggers this
|
|
30
|
+
// code path, but I've included it anyway as a fallback to allow users to
|
|
31
|
+
// keep using the CLI even if this does occur. Their paths might look
|
|
32
|
+
// strange, but that's better than nothing.
|
|
33
|
+
return expr.split('.');
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=path.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../src/cli/commands/test/iac-local-execution/parsers/path.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAE7B,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;CAef,CAAC;AAEW,QAAA,SAAS,GAAG,gBAAgB,EAAE,CAAC;AAE5C,SAAS,gBAAgB;IACvB,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,CAAC,IAAY,EAAE,EAAE;QACtB,IAAI;YACF,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SAC3B;QAAC,OAAO,CAAC,EAAE;YACV,sEAAsE;YACtE,yEAAyE;YACzE,qEAAqE;YACrE,2CAA2C;YAC3C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACxB;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FailedToFormatResults = exports.filterPoliciesBySeverity = exports.formatScanResults = void 0;
|
|
4
4
|
const types_1 = require("./types");
|
|
5
|
+
const path_1 = require("./parsers/path");
|
|
5
6
|
const path = require("path");
|
|
6
7
|
const common_1 = require("../../../../lib/snyk-test/common");
|
|
7
8
|
const constants_1 = require("../../../../lib/iac/constants");
|
|
@@ -38,7 +39,7 @@ const engineTypeToProjectType = {
|
|
|
38
39
|
function formatScanResult(scanResult, meta, options) {
|
|
39
40
|
const formattedIssues = scanResult.violatedPolicies.map((policy) => {
|
|
40
41
|
const cloudConfigPath = scanResult.docId !== undefined
|
|
41
|
-
? [`[DocId: ${scanResult.docId}]`].concat(policy.msg
|
|
42
|
+
? [`[DocId: ${scanResult.docId}]`].concat(path_1.parsePath(policy.msg))
|
|
42
43
|
: policy.msg.split('.');
|
|
43
44
|
const flagsRequiringLineNumber = [
|
|
44
45
|
'json',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"results-formatter.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/results-formatter.ts"],"names":[],"mappings":";;;AAAA,mCAQiB;AACjB,6BAA6B;AAC7B,6DAA4D;AAC5D,6DAA+D;AAC/D,mDAAqD;AACrD,+DAA0D;AAC1D,+CAAmD;AACnD,mDAAuD;AAEvD,MAAM,UAAU,GAAG,CAAC,iBAAQ,CAAC,GAAG,EAAE,iBAAQ,CAAC,MAAM,EAAE,iBAAQ,CAAC,IAAI,CAAC,CAAC;AAElE,SAAgB,iBAAiB,CAC/B,WAAgC,EAChC,OAAqB,EACrB,IAAc;IAEd,IAAI;QACF,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE;YAC5D,MAAM,GAAG,GAAG,gBAAgB,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YACxD,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;gBAC7B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,CACtD,GAAG,GAAG,CAAC,MAAM,CAAC,kBAAkB,CACjC,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;aACjC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,EAAwC,CAAC,CAAC;QAC7C,OAAO,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;KACrC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,qBAAqB,EAAE,CAAC;KACnC;AACH,CAAC;AArBD,8CAqBC;AAED,MAAM,uBAAuB,GAAG;IAC9B,CAAC,kBAAU,CAAC,UAAU,CAAC,EAAE,0BAAc,CAAC,GAAG;IAC3C,CAAC,kBAAU,CAAC,SAAS,CAAC,EAAE,0BAAc,CAAC,SAAS;IAChD,CAAC,kBAAU,CAAC,cAAc,CAAC,EAAE,0BAAc,CAAC,cAAc;IAC1D,CAAC,kBAAU,CAAC,MAAM,CAAC,EAAE,0BAAc,CAAC,MAAM;CAC3C,CAAC;AAEF,SAAS,gBAAgB,CACvB,UAA6B,EAC7B,IAAc,EACd,OAAqB;IAErB,MAAM,eAAe,GAAG,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACjE,MAAM,eAAe,GACnB,UAAU,CAAC,KAAK,KAAK,SAAS;YAC5B,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"results-formatter.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/results-formatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TestLimitReachedError = exports.trackUsage = void 0;
|
|
4
|
-
const
|
|
4
|
+
const request_1 = require("../../../../lib/request");
|
|
5
5
|
const config = require("../../../../lib/config");
|
|
6
6
|
const api_token_1 = require("../../../../lib/api-token");
|
|
7
7
|
const errors_1 = require("../../../../lib/errors");
|
|
@@ -12,7 +12,7 @@ async function trackUsage(formattedResults) {
|
|
|
12
12
|
issuesPrevented: res.result.cloudConfigResults.length,
|
|
13
13
|
};
|
|
14
14
|
});
|
|
15
|
-
const trackingResponse = await
|
|
15
|
+
const trackingResponse = await request_1.makeRequest({
|
|
16
16
|
method: 'POST',
|
|
17
17
|
headers: {
|
|
18
18
|
Authorization: `token ${api_token_1.api()}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-tracking.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/usage-tracking.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"usage-tracking.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/usage-tracking.ts"],"names":[],"mappings":";;;AAAA,qDAAsD;AACtD,iDAAkD;AAClD,yDAA+D;AAC/D,mDAAqD;AAE9C,KAAK,UAAU,UAAU,CAC9B,gBAAmC;IAEnC,MAAM,YAAY,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAChD,OAAO;YACL,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS;YAC7B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM;SACtD,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,MAAM,qBAAW,CAAC;QACzC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,SAAS,eAAW,EAAE,EAAE;SACxC;QACD,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,sBAAsB;QACxC,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE;QAC/B,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IACH,QAAQ,gBAAgB,CAAC,GAAG,CAAC,UAAU,EAAE;QACvC,KAAK,GAAG;YACN,MAAM;QACR,KAAK,GAAG;YACN,MAAM,IAAI,qBAAqB,EAAE,CAAC;QACpC;YACE,MAAM,IAAI,oBAAW,CACnB,0DAA0D;gBACxD,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAC5C,CAAC;KACL;AACH,CAAC;AA9BD,gCA8BC;AAED,MAAa,qBAAsB,SAAQ,oBAAW;IACpD;QACE,KAAK,CACH,4GAA4G,CAC7G,CAAC;IACJ,CAAC;CACF;AAND,sDAMC"}
|
package/dist/cli/index.js
CHANGED
|
File without changes
|
|
@@ -5,7 +5,7 @@ const uuid_1 = require("uuid");
|
|
|
5
5
|
const snyk = require('../../lib');
|
|
6
6
|
const config = require('../config');
|
|
7
7
|
const version = require('../version');
|
|
8
|
-
const
|
|
8
|
+
const request_1 = require("../request");
|
|
9
9
|
const { getIntegrationName, getIntegrationVersion, getIntegrationEnvironment, getIntegrationEnvironmentVersion, getCommandVersion, } = require('./sources');
|
|
10
10
|
const isCI = require('../is-ci').isCI;
|
|
11
11
|
const debug = require('debug')('snyk');
|
|
@@ -97,7 +97,7 @@ async function postAnalytics(data) {
|
|
|
97
97
|
}
|
|
98
98
|
debug('analytics', JSON.stringify(data, null, ' '));
|
|
99
99
|
const queryString = Object.keys(queryStringParams).length > 0 ? queryStringParams : undefined;
|
|
100
|
-
return
|
|
100
|
+
return request_1.makeRequest({
|
|
101
101
|
body: {
|
|
102
102
|
data: data,
|
|
103
103
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/analytics/index.ts"],"names":[],"mappings":";;;AAAA,+BAAoC;AACpC,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAClC,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACpC,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AACtC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/analytics/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.actionAllowed = void 0;
|
|
4
4
|
const snyk = require("./");
|
|
5
|
-
const
|
|
5
|
+
const request_1 = require("./request");
|
|
6
6
|
const config = require("./config");
|
|
7
7
|
async function actionAllowed(action, options) {
|
|
8
8
|
const org = options.org || config.org || null;
|
|
9
9
|
try {
|
|
10
|
-
const res = await
|
|
10
|
+
const res = await request_1.makeRequest({
|
|
11
11
|
method: 'GET',
|
|
12
12
|
url: config.API + '/authorization/' + action,
|
|
13
13
|
json: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorization.js","sourceRoot":"","sources":["../../src/lib/authorization.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"authorization.js","sourceRoot":"","sources":["../../src/lib/authorization.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AAC3B,uCAAwC;AACxC,mCAAmC;AAE5B,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,OAAyB;IAEzB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC;IAE9C,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,qBAAW,CAAC;YAC5B,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,iBAAiB,GAAG,MAAM;YAC5C,IAAI,EAAE,IAAI;YACV,OAAO,EAAE;gBACP,aAAa,EAAE,QAAQ,GAAG,IAAI,CAAC,GAAG;aACnC;YACD,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;SACnB,CAAC,CAAC;QAEH,OAAQ,GAAW,CAAC,IAAI,CAAC,MAAM,CAAC;KACjC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO;YACL,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,iDAAiD;SAC1D,CAAC;KACH;AACH,CAAC;AAxBD,sCAwBC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isFeatureFlagSupportedForOrg = void 0;
|
|
4
|
-
const
|
|
4
|
+
const request_1 = require("./request");
|
|
5
5
|
const api_token_1 = require("./api-token");
|
|
6
6
|
const config = require("./config");
|
|
7
7
|
const common_1 = require("./snyk-test/common");
|
|
8
8
|
async function isFeatureFlagSupportedForOrg(featureFlag, org) {
|
|
9
|
-
const response = await
|
|
9
|
+
const response = await request_1.makeRequest({
|
|
10
10
|
method: 'GET',
|
|
11
11
|
headers: {
|
|
12
12
|
Authorization: `token ${api_token_1.api()}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature-flags.js","sourceRoot":"","sources":["../../src/lib/feature-flags.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"feature-flags.js","sourceRoot":"","sources":["../../src/lib/feature-flags.ts"],"names":[],"mappings":";;;AAAA,uCAAwC;AACxC,2CAAiD;AACjD,mCAAmC;AACnC,+CAAyD;AASlD,KAAK,UAAU,4BAA4B,CAChD,WAAmB,EACnB,GAAG;IAEH,MAAM,QAAQ,GAAG,MAAM,qBAAW,CAAC;QACjC,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,aAAa,EAAE,SAAS,eAAW,EAAE,EAAE;SACxC;QACD,EAAE,EAAE,4BAAmB,CAAC,EAAE,GAAG,EAAE,CAAC;QAChC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,6BAA6B,WAAW,EAAE;QAC5D,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IAEH,OAAQ,QAAgB,CAAC,IAAI,CAAC;AAChC,CAAC;AAhBD,oEAgBC"}
|
|
@@ -4,7 +4,7 @@ exports.makeValidateTerraformRequest = exports.validateK8sFile = exports.getFile
|
|
|
4
4
|
//TODO(orka): take out into a new lib
|
|
5
5
|
const debugLib = require("debug");
|
|
6
6
|
const errors_1 = require("../errors");
|
|
7
|
-
const
|
|
7
|
+
const request_1 = require("../request");
|
|
8
8
|
const api_token_1 = require("../api-token");
|
|
9
9
|
const config = require("./../config");
|
|
10
10
|
const yaml_parser_1 = require("../../cli/commands/test/iac-local-execution/yaml-parser");
|
|
@@ -75,7 +75,7 @@ function validateK8sFile(fileContent, filePath, fileName) {
|
|
|
75
75
|
exports.validateK8sFile = validateK8sFile;
|
|
76
76
|
async function makeValidateTerraformRequest(terraformFileContent) {
|
|
77
77
|
var _a, _b;
|
|
78
|
-
const response = await
|
|
78
|
+
const response = await request_1.makeRequest({
|
|
79
79
|
body: {
|
|
80
80
|
contentBase64: Buffer.from(terraformFileContent).toString('base64'),
|
|
81
81
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iac-parser.js","sourceRoot":"","sources":["../../../src/lib/iac/iac-parser.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,kCAAkC;AAClC,sCAKmB;AACnB,
|
|
1
|
+
{"version":3,"file":"iac-parser.js","sourceRoot":"","sources":["../../../src/lib/iac/iac-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const path = require("path");
|
|
|
6
6
|
const depGraphLib = require("@snyk/dep-graph");
|
|
7
7
|
const snyk = require("..");
|
|
8
8
|
const api_token_1 = require("../api-token");
|
|
9
|
-
const
|
|
9
|
+
const request_1 = require("../request");
|
|
10
10
|
const config = require("../config");
|
|
11
11
|
const os = require("os");
|
|
12
12
|
const get = require('lodash.get');
|
|
@@ -119,7 +119,7 @@ async function monitorDepTree(root, meta, scannedProject, pluginMeta, options, t
|
|
|
119
119
|
debug('scannedProject is missing depGraph or depTree, cannot run test/monitor');
|
|
120
120
|
return reject(new errors_1.FailedToRunTestError('Your monitor request could not be completed. Please email support@snyk.io'));
|
|
121
121
|
}
|
|
122
|
-
|
|
122
|
+
request_1.makeRequest({
|
|
123
123
|
body: {
|
|
124
124
|
meta: {
|
|
125
125
|
method: meta.method,
|
|
@@ -235,7 +235,7 @@ async function monitorDepGraph(root, meta, scannedProject, pluginMeta, options,
|
|
|
235
235
|
debug('scannedProject is missing depGraph or depTree, cannot run test/monitor');
|
|
236
236
|
return reject(new errors_1.FailedToRunTestError('Your monitor request could not be completed. Please email support@snyk.io'));
|
|
237
237
|
}
|
|
238
|
-
|
|
238
|
+
request_1.makeRequest({
|
|
239
239
|
body: {
|
|
240
240
|
meta: {
|
|
241
241
|
method: meta.method,
|
|
@@ -341,7 +341,7 @@ async function experimentalMonitorDepGraphFromDepTree(root, meta, scannedProject
|
|
|
341
341
|
debug('scannedProject is missing depGraph or depTree, cannot run test/monitor');
|
|
342
342
|
return reject(new errors_1.FailedToRunTestError('Your monitor request could not be completed. Please email support@snyk.io'));
|
|
343
343
|
}
|
|
344
|
-
|
|
344
|
+
request_1.makeRequest({
|
|
345
345
|
body: {
|
|
346
346
|
meta: {
|
|
347
347
|
method: meta.method,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/monitor/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/monitor/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.trackUsage = exports.getSastSettingsForOrg = void 0;
|
|
4
|
-
const
|
|
4
|
+
const request_1 = require("../../request");
|
|
5
5
|
const api_token_1 = require("../../api-token");
|
|
6
6
|
const config = require("../../config");
|
|
7
7
|
const common_1 = require("../../snyk-test/common");
|
|
8
8
|
async function getSastSettingsForOrg(org) {
|
|
9
|
-
const response = await
|
|
9
|
+
const response = await request_1.makeRequest({
|
|
10
10
|
method: 'GET',
|
|
11
11
|
headers: {
|
|
12
12
|
Authorization: `token ${api_token_1.api()}`,
|
|
@@ -20,7 +20,7 @@ async function getSastSettingsForOrg(org) {
|
|
|
20
20
|
}
|
|
21
21
|
exports.getSastSettingsForOrg = getSastSettingsForOrg;
|
|
22
22
|
async function trackUsage(org) {
|
|
23
|
-
const response = await
|
|
23
|
+
const response = await request_1.makeRequest({
|
|
24
24
|
method: 'POST',
|
|
25
25
|
headers: {
|
|
26
26
|
Authorization: `token ${api_token_1.api()}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checks.js","sourceRoot":"","sources":["../../../../src/lib/plugins/sast/checks.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"checks.js","sourceRoot":"","sources":["../../../../src/lib/plugins/sast/checks.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAE5C,+CAAqD;AACrD,uCAAuC;AACvC,mDAA6D;AAatD,KAAK,UAAU,qBAAqB,CAAC,GAAG;IAC7C,MAAM,QAAQ,GAAG,MAAM,qBAAW,CAAC;QACjC,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,aAAa,EAAE,SAAS,eAAW,EAAE,EAAE;SACxC;QACD,EAAE,EAAE,4BAAmB,CAAC,EAAE,GAAG,EAAE,CAAC;QAChC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,2BAA2B;QAC7C,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC,IAAoB,CAAC;AACvC,CAAC;AAbD,sDAaC;AAEM,KAAK,UAAU,UAAU,CAAC,GAAG;IAClC,MAAM,QAAQ,GAAG,MAAM,qBAAW,CAAC;QACjC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,SAAS,eAAW,EAAE,EAAE;SACxC;QACD,EAAE,EAAE,4BAAmB,CAAC,EAAE,GAAG,EAAE,CAAC;QAChC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,uBAAuB;QACzC,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC,IAA0B,CAAC;AAC7C,CAAC;AAbD,gCAaC"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
const fs = require("fs");
|
|
3
3
|
const analytics = require("../analytics");
|
|
4
4
|
const debugModule = require("debug");
|
|
5
|
-
const
|
|
5
|
+
const request_1 = require("../request");
|
|
6
6
|
const debug = debugModule('snyk:fetch-patch');
|
|
7
7
|
async function getPatchFile(patchUrl, patchFilename) {
|
|
8
8
|
try {
|
|
9
|
-
const response = await
|
|
9
|
+
const response = await request_1.makeRequest({ url: patchUrl });
|
|
10
10
|
if (!response ||
|
|
11
11
|
!response.res ||
|
|
12
12
|
!response.body ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-patch.js","sourceRoot":"","sources":["../../../src/lib/protect/fetch-patch.ts"],"names":[],"mappings":";AAAA,yBAAyB;AACzB,0CAA0C;AAC1C,qCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"fetch-patch.js","sourceRoot":"","sources":["../../../src/lib/protect/fetch-patch.ts"],"names":[],"mappings":";AAAA,yBAAyB;AACzB,0CAA0C;AAC1C,qCAAqC;AACrC,wCAAyC;AAEzC,MAAM,KAAK,GAAG,WAAW,CAAC,kBAAkB,CAAC,CAAC;AAE9C,KAAK,UAAU,YAAY,CACzB,QAAgB,EAChB,aAAqB;IAErB,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,qBAAW,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtD,IACE,CAAC,QAAQ;YACT,CAAC,QAAQ,CAAC,GAAG;YACb,CAAC,QAAQ,CAAC,IAAI;YACd,QAAQ,CAAC,GAAG,CAAC,UAAU,KAAK,GAAG,EAC/B;YACA,MAAM,QAAQ,CAAC;SAChB;QACD,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC/C,KAAK,CACH,sBAAsB,QAAQ,OAAO,aAAa,gBAAgB,QAAQ,CAAC,IAAI,CAAC,MAAM,QAAQ,CAC/F,CAAC;KACH;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,YAAY,GAAG,8BAA8B,QAAQ,OAAO,aAAa,EAAE,CAAC;QAClF,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QAC3B,SAAS,CAAC,GAAG,CAAC,kBAAkB,EAAE;YAChC,OAAO,EAAE,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,YAAY;YACjD,IAAI,EAAE,KAAK,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU;YAChD,aAAa;YACb,QAAQ;SACT,CAAC,CAAC;QACH,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;KAC/B;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,iBAAS,YAAY,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as needle from 'needle';
|
|
2
|
-
declare function
|
|
2
|
+
declare function makeRequestWrapper(payload: any): Promise<{
|
|
3
3
|
res: needle.NeedleResponse;
|
|
4
4
|
body: any;
|
|
5
5
|
}>;
|
|
6
|
-
declare function
|
|
7
|
-
export
|
|
6
|
+
declare function makeRequestWrapper(payload: any, callback: (err: Error | null, res?: any, body?: any) => void): Promise<void>;
|
|
7
|
+
export { makeRequestWrapper as makeRequest };
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.makeRequest = void 0;
|
|
4
|
+
const request_1 = require("./request");
|
|
3
5
|
const alerts = require("../alerts");
|
|
4
6
|
const metrics_1 = require("../metrics");
|
|
5
|
-
async function
|
|
7
|
+
async function makeRequestWrapper(payload, callback) {
|
|
6
8
|
const totalNetworkTimeTimer = metrics_1.MetricsCollector.NETWORK_TIME.createInstance();
|
|
7
9
|
totalNetworkTimeTimer.start();
|
|
8
10
|
try {
|
|
9
|
-
const result = await
|
|
11
|
+
const result = await request_1.makeRequest(payload);
|
|
10
12
|
if (result.body.alerts) {
|
|
11
13
|
alerts.registerAlerts(result.body.alerts);
|
|
12
14
|
}
|
|
@@ -26,5 +28,5 @@ async function requestWrapper(payload, callback) {
|
|
|
26
28
|
totalNetworkTimeTimer.stop();
|
|
27
29
|
}
|
|
28
30
|
}
|
|
29
|
-
|
|
31
|
+
exports.makeRequest = makeRequestWrapper;
|
|
30
32
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/request/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/request/index.ts"],"names":[],"mappings":";;;AAAA,uCAAwC;AACxC,oCAAqC;AACrC,wCAA8C;AAW9C,KAAK,UAAU,kBAAkB,CAC/B,OAAY,EACZ,QAAmD;IAEnD,MAAM,qBAAqB,GAAG,0BAAgB,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC;IAC7E,qBAAqB,CAAC,KAAK,EAAE,CAAC;IAC9B,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,qBAAW,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;YACtB,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC3C;QACD,mCAAmC;QACnC,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;SACzC;QACD,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;SACxB;QACD,MAAM,KAAK,CAAC;KACb;YAAS;QACR,qBAAqB,CAAC,IAAI,EAAE,CAAC;KAC9B;AACH,CAAC;AAE8B,yCAAW"}
|
|
@@ -4,7 +4,7 @@ exports.makeRequest = void 0;
|
|
|
4
4
|
const request = require("./index");
|
|
5
5
|
async function makeRequest(payload) {
|
|
6
6
|
return new Promise((resolve, reject) => {
|
|
7
|
-
request(payload, (error, res, body) => {
|
|
7
|
+
request.makeRequest(payload, (error, res, body) => {
|
|
8
8
|
if (error) {
|
|
9
9
|
return reject(error);
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../../src/lib/request/promise.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../../src/lib/request/promise.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAE5B,KAAK,UAAU,WAAW,CAAI,OAAY;IAC/C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAChD,IAAI,KAAK,EAAE;gBACT,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;aACtB;YACD,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;gBAC1B,OAAO,MAAM,CAAC;oBACZ,IAAI,EAAE,GAAG,CAAC,UAAU;oBACpB,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO;iBACvB,CAAC,CAAC;aACJ;YACD,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAfD,kCAeC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.makeRequest = void 0;
|
|
2
4
|
const debug_1 = require("debug");
|
|
3
5
|
const needle = require("needle");
|
|
4
6
|
const url_1 = require("url");
|
|
@@ -12,7 +14,7 @@ const https = require("https");
|
|
|
12
14
|
const http = require("http");
|
|
13
15
|
const debug = debug_1.debug('snyk:req');
|
|
14
16
|
const snykDebug = debug_1.debug('snyk');
|
|
15
|
-
|
|
17
|
+
async function makeRequest(payload) {
|
|
16
18
|
// This ensures we support lowercase http(s)_proxy values as well
|
|
17
19
|
// The weird IF around it ensures we don't create an envvar with a value of undefined, which throws error when trying to use it as a proxy
|
|
18
20
|
if (process.env.HTTP_PROXY || process.env.http_proxy) {
|
|
@@ -22,85 +24,86 @@ module.exports = function makeRequest(payload) {
|
|
|
22
24
|
process.env.HTTPS_PROXY =
|
|
23
25
|
process.env.HTTPS_PROXY || process.env.https_proxy;
|
|
24
26
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}
|
|
38
|
-
// always compress going upstream
|
|
39
|
-
data = zlib.gzipSync(json, { level: 9 });
|
|
40
|
-
snykDebug('sending request to:', payload.url);
|
|
41
|
-
snykDebug('request body size:', json.length);
|
|
42
|
-
snykDebug('gzipped request body size:', data.length);
|
|
43
|
-
let callGraphLength = null;
|
|
44
|
-
if (body.callGraph) {
|
|
45
|
-
callGraphLength = JSON.stringify(body.callGraph).length;
|
|
46
|
-
snykDebug('call graph size:', callGraphLength);
|
|
47
|
-
}
|
|
48
|
-
payload.headers['content-encoding'] = 'gzip';
|
|
49
|
-
payload.headers['content-length'] = data.length;
|
|
50
|
-
}
|
|
51
|
-
const parsedUrl = url_1.parse(payload.url);
|
|
52
|
-
if (parsedUrl.protocol === 'http:' &&
|
|
53
|
-
parsedUrl.hostname !== 'localhost' &&
|
|
54
|
-
process.env.SNYK_HTTP_PROTOCOL_UPGRADE !== '0') {
|
|
55
|
-
debug('forcing api request to https');
|
|
56
|
-
parsedUrl.protocol = 'https:';
|
|
57
|
-
payload.url = url_1.format(parsedUrl);
|
|
58
|
-
}
|
|
59
|
-
// prefer config timeout unless payload specified
|
|
60
|
-
if (!payload.hasOwnProperty('timeout')) {
|
|
61
|
-
payload.timeout = config.timeout * 1000; // s -> ms
|
|
62
|
-
}
|
|
63
|
-
try {
|
|
64
|
-
debug('request payload: ', JSON.stringify(payload));
|
|
65
|
-
}
|
|
66
|
-
catch (e) {
|
|
67
|
-
debug('request payload is too big to log', e);
|
|
68
|
-
}
|
|
69
|
-
const method = (payload.method || 'get').toLowerCase();
|
|
70
|
-
let url = payload.url;
|
|
71
|
-
if (payload.qs) {
|
|
72
|
-
// Parse the URL and append the search part - this will take care of adding the '/?' part if it's missing
|
|
73
|
-
const urlObject = new URL(url);
|
|
74
|
-
urlObject.search = querystring.stringify(payload.qs);
|
|
75
|
-
url = urlObject.toString();
|
|
76
|
-
delete payload.qs;
|
|
77
|
-
}
|
|
78
|
-
const agent = parsedUrl.protocol === 'http:'
|
|
79
|
-
? new http.Agent({ keepAlive: true })
|
|
80
|
-
: new https.Agent({ keepAlive: true });
|
|
81
|
-
const options = {
|
|
82
|
-
json: payload.json,
|
|
83
|
-
headers: payload.headers,
|
|
84
|
-
timeout: payload.timeout,
|
|
85
|
-
// eslint-disable-next-line @typescript-eslint/camelcase
|
|
86
|
-
follow_max: 5,
|
|
87
|
-
family: payload.family,
|
|
88
|
-
agent,
|
|
89
|
-
};
|
|
90
|
-
const proxyUri = proxy_from_env_1.getProxyForUrl(url);
|
|
91
|
-
if (proxyUri) {
|
|
92
|
-
snykDebug('using proxy:', proxyUri);
|
|
93
|
-
global_agent_1.bootstrap({
|
|
94
|
-
environmentVariableNamespace: '',
|
|
95
|
-
});
|
|
96
|
-
}
|
|
97
|
-
else {
|
|
98
|
-
snykDebug('not using proxy');
|
|
27
|
+
const versionNumber = await version_1.getVersion();
|
|
28
|
+
const body = payload.body;
|
|
29
|
+
let data;
|
|
30
|
+
delete payload.body;
|
|
31
|
+
if (!payload.headers) {
|
|
32
|
+
payload.headers = {};
|
|
33
|
+
}
|
|
34
|
+
payload.headers['x-snyk-cli-version'] = versionNumber;
|
|
35
|
+
if (body) {
|
|
36
|
+
const json = JSON.stringify(body);
|
|
37
|
+
if (json.length < 1e4) {
|
|
38
|
+
debug(JSON.stringify(body, null, 2));
|
|
99
39
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
40
|
+
// always compress going upstream
|
|
41
|
+
data = zlib.gzipSync(json, { level: 9 });
|
|
42
|
+
snykDebug('sending request to:', payload.url);
|
|
43
|
+
snykDebug('request body size:', json.length);
|
|
44
|
+
snykDebug('gzipped request body size:', data.length);
|
|
45
|
+
let callGraphLength = null;
|
|
46
|
+
if (body.callGraph) {
|
|
47
|
+
callGraphLength = JSON.stringify(body.callGraph).length;
|
|
48
|
+
snykDebug('call graph size:', callGraphLength);
|
|
103
49
|
}
|
|
50
|
+
payload.headers['content-encoding'] = 'gzip';
|
|
51
|
+
payload.headers['content-length'] = data.length;
|
|
52
|
+
}
|
|
53
|
+
const parsedUrl = url_1.parse(payload.url);
|
|
54
|
+
if (parsedUrl.protocol === 'http:' &&
|
|
55
|
+
parsedUrl.hostname !== 'localhost' &&
|
|
56
|
+
process.env.SNYK_HTTP_PROTOCOL_UPGRADE !== '0') {
|
|
57
|
+
debug('forcing api request to https');
|
|
58
|
+
parsedUrl.protocol = 'https:';
|
|
59
|
+
payload.url = url_1.format(parsedUrl);
|
|
60
|
+
}
|
|
61
|
+
// prefer config timeout unless payload specified
|
|
62
|
+
if (!payload.hasOwnProperty('timeout')) {
|
|
63
|
+
payload.timeout = config.timeout * 1000; // s -> ms
|
|
64
|
+
}
|
|
65
|
+
try {
|
|
66
|
+
debug('request payload: ', JSON.stringify(payload));
|
|
67
|
+
}
|
|
68
|
+
catch (e) {
|
|
69
|
+
debug('request payload is too big to log', e);
|
|
70
|
+
}
|
|
71
|
+
const method = (payload.method || 'get').toLowerCase();
|
|
72
|
+
let url = payload.url;
|
|
73
|
+
if (payload.qs) {
|
|
74
|
+
// Parse the URL and append the search part - this will take care of adding the '/?' part if it's missing
|
|
75
|
+
const urlObject = new URL(url);
|
|
76
|
+
urlObject.search = querystring.stringify(payload.qs);
|
|
77
|
+
url = urlObject.toString();
|
|
78
|
+
delete payload.qs;
|
|
79
|
+
}
|
|
80
|
+
const agent = parsedUrl.protocol === 'http:'
|
|
81
|
+
? new http.Agent({ keepAlive: true })
|
|
82
|
+
: new https.Agent({ keepAlive: true });
|
|
83
|
+
const options = {
|
|
84
|
+
json: payload.json,
|
|
85
|
+
headers: payload.headers,
|
|
86
|
+
timeout: payload.timeout,
|
|
87
|
+
// eslint-disable-next-line @typescript-eslint/camelcase
|
|
88
|
+
follow_max: 5,
|
|
89
|
+
family: payload.family,
|
|
90
|
+
agent,
|
|
91
|
+
};
|
|
92
|
+
const proxyUri = proxy_from_env_1.getProxyForUrl(url);
|
|
93
|
+
if (proxyUri) {
|
|
94
|
+
snykDebug('using proxy:', proxyUri);
|
|
95
|
+
global_agent_1.bootstrap({
|
|
96
|
+
environmentVariableNamespace: '',
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
snykDebug('not using proxy');
|
|
101
|
+
}
|
|
102
|
+
if (global.ignoreUnknownCA) {
|
|
103
|
+
debug('Using insecure mode (ignore unknown certificate authority)');
|
|
104
|
+
options.rejectUnauthorized = false;
|
|
105
|
+
}
|
|
106
|
+
return new Promise((resolve, reject) => {
|
|
104
107
|
needle.request(method, url, data, options, (err, res, respBody) => {
|
|
105
108
|
debug(err);
|
|
106
109
|
debug('response (%s): ', (res || {}).statusCode, JSON.stringify(respBody));
|
|
@@ -109,6 +112,7 @@ module.exports = function makeRequest(payload) {
|
|
|
109
112
|
}
|
|
110
113
|
resolve({ res, body: respBody });
|
|
111
114
|
});
|
|
112
|
-
})
|
|
113
|
-
}
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
exports.makeRequest = makeRequest;
|
|
114
118
|
//# sourceMappingURL=request.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/lib/request/request.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/lib/request/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as depGraphLib from '@snyk/dep-graph';
|
|
2
2
|
import { SupportedPackageManagers } from '../package-managers';
|
|
3
|
-
import { SupportedProjectTypes } from '../types';
|
|
3
|
+
import { Options, SupportedProjectTypes, TestOptions } from '../types';
|
|
4
4
|
interface Pkg {
|
|
5
5
|
name: string;
|
|
6
6
|
version?: string;
|
|
@@ -282,5 +282,5 @@ export interface RemediationChanges {
|
|
|
282
282
|
ignore: unknown;
|
|
283
283
|
pin: DependencyPins;
|
|
284
284
|
}
|
|
285
|
-
declare function convertTestDepGraphResultToLegacy(res: TestDepGraphResponse, depGraph: depGraphLib.DepGraph, packageManager: SupportedProjectTypes | undefined,
|
|
285
|
+
declare function convertTestDepGraphResultToLegacy(res: TestDepGraphResponse, depGraph: depGraphLib.DepGraph, packageManager: SupportedProjectTypes | undefined, options: Options & TestOptions): LegacyVulnApiResult;
|
|
286
286
|
export { convertTestDepGraphResultToLegacy, AnnotatedIssue };
|
|
@@ -17,7 +17,7 @@ var REACHABILITY;
|
|
|
17
17
|
REACHABILITY["NOT_REACHABLE"] = "not-reachable";
|
|
18
18
|
REACHABILITY["NO_INFO"] = "no-info";
|
|
19
19
|
})(REACHABILITY = exports.REACHABILITY || (exports.REACHABILITY = {}));
|
|
20
|
-
function convertTestDepGraphResultToLegacy(res, depGraph, packageManager,
|
|
20
|
+
function convertTestDepGraphResultToLegacy(res, depGraph, packageManager, options) {
|
|
21
21
|
const result = res.result;
|
|
22
22
|
const upgradePathsMap = new Map();
|
|
23
23
|
for (const pkgInfo of values(result.affectedPkgs)) {
|
|
@@ -33,7 +33,7 @@ function convertTestDepGraphResultToLegacy(res, depGraph, packageManager, severi
|
|
|
33
33
|
}
|
|
34
34
|
// generate the legacy vulns array (vuln-data + metada per vulnerable path).
|
|
35
35
|
// use the upgradePathsMap to find available upgrade-paths
|
|
36
|
-
|
|
36
|
+
let vulns = [];
|
|
37
37
|
for (const pkgInfo of values(result.affectedPkgs)) {
|
|
38
38
|
for (const vulnPkgPath of depGraph.pkgPathsToRoot(pkgInfo.pkg)) {
|
|
39
39
|
const legacyFromPath = pkgPathToLegacyPath(vulnPkgPath.reverse());
|
|
@@ -78,8 +78,12 @@ function convertTestDepGraphResultToLegacy(res, depGraph, packageManager, severi
|
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
const meta = res.meta || {};
|
|
81
|
-
severityThreshold =
|
|
82
|
-
|
|
81
|
+
const severityThreshold = options.severityThreshold === SEVERITY.LOW
|
|
82
|
+
? undefined
|
|
83
|
+
: options.severityThreshold;
|
|
84
|
+
if (options.docker && options.file && options['exclude-base-image-vulns']) {
|
|
85
|
+
vulns = vulns.filter((vuln) => vuln.dockerfileInstruction);
|
|
86
|
+
}
|
|
83
87
|
const legacyRes = {
|
|
84
88
|
vulnerabilities: vulns,
|
|
85
89
|
ok: vulns.length === 0,
|
|
@@ -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;AAIxC,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;AA8SD,SAAS,iCAAiC,CACxC,GAAyB,EACzB,QAA8B,EAC9B,cAAiD,EACjD,
|
|
1
|
+
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/lib/snyk-test/legacy.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ const error_format_1 = require("../error-format");
|
|
|
33
33
|
const api_token_1 = require("../api-token");
|
|
34
34
|
const ecosystems_1 = require("../ecosystems");
|
|
35
35
|
const assemble_payloads_1 = require("./assemble-payloads");
|
|
36
|
-
const
|
|
36
|
+
const request_1 = require("../request");
|
|
37
37
|
const spinner = require("../spinner");
|
|
38
38
|
const debug = debugModule('snyk:run-test');
|
|
39
39
|
const ANALYTICS_PAYLOAD_MAX_LENGTH = 1024;
|
|
@@ -225,7 +225,7 @@ async function parseRes(depGraph, pkgManager, res, options, payload, payloadPoli
|
|
|
225
225
|
// refactor to separate
|
|
226
226
|
if (depGraph && pkgManager) {
|
|
227
227
|
res = legacy_1.convertTestDepGraphResultToLegacy(res, // Double "as" required by Typescript for dodgy assertions
|
|
228
|
-
depGraph, pkgManager, options
|
|
228
|
+
depGraph, pkgManager, options);
|
|
229
229
|
// For Node.js: inject additional information (for remediation etc.) into the response.
|
|
230
230
|
if (payload.modules) {
|
|
231
231
|
res.dependencyCount =
|
|
@@ -270,9 +270,6 @@ async function parseRes(depGraph, pkgManager, res, options, payload, payloadPoli
|
|
|
270
270
|
return vuln;
|
|
271
271
|
});
|
|
272
272
|
}
|
|
273
|
-
if (options.docker && options.file && options['exclude-base-image-vulns']) {
|
|
274
|
-
res.vulnerabilities = res.vulnerabilities.filter((vuln) => vuln.dockerfileInstruction);
|
|
275
|
-
}
|
|
276
273
|
res.uniqueCount = countUniqueVulns(res.vulnerabilities);
|
|
277
274
|
return res;
|
|
278
275
|
}
|
|
@@ -281,7 +278,7 @@ function sendTestPayload(payload) {
|
|
|
281
278
|
const payloadBody = payload.body;
|
|
282
279
|
const filesystemPolicy = payload.body && !!((payloadBody === null || payloadBody === void 0 ? void 0 : payloadBody.policy) || ((_a = payloadBody === null || payloadBody === void 0 ? void 0 : payloadBody.scanResult) === null || _a === void 0 ? void 0 : _a.policy));
|
|
283
280
|
return new Promise((resolve, reject) => {
|
|
284
|
-
|
|
281
|
+
request_1.makeRequest(payload, (error, res, body) => {
|
|
285
282
|
if (error) {
|
|
286
283
|
return reject(error);
|
|
287
284
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-test.js","sourceRoot":"","sources":["../../../src/lib/snyk-test/run-test.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAClC,6BAA6B;AAC7B,iCAAiC;AACjC,qCAAqC;AACrC,iCAA0B;AAC1B,oCAAgC;AAChC,6CAAmE;AACnE,+CAA+C;AAE/C,uCAAuC;AAEvC,qCASkB;AAElB,sCAUmB;AACnB,4BAA4B;AAC5B,oCAAgC;AAChC,mCAAmC;AACnC,oCAAoC;AACpC,0CAA0C;AAC1C,8CAAsE;AAEtE,uDAAuD;AAQvD,oCAAsC;AACtC,0EAAoE;AAKpE,gFAA2E;AAC3E,gFAA0E;AAC1E,wDAAmE;AACnE,4DAAuD;AACvD,sCAA8C;AAC9C,iDAA8E;AAQ9E,oCAAoC;AACpC,kDAAsD;AACtD,4CAA6C;AAC7C,8CAA6C;AAE7C,2DAAgE;AAChE,sCAAuC;AACvC,sCAAuC;AAEvC,MAAM,KAAK,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;AAE3C,MAAM,4BAA4B,GAAG,IAAI,CAAC;AAE1C,SAAS,yBAAyB,CAChC,OAAgB,EAChB,QAAkC,EAClC,OAA8B;IAE9B,MAAM,SAAS,GAAG,yBAAY,CAAC,OAAO,CAAC,CAAC;IACxC,OAAO,SAAS;QACd,CAAC,CAAC,kCAAkC,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC;QAChE,CAAC,CAAC,kCAAkC,CAAC,OAAO,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,kCAAkC,CACzC,OAAgB,EAChB,QAAkC,EAClC,OAA8B;;IAE9B,MAAM,uBAAuB,GAAG,OAAO,CAAC,IAE3B,CAAC;IACd,MAAM,WAAW,GAAG,uBAAuB,aAAvB,uBAAuB,uBAAvB,uBAAuB,CAAE,UAAU,CAAC;IACxD,MAAM,YAAY,SAChB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,0CAAE,YAAY,CAAC;IACjC,MAAM,QAAQ,GACZ,YAAY,KAAK,SAAS;QACxB,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC;QAC1C,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,qBAAqB,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC,IAAI,CACnD,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,IAAI,KAAK,oBAAoB;QAClC,IAAI,CAAC,IAAI,KAAK,8BAA8B,CAC/C,CAAC;IAEF,MAAM,kBAAkB,SAAG,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,IAAI,0CAAE,kBAAkB,CAAC;IAC3E,MAAM,WAAW,GAAG,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,MAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,IAAI,CAAA,CAAC;IAChE,MAAM,cAAc,GAAG,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,0CAAE,IAA6B,CAAC;IAC5E,MAAM,UAAU,GAAG,OAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,0CAAE,UAAU,KAAI,OAAO,CAAC,IAAI,CAAC;IACrE,MAAM,QAAQ,eAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,0CAAE,IAAI,0CAAE,QAAQ,CAAC;IAEvD,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;IACtC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE5C,OAAO;QACL,QAAQ;QACR,kBAAkB;QAClB,WAAW;QACX,UAAU;QACV,UAAU,EAAE,cAAc;QAC1B,iBAAiB,EAAE,UAAU;QAC7B,iBAAiB,EAAE,SAAS;QAC5B,aAAa,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM;QAClC,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,SAAS,kCAAkC,CAAC,OAAgB;IAC1D,MAAM,WAAW,GAAG,OAAO,CAAC,IAA+B,CAAC;IAC5D,MAAM,aAAa,GAAG,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC;IACxD,MAAM,QAAQ,GAAG,WAAW,IAAI,WAAW,CAAC,QAAQ,CAAC;IACrD,MAAM,UAAU,GACd,QAAQ;QACR,QAAQ,CAAC,UAAU;QAClB,QAAQ,CAAC,UAAU,CAAC,IAA8B,CAAC;IACtD,MAAM,UAAU,GAAG,WAAW,IAAI,WAAW,CAAC,UAAU,CAAC;IACzD,MAAM,WAAW,GACf,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,mBAAmB,MAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,mBAAmB,CAAA,CAAC;IACvE,MAAM,iBAAiB,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,iBAAiB,CAAC;IACzD,MAAM,iBAAiB,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,iBAAiB,CAAC;IACzD,IAAI,kBAAkB,CAAC;IACvB,IACE,WAAW;QACX,WAAW,CAAC,MAAM;QAClB,WAAW,CAAC,MAAM,CAAC,kBAAkB,EACrC;QACA,kBAAkB,GAAG,WAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC;KAC5D;IACD,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;IACtC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACjE,OAAO;QACL,QAAQ;QACR,aAAa;QACb,UAAU;QACV,UAAU;QACV,WAAW;QACX,iBAAiB;QACjB,iBAAiB;QACjB,kBAAkB;KACnB,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CACjC,QAIuB;;IAEvB,MAAM,+BAA+B,GAAG,QAAoC,CAAC;IAC7E,OAAO,OAAA,+BAA+B,aAA/B,+BAA+B,uBAA/B,+BAA+B,CAAE,MAAM,0CAAE,MAAM,MAAK,SAAS,CAAC;AACvE,CAAC;AAED,SAAS,2BAA2B,CAClC,QAIuB;IAMvB,IAAI,CAAE,QAAgB,CAAC,MAAM,EAAE;QAC7B,OAAO,QAAQ,CAAC;KACjB;IAED,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAAE;QACzC,OAAO,QAAQ,CAAC;KACjB;IAED,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,yBAAyB,CACzD,QAAQ,CAAC,MAAM,CAAC,MAAM,CACvB,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAe;IAChD,MAAM,MAAM,GAAqB,EAAE,CAAC;IAEpC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,MAAM,SAAS,GAAG,GAAG,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;QAE/D,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE;YACnC,MAAM,CAAC,SAAS,CAAC,GAAG;gBAClB,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,UAAU,EAAE;gBACvD,MAAM,EAAE,EAAE;aACX,CAAC;SACH;QAED,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;KACjD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,QAAmB,EACnB,UAAkB,EAClB,IAAY,EACZ,OAA8B;IAE9B,8BAA8B;IAC9B,yEAAyE;IACzE,yEAAyE;IACzE,qHAAqH;IACrH,mFAAmF;IAEnF,IAAI,OAAO,CAAC,GAAG,EAAE;QACf,MAAM,aAAa,GAAG,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;QACvC,MAAM,UAAU,GAA0B,EAAE,CAAC;QAE7C,MAAM,OAAO,CAAC,KAAK,CAAO,UAAU,CAAC,EAAE,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YAClB,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;SAC3B;QACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,UAAU,CAAC,IAAI,CACb,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;gBACnB,MAAM,OAAO,GAAY,OAAO,CAAC,IAAe,CAAC;gBACjD,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC1C,MAAM,GAAG,GAAG,CAAC,MAAM,eAAe,CAAC,OAAO,CAAC,CAAoB,CAAC;gBAEhE,MAAM,WAAW,GACf,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;gBAC7D,OAAO,MAAM,iCAAkB,CAC7B,GAAG,EACH,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,sBAAsB,EAC9B,WAAW,EACX,OAAO,CAAC,iBAAiB,CAC1B,CAAC;YACJ,CAAC,CAAC,CACH,CAAC;SACH;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KAChC;IAED,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,MAAM,OAAO,CAAC,KAAK,CAAO,UAAU,CAAC,EAAE,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YAClB,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;SAC3B;QACD,kFAAkF;QAClF,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,EACJ,QAAQ,EACR,aAAa,EACb,UAAU,EACV,UAAU,EACV,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,QAAQ,GACT,GAAG,yBAAyB,CAC3B,WAAW,EACX,GAA+B,EAC/B,OAAO,CACR,CAAC;QAEF,MAAM,SAAS,GAAG,yBAAY,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC,EAAE;YACtC,MAAM,OAAO,CAAC,KAAK,CAAO,UAAU,CAAC,EAAE,CAAC;YACxC,MAAM,+BAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;SAC7C;QAED,MAAM,SAAS,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;QAEnD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAC3B,QAAQ,EACR,UAAU,EACV,SAAgC,EAChC,OAAO,EACP,OAAO,EACP,aAAa,EACb,IAAI,EACJ,kBAAkB,CACnB,CAAC;QAEF,OAAO,CAAC,IAAI,iCACP,MAAM,KACT,UAAU;YACV,WAAW;YACX,iBAAiB;YACjB,iBAAiB;YACjB,QAAQ,IACR,CAAC;KACJ;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAEM,KAAK,UAAU,OAAO,CAC3B,WAA8C,EAC9C,IAAY,EACZ,OAA8B;IAE9B,MAAM,UAAU,GAAG,sCAAsC,CAAC;IAC1D,IAAI;QACF,MAAM,mCAAe,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvD,OAAO,MAAM,mBAAmB,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;KACvE;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,4DAA4D;QAC5D,4BAA4B;QAC5B,MAAM,mBAAmB,GACvB,KAAK,CAAC,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAEtE,MAAM,6BAA6B,GACjC,KAAK,CAAC,IAAI,KAAK,GAAG;YAClB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,iCAAiC,CAAC;YACtD,CAAC,KAAK,CAAC,WAAW,CAAC;QAErB,IAAI,mBAAmB,EAAE;YACvB,MAAM,uCAA8B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;SAC9C;QACD,IAAI,6BAA6B,EAAE;YACjC,MAAM,gDAAuC,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;SACjE;QACD,IACE,yBAAY,CAAC,OAAO,CAAC,KAAK,QAAQ;YAClC,KAAK,CAAC,UAAU,KAAK,GAAG;YACxB;gBACE,yBAAyB;gBACzB,gDAAgD;aACjD,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EACzB;YACA,MAAM,IAAI,iCAAwB,CAAC,IAAI,CAAC,CAAC;SAC1C;QAED,MAAM,IAAI,6BAAoB,CAC5B,KAAK,CAAC,WAAW;YACf,KAAK,CAAC,OAAO;YACb,kBAAkB,WAAW,UAAU,EACzC,KAAK,CAAC,IAAI,CACX,CAAC;KACH;YAAS;QACR,OAAO,CAAC,KAAK,CAAO,UAAU,CAAC,EAAE,CAAC;KACnC;AACH,CAAC;AAhDD,0BAgDC;AAED,KAAK,UAAU,QAAQ,CACrB,QAA0C,EAC1C,UAA6C,EAC7C,GAAwB,EACxB,OAA8B,EAC9B,OAAgB,EAChB,aAAiC,EACjC,IAAY,EACZ,kBAAuB;IAEvB,8CAA8C;IAC9C,sCAAsC;IACtC,uBAAuB;IACvB,IAAI,QAAQ,IAAI,UAAU,EAAE;QAC1B,GAAG,GAAG,0CAAiC,CACpC,GAAmC,EAAE,0DAA0D;QAChG,QAAQ,EACR,UAAU,EACV,OAAO,CAAC,iBAAiB,CAC1B,CAAC;QACF,uFAAuF;QACvF,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,GAAG,CAAC,eAAe;gBACjB,OAAO,CAAC,OAAO,CAAC,eAAe,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;YACnE,IAAI,GAAG,CAAC,eAAe,EAAE;gBACvB,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACnC,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE;wBAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CACnC,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,OAAO,CACb,CAAC;wBACF,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;wBACrC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;wBACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;wBAE/B,+DAA+D;wBAC/D,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;4BAC1B,OAAO;yBACR;wBAED,MAAM,SAAS,GAAG,gCAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAClC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EACrB,SAAS,CAAC,IAAI,EACd,SAAS,CAAC,OAAO,CAClB,CAAC;wBACF,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;qBACrC;gBACH,CAAC,CAAC,CAAC;aACJ;SACF;KACF;IACD,4EAA4E;IAC5E,qFAAqF;IACrF,SAAS,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC9D,GAAG,CAAC,gBAAgB,GAAG,CAAC,CAAC,aAAa,CAAC;IACvC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;QAC7B,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,IAAK,aAAwB,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1D,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;KAChC;IACD,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAEnD,IAAI,GAAG,CAAC,MAAM,IAAI,kBAAkB,EAAE;QACpC,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACrD,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtE,IAAI,iBAAiB,EAAE;gBACpB,IAAoB,CAAC,qBAAqB;oBACzC,iBAAiB,CAAC,WAAW,CAAC;aACjC;YACA,IAAoB,CAAC,eAAe,GAAG,GAAG,CAAC,MAAO,CAAC,SAAS,CAAC;YAC9D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IACD,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,0BAA0B,CAAC,EAAE;QACzE,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC,MAAM,CAC9C,CAAC,IAAI,EAAE,EAAE,CAAE,IAAoB,CAAC,qBAAqB,CACtD,CAAC;KACH;IAED,GAAG,CAAC,WAAW,GAAG,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAExD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,eAAe,CACtB,OAAgB;;IAOhB,MAAM,WAAW,GAAG,OAAO,CAAC,IAAW,CAAC;IACxC,MAAM,gBAAgB,GACpB,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,YAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,0CAAE,MAAM,CAAA,CAAC,CAAC;IAC7E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACpC,IAAI,KAAK,EAAE;gBACT,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;aACtB;YACD,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;gBAC1B,MAAM,GAAG,GAAG,2BAA2B,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACnD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;aACpB;YAED,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,2BAA2B,CAAC,GAAG,EAAE,IAAI;IAC5C,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;IAC3B,IAAI,GAAG,CAAC;IACR,MAAM,WAAW,GAAG,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC;IAC7C,QAAQ,UAAU,EAAE;QAClB,KAAK,GAAG,CAAC;QACT,KAAK,GAAG;YACN,GAAG,GAAG,wBAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAC/C,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM;QACR,KAAK,GAAG;YACN,GAAG,GAAG,IAAI,sBAAa,CAAC,WAAW,CAAC,CAAC;YACrC,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM;QACR,KAAK,GAAG;YACN,GAAG,GAAG,IAAI,oCAA2B,CAAC,gBAAgB,CAAC,CAAC;YACxD,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM;QACR,KAAK,GAAG;YACN,GAAG,GAAG,IAAI,4BAAmB,CAAC,WAAW,CAAC,CAAC;YAC3C,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM;QACR;YACE,GAAG,GAAG,IAAI,wCAA+B,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YACnE,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;KAC/B;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,gBAAgB,CACvB,IAAY,EACZ,OAA8B;IAE9B,IAAI,OAAO,CAAC;IACZ,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,OAAO,GAAG,IAAI,CAAC;KAChB;SAAM;QACL,iFAAiF;QACjF,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;KAC/B;IACD,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAEhC,MAAM,SAAS,GAAG,yBAAY,CAAC,OAAO,CAAC,CAAC;IACxC,IAAI,SAAS,EAAE;QACb,OAAO,6CAAyB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;KACtD;IACD,IAAI,OAAO,EAAE;QACX,OAAO,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC7C;IACD,OAAO,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED,oFAAoF;AACpF,KAAK,UAAU,qBAAqB,CAClC,IAAI,EACJ,OAA8C;;IAE9C,qEAAqE;IACrE,IAAI,gBAAgB,GAAG,uBAAuB,CAAC;IAC/C,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,gBAAgB,GAAG,0BAA0B,CAAC;KAC/C;SAAM,IAAI,OAAO,CAAC,GAAG,EAAE;QACtB,gBAAgB,GAAG,4CAA4C,CAAC;KACjE;SAAM,IAAI,OAAO,CAAC,cAAc,EAAE;QACjC,gBAAgB,GAAG,OAAO,CAAC,cAAc,GAAG,oBAAoB,CAAC;KAClE;IAED,MAAM,UAAU,GACd,YAAY;QACZ,gBAAgB;QAChB,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC;IAE/C,IAAI;QACF,MAAM,QAAQ,GAAc,EAAE,CAAC;QAC/B,MAAM,OAAO,CAAC,KAAK,CAAO,UAAU,CAAC,EAAE,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YAClB,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;SAC3B;QACD,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,OAAO,uCAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChD;QACD,MAAM,IAAI,GAAG,MAAM,wCAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,aAAa,GAAI,IAAiC,CAAC,aAAa,CAAC;QACvE,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,EAAE;YACzB,MAAM,OAAO,CAAC,KAAK,CAAO,UAAU,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACnC,OAAO,CAAC,IAAI,CACV,eAAK,CAAC,IAAI,CAAC,GAAG,CACZ,GAAG,YAAI,CAAC,KAAK,IAAI,aAAa,CAAC,MAAM,IAAI,aAAa,CAAC,MAAM;oBAC3D,IAAI,CAAC,eAAe;yBACjB,MAAM,mFAAmF,CAC/F,CACF,CAAC;aACH;SACF;QACD,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,GAAG,CACrB,IAAI,CAAC,MAAM,EACX,oDAAoD,EACpD,IAAI,CACL,CAAC;QACF,MAAM,UAAU,GAAG,GAAG,CACpB,IAAI,CAAC,MAAM,EACX,mDAAmD,EACnD,IAAI,CACL,CAAC;QACF,MAAM,UAAU,GAAG,GAAG,CACpB,IAAI,CAAC,MAAM,EACX,mDAAmD,EACnD,IAAI,CACL,CAAC;QACF,IAAI,WAAW,EAAE;YACf,SAAS,CAAC,GAAG,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;SAC3C;QACD,IAAI,UAAU,EAAE;YACd,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;SACzC;QACD,IAAI,UAAU,EAAE;YACd,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;SACzC;QAED,KAAK,MAAM,cAAc,IAAI,IAAI,CAAC,eAAe,EAAE;YACjD,IAAI,CAAC,cAAc,CAAC,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;gBACvD,KAAK,CACH,wEAAwE,CACzE,CAAC;gBACF,MAAM,IAAI,6BAAoB,CAC5B,wEAAwE,CACzE,CAAC;aACH;YAED,wCAAwC;YACxC,sCAAsC;YACtC,MAAM,GAAG,GAGO,cAAc,CAAC,QAAQ;gBACrC,CAAC,CAAC,cAAc,CAAC,QAAQ;gBACzB,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC;YAE3B,IAAI,OAAO,CAAC,YAAY,CAAC,EAAE;gBACzB,IAAI,cAAc,CAAC,QAAQ,EAAE;oBAC3B,MAAM,OAAO,CAAC,KAAK,CAAO,UAAU,CAAC,EAAE,CAAC;oBACxC,+BAAkB,CAAC,OAAO,EAAE,GAA2B,CAAC,CAAC;iBAC1D;qBAAM;oBACL,MAAM,OAAO,CAAC,KAAK,CAAO,UAAU,CAAC,EAAE,CAAC;oBACxC,8BAAiB,CAAC,OAAO,EAAE,GAAc,CAAC,CAAC;iBAC5C;aACF;YACD,MAAM,OAAO,GAAG,cAAsC,CAAC;YACvD,MAAM,cAAc,GAAG,+CAAqB,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YAErE,IAAK,GAAe,CAAC,MAAM,EAAE;gBAC3B,MAAM,uBAAuB,GAAI,GAAe,CAAC,MAAM,CAAC,SAAS,CAAC;gBAClE,IAAI,CAAC,uBAAuB,IAAI,OAAO,CAAC,YAAY,CAAC,EAAE;oBACpD,GAAe,CAAC,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;iBAC3D;gBAED,IAAI,uBAAuB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;oBACrE,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;oBACpD,SAAS,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;iBACvD;aACF;YAED,0EAA0E;YAC1E,MAAM,UAAU,GACd,cAAc,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAEtE,gFAAgF;YAChF,MAAM,sBAAsB,GAAG,UAAU;gBACvC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC;gBACxE,CAAC,CAAC,EAAE,CAAC;YAEP,IAAI,aAAa,CAAC;YAElB,IAAI,sBAAsB,EAAE;gBAC1B,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;gBACnD,aAAa,GAAG,GAAG,CAAC;aACrB;YAED,MAAM,MAAM,GAAG,MAAM,0BAAiB,CACpC,IAAI,EACJ,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAe,EAC3C,OAAO;YACP,uEAAuE;YACvE,8CAA8C;YAC9C,GAAG,EACH,aAAa,CACd,CAAC;YAEF,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;YAChD,IAAI,cAAc,CAAC,QAAQ,EAAE;gBAC3B,MAAM,QAAQ,GAAG,GAA2B,CAAC;gBAC7C,mBAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAQ,CAAC,CAAC;aACvE;YACD,IAAI,cAAc,CAAC,OAAO,EAAE;gBAC1B,MAAM,OAAO,GAAG,GAAc,CAAC;gBAC/B,mBAAmB,CAAC,OAAO,CAAC,IAAK,EAAE,OAAO,CAAC,OAAQ,CAAC,CAAC;aACtD;YAED,IAAI,MAA0C,CAAC;YAC/C,IAAI,cAAc,CAAC,QAAQ,EAAE;gBAC3B,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;aACjE;iBAAM;gBACL,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,CACpC,cAAc,EACd,OAAO,EACP,GAAc,CACf,CAAC;aACH;YAED,MAAM,mBAAmB,GAAG,cAAc,CAAC,QAAQ;gBACjD,CAAC,CAAE,GAA4B,CAAC,OAAO,CAAC,IAAI;gBAC5C,CAAC,CAAE,GAAe,CAAC,IAAI,CAAC;YAE1B,IAAI,IAAI,GAAgB;gBACtB,qEAAqE;gBACrE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU;gBAErC,yEAAyE;gBACzE,sBAAsB,EAAE,GAAG,sBAAsB,EAAE;gBACnD,mBAAmB,EAAE,OAAO,CAAC,WAAW;gBACxC,mBAAmB;gBACnB,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;gBAC9C,iBAAiB,EAAE,MAAM,8CAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC;gBAClE,iBAAiB,EAAE,UAAU;gBAC7B,MAAM,EAAG,GAAe,CAAC,MAAM;gBAC/B,kBAAkB,EAAG,GAAW,CAAC,kBAAkB;gBACnD,MAAM;aACP,CAAC;YAEF,IAAI,OAAO,CAAC,YAAY,EAAE;gBACxB,qFAAqF;gBACrF,IAAI,mCAAQ,IAAI,GAAK,GAAG,CAAE,CAAC;aAC5B;iBAAM;gBACL,IAAI,QAA8B,CAAC;gBACnC,IAAI,cAAc,CAAC,QAAQ,EAAE;oBAC3B,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;iBACpC;qBAAM;oBACL,sDAAsD;oBACtD,yFAAyF;oBACzF,KAAK,CAAC,kCAAkC,EAAE;wBACxC,IAAI,EAAG,GAAe,CAAC,IAAI;wBAC3B,UAAU,EAAE,cAAc,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI;qBACtD,CAAC,CAAC;oBACH,QAAQ,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,cAAc,CAChD,GAAc,EACd,cAAe,CAChB,CAAC;oBACF,KAAK,CAAC,uCAAuC,EAAE;wBAC7C,eAAe,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM;qBAC3C,CAAC,CAAC;iBACJ;gBAED,MAAM,eAAe,GAAG,OAAO,CAAC,4BAA4B,CAAC;gBAE7D,IAAI,cAAc,EAAE;oBAClB,QAAQ,GAAG,MAAM,kBAAU,CACzB,QAAQ,EACR,cAAc,EACd,eAAe,CAChB,CAAC;iBACH;gBACD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;aAC1B;YAED,IACE,OAAO,CAAC,cAAc,WACrB,cAAc,CAAC,SAA4B,0CAAE,OAAO,CAAA,EACrD;gBACA,MAAM,GAAG,GAAG,cAAc,CAAC,SAA2B,CAAC;gBACvD,MAAM,cAAc,GAAG,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC;gBAC7C,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE;oBAC9B,SAAS,QAAE,cAAc,CAAC,WAAW,0CAAE,IAAI;oBAC3C,OAAO,EAAE,kCAAmB,CAC1B,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,EACjC,4BAA4B,CAC7B;iBACF,CAAC,CAAC;gBACH,MAAM,CAAC,cAAc,CAAC;oBACpB;wBACE,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,oBAAoB;wBAC1B,GAAG,EAAE,GAAG,CAAC,OAAO;qBACjB;iBACF,CAAC,CAAC;aACJ;iBAAM,IAAI,cAAc,CAAC,SAAS,EAAE;gBACnC,MAAM,EACJ,SAAS,EACT,SAAS,EACT,SAAS,GACV,GAAG,+CAA6B,CAC/B,cAAc,CAAC,SAAsB,CACtC,CAAC;gBACF,KAAK,CACH,6CAA6C,SAAS,iBAAiB,SAAS,EAAE,CACnF,CAAC;gBAEF,MAAM,gBAAgB,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,uBAAuB,EAAE,EAAE,CAAC,CAAC;gBACvE,SAAS,CAAC,GAAG,CAAC,kBAAkB,kBAC9B,kBAAkB,EAAE,SAAS,EAC7B,kBAAkB,EAAE,SAAS,IAC1B,gBAAgB,EACnB,CAAC;gBACH,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;aAC5B;YACD,MAAM,MAAM,GACV,MAAM,CAAC,GAAG;gBACV,CAAC,OAAO,CAAC,0BAA0B;oBACjC,OAAO,CAAC,YAAY;oBACpB,iBAAiB,CAAC,CAAC;YACvB,MAAM,OAAO,GAAY;gBACvB,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,MAAM;gBACX,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE;oBACP,SAAS,EAAE,YAAI,EAAE;oBACjB,aAAa,EAAE,yBAAa,EAAE;iBAC/B;gBACD,EAAE,EAAE,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBACvC,IAAI;aACL,CAAC;YAEF,IAAI,cAAc,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE;gBACpE,MAAM,eAAe,GACnB,UAAU;oBACV,CAAC,UAAU,CAAC,QAAQ,CAAC,mBAAmB,CAAC;wBACvC,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;gBACtC,IAAI,CAAC,eAAe,IAAI,OAAO,CAAC,mBAAmB,EAAE;oBACnD,OAAO,CAAC,OAAO,GAAG,GAA6B,CAAC,CAAC,iCAAiC;iBACnF;aACF;YACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;QACD,OAAO,QAAQ,CAAC;KACjB;YAAS;QACR,MAAM,OAAO,CAAC,KAAK,CAAO,UAAU,CAAC,EAAE,CAAC;KACzC;AACH,CAAC;AAED,iEAAiE;AACjE,KAAK,UAAU,sBAAsB,CAAC,IAAI,EAAE,OAAO;IACjD,MAAM,GAAG,GAAG,gCAAc,CAAC,IAAI,CAAC,CAAC;IACjC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;IAC1D,mBAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,WAAW,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;IACrE,oFAAoF;IACpF,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,YAAY;QAC9C,SAAS,OAAO,CAAC,cAAc,EAAE,IAAI,WAAW,EAAE,CAAC;IACrD,OAAO;QACL;YACE,MAAM,EAAE,KAAK;YACb,GAAG;YACH,EAAE,EAAE,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACvC,IAAI,EAAE,IAAI;YACV,OAAO,EAAE;gBACP,SAAS,EAAE,YAAI,EAAE;gBACjB,aAAa,EAAE,QAAQ,GAAG,IAAI,CAAC,GAAG;aACnC;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAY,EAAE,OAAe;IACxD,SAAS,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IACnC,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACzC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,GAAG,GAAG,GAAG,OAAO,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAuB;IAC/C,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;KACtB;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;AAClC,CAAC"}
|
|
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,11 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "snyk",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.673.0",
|
|
4
4
|
"description": "snyk library and cli utility",
|
|
5
5
|
"main": "dist/lib/index.js",
|
|
6
6
|
"files": [
|
|
7
7
|
"help",
|
|
8
8
|
"dist",
|
|
9
|
+
"bin",
|
|
9
10
|
"config.default.json",
|
|
10
11
|
"SECURITY.md",
|
|
11
12
|
"LICENSE",
|
|
@@ -18,7 +19,7 @@
|
|
|
18
19
|
"doc": "help/commands-help"
|
|
19
20
|
},
|
|
20
21
|
"bin": {
|
|
21
|
-
"snyk": "
|
|
22
|
+
"snyk": "bin/snyk"
|
|
22
23
|
},
|
|
23
24
|
"engines": {
|
|
24
25
|
"node": ">=10"
|
|
@@ -114,6 +115,7 @@
|
|
|
114
115
|
"open": "^7.0.3",
|
|
115
116
|
"ora": "5.4.0",
|
|
116
117
|
"os-name": "^3.0.0",
|
|
118
|
+
"pegjs": "^0.10.0",
|
|
117
119
|
"promise-queue": "^2.2.5",
|
|
118
120
|
"proxy-from-env": "^1.0.0",
|
|
119
121
|
"rimraf": "^2.6.3",
|
|
@@ -136,7 +138,7 @@
|
|
|
136
138
|
"snyk-try-require": "1.3.1",
|
|
137
139
|
"source-map-support": "^0.5.11",
|
|
138
140
|
"strip-ansi": "^5.2.0",
|
|
139
|
-
"tar": "^6.1.
|
|
141
|
+
"tar": "^6.1.2",
|
|
140
142
|
"tempy": "^1.0.1",
|
|
141
143
|
"update-notifier": "^5.1.0",
|
|
142
144
|
"uuid": "^8.3.2",
|
|
@@ -186,7 +188,8 @@
|
|
|
186
188
|
},
|
|
187
189
|
"pkg": {
|
|
188
190
|
"scripts": [
|
|
189
|
-
"dist/**/*.js"
|
|
191
|
+
"dist/**/*.js",
|
|
192
|
+
"bin/snyk"
|
|
190
193
|
],
|
|
191
194
|
"assets": [
|
|
192
195
|
"config.default.json",
|
|
@@ -200,5 +203,5 @@
|
|
|
200
203
|
"registry": "https://registry.npmjs.org/",
|
|
201
204
|
"access": "public"
|
|
202
205
|
},
|
|
203
|
-
"gitHead": "
|
|
206
|
+
"gitHead": "9fe5704b9cc1186b906da1075b3e6603f7904ea1"
|
|
204
207
|
}
|