snyk 1.665.0 → 1.669.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/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/extract-line-number.d.ts +1 -2
- package/dist/cli/commands/test/iac-local-execution/extract-line-number.js +2 -2
- package/dist/cli/commands/test/iac-local-execution/extract-line-number.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/results-formatter.js +13 -17
- package/dist/cli/commands/test/iac-local-execution/results-formatter.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/lib/{analytics.d.ts → analytics/index.d.ts} +0 -0
- package/dist/lib/{analytics.js → analytics/index.js} +18 -22
- package/dist/lib/analytics/index.js.map +1 -0
- package/dist/lib/{analytics-sources.d.ts → analytics/sources.d.ts} +1 -1
- package/dist/lib/{analytics-sources.js → analytics/sources.js} +1 -1
- package/dist/lib/analytics/sources.js.map +1 -0
- package/dist/lib/protect/apply-patch.js +2 -2
- package/dist/lib/protect/apply-patch.js.map +1 -1
- package/dist/lib/query-strings.js +3 -3
- package/dist/lib/query-strings.js.map +1 -1
- package/dist/lib/request/request.js +0 -8
- package/dist/lib/request/request.js.map +1 -1
- package/help/README.md +4 -4
- package/package.json +6 -5
- package/dist/lib/analytics-sources.js.map +0 -1
- package/dist/lib/analytics.js.map +0 -1
|
@@ -8,6 +8,7 @@ export declare enum PerformanceAnalyticsKey {
|
|
|
8
8
|
OrgSettings = "org-settings-ms",
|
|
9
9
|
CustomSeverities = "custom-severities-ms",
|
|
10
10
|
ResultFormatting = "results-formatting-ms",
|
|
11
|
+
UsageTracking = "usage-tracking-ms",
|
|
11
12
|
CacheCleanup = "cache-cleanup-ms",
|
|
12
13
|
Total = "total-iac-ms"
|
|
13
14
|
}
|
|
@@ -34,6 +34,7 @@ var PerformanceAnalyticsKey;
|
|
|
34
34
|
PerformanceAnalyticsKey["OrgSettings"] = "org-settings-ms";
|
|
35
35
|
PerformanceAnalyticsKey["CustomSeverities"] = "custom-severities-ms";
|
|
36
36
|
PerformanceAnalyticsKey["ResultFormatting"] = "results-formatting-ms";
|
|
37
|
+
PerformanceAnalyticsKey["UsageTracking"] = "usage-tracking-ms";
|
|
37
38
|
PerformanceAnalyticsKey["CacheCleanup"] = "cache-cleanup-ms";
|
|
38
39
|
PerformanceAnalyticsKey["Total"] = "total-iac-ms";
|
|
39
40
|
})(PerformanceAnalyticsKey = exports.PerformanceAnalyticsKey || (exports.PerformanceAnalyticsKey = {}));
|
|
@@ -45,6 +46,7 @@ exports.performanceAnalyticsObject = {
|
|
|
45
46
|
[PerformanceAnalyticsKey.OrgSettings]: null,
|
|
46
47
|
[PerformanceAnalyticsKey.CustomSeverities]: null,
|
|
47
48
|
[PerformanceAnalyticsKey.ResultFormatting]: null,
|
|
49
|
+
[PerformanceAnalyticsKey.UsageTracking]: null,
|
|
48
50
|
[PerformanceAnalyticsKey.CacheCleanup]: null,
|
|
49
51
|
[PerformanceAnalyticsKey.Total]: null,
|
|
50
52
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/analytics.ts"],"names":[],"mappings":";;;AACA,uDAAuD;AAEvD,SAAgB,eAAe,CAAC,gBAAmC;IACjE,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,MAAM,YAAY,GAA2B,EAAE,CAAC;IAChD,MAAM,eAAe,GAAG,KAAK,EAAU,CAAC;IAExC,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/B,gBAAgB;YACd,CAAC,gBAAgB,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC;QACjE,MAAM,oBAAoB,GAAG,GAAG,CAAC,cAAc,CAAC;QAChD,eAAe,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAE3C,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YAC/C,YAAY,CAAC,oBAAoB,CAAC,SAChC,YAAY,CAAC,oBAAoB,CAAC,mCAAI,EAAE,CAAC;YAC3C,YAAY,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACjD,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACtE,SAAS,CAAC,GAAG,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;IACpD,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACxC,SAAS,CAAC,GAAG,CAAC,aAAa,EAAE,kCAA0B,CAAC,CAAC;IACzD,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAC3D,CAAC;AAxBD,0CAwBC;AAED,IAAY,
|
|
1
|
+
{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/analytics.ts"],"names":[],"mappings":";;;AACA,uDAAuD;AAEvD,SAAgB,eAAe,CAAC,gBAAmC;IACjE,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,MAAM,YAAY,GAA2B,EAAE,CAAC;IAChD,MAAM,eAAe,GAAG,KAAK,EAAU,CAAC;IAExC,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/B,gBAAgB;YACd,CAAC,gBAAgB,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC;QACjE,MAAM,oBAAoB,GAAG,GAAG,CAAC,cAAc,CAAC;QAChD,eAAe,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAE3C,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YAC/C,YAAY,CAAC,oBAAoB,CAAC,SAChC,YAAY,CAAC,oBAAoB,CAAC,mCAAI,EAAE,CAAC;YAC3C,YAAY,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACjD,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACtE,SAAS,CAAC,GAAG,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;IACpD,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACxC,SAAS,CAAC,GAAG,CAAC,aAAa,EAAE,kCAA0B,CAAC,CAAC;IACzD,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAC3D,CAAC;AAxBD,0CAwBC;AAED,IAAY,uBAWX;AAXD,WAAY,uBAAuB;IACjC,2DAAgC,CAAA;IAChC,0DAA+B,CAAA;IAC/B,0DAA+B,CAAA;IAC/B,4DAAiC,CAAA;IACjC,0DAA+B,CAAA;IAC/B,oEAAyC,CAAA;IACzC,qEAA0C,CAAA;IAC1C,8DAAmC,CAAA;IACnC,4DAAiC,CAAA;IACjC,iDAAsB,CAAA;AACxB,CAAC,EAXW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAWlC;AAEY,QAAA,0BAA0B,GAGnC;IACF,CAAC,uBAAuB,CAAC,cAAc,CAAC,EAAE,IAAI;IAC9C,CAAC,uBAAuB,CAAC,WAAW,CAAC,EAAE,IAAI;IAC3C,CAAC,uBAAuB,CAAC,WAAW,CAAC,EAAE,IAAI;IAC3C,CAAC,uBAAuB,CAAC,YAAY,CAAC,EAAE,IAAI;IAC5C,CAAC,uBAAuB,CAAC,WAAW,CAAC,EAAE,IAAI;IAC3C,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,EAAE,IAAI;IAChD,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,EAAE,IAAI;IAChD,CAAC,uBAAuB,CAAC,aAAa,CAAC,EAAE,IAAI;IAC7C,CAAC,uBAAuB,CAAC,YAAY,CAAC,EAAE,IAAI;IAC5C,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE,IAAI;CACtC,CAAC"}
|
|
@@ -1,2 +1 @@
|
|
|
1
|
-
|
|
2
|
-
export declare function extractLineNumber(scanResult: IacFileScanResult, policy: PolicyMetadata): number;
|
|
1
|
+
export declare function extractLineNumber(fileContent: string, fileType: string, cloudConfigPath: string[]): number;
|
|
@@ -22,9 +22,9 @@ function getFileTypeForLineNumber(fileType) {
|
|
|
22
22
|
throw new file_parser_1.UnsupportedFileTypeError(fileType);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
function extractLineNumber(
|
|
25
|
+
function extractLineNumber(fileContent, fileType, cloudConfigPath) {
|
|
26
26
|
try {
|
|
27
|
-
return cloud_config_parser_1.issuesToLineNumbers(
|
|
27
|
+
return cloud_config_parser_1.issuesToLineNumbers(fileContent, getFileTypeForLineNumber(fileType), cloudConfigPath);
|
|
28
28
|
}
|
|
29
29
|
catch (_a) {
|
|
30
30
|
const err = new FailedToExtractLineNumberError();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-line-number.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/extract-line-number.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"extract-line-number.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/extract-line-number.ts"],"names":[],"mappings":";;;AAAA,mCAAwC;AACxC,mDAAqD;AACrD,mEAGmC;AACnC,+CAAyD;AACzD,uDAAuD;AACvD,+BAA+B;AAC/B,+CAAmD;AACnD,MAAM,KAAK,GAAG,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAE/C,SAAS,wBAAwB,CAAC,QAAgB;IAChD,QAAQ,QAAQ,EAAE;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK;YACR,OAAO,0CAAoB,CAAC,IAAI,CAAC;QACnC,KAAK,MAAM;YACT,OAAO,0CAAoB,CAAC,IAAI,CAAC;QACnC,KAAK,IAAI;YACP,OAAO,0CAAoB,CAAC,EAAE,CAAC;QACjC;YACE,MAAM,IAAI,sCAAwB,CAAC,QAAQ,CAAC,CAAC;KAChD;AACH,CAAC;AAED,SAAgB,iBAAiB,CAC/B,WAAmB,EACnB,QAAgB,EAChB,eAAyB;IAEzB,IAAI;QACF,OAAO,yCAAmB,CACxB,WAAW,EACX,wBAAwB,CAAC,QAAQ,CAAC,EAClC,eAAe,CAChB,CAAC;KACH;IAAC,WAAM;QACN,MAAM,GAAG,GAAG,IAAI,8BAA8B,EAAE,CAAC;QACjD,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACrE,OAAO,CAAC,CAAC,CAAC;KACX;AACH,CAAC;AAjBD,8CAiBC;AAED,MAAM,8BAA+B,SAAQ,oBAAW;IACtD,YAAY,OAAgB;QAC1B,KAAK,CACH,OAAO,IAAI,6DAA6D,CACzE,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,qBAAa,CAAC,8BAA8B,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,gCAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC,2BAA2B;IACpD,CAAC;CACF"}
|
|
@@ -4,6 +4,7 @@ exports.removeFileContent = exports.test = void 0;
|
|
|
4
4
|
const detect_1 = require("../../../../lib/detect");
|
|
5
5
|
const types_1 = require("./types");
|
|
6
6
|
const analytics_1 = require("./analytics");
|
|
7
|
+
const usage_tracking_1 = require("./usage-tracking");
|
|
7
8
|
const measurable_methods_1 = require("./measurable-methods");
|
|
8
9
|
const feature_flags_1 = require("../../../../lib/feature-flags");
|
|
9
10
|
const assert_iac_options_flag_1 = require("./assert-iac-options-flag");
|
|
@@ -26,6 +27,16 @@ async function test(pathToScan, options) {
|
|
|
26
27
|
const scannedFiles = await measurable_methods_1.scanFiles(parsedFiles);
|
|
27
28
|
const resultsWithCustomSeverities = await measurable_methods_1.applyCustomSeverities(scannedFiles, iacOrgSettings.customPolicies);
|
|
28
29
|
const formattedResults = measurable_methods_1.formatScanResults(resultsWithCustomSeverities, options, iacOrgSettings.meta);
|
|
30
|
+
try {
|
|
31
|
+
await measurable_methods_1.trackUsage(formattedResults);
|
|
32
|
+
}
|
|
33
|
+
catch (e) {
|
|
34
|
+
if (e instanceof usage_tracking_1.TestLimitReachedError) {
|
|
35
|
+
throw e;
|
|
36
|
+
}
|
|
37
|
+
// If something has gone wrong, err on the side of allowing the user to
|
|
38
|
+
// run their tests by squashing the error.
|
|
39
|
+
}
|
|
29
40
|
analytics_1.addIacAnalytics(formattedResults);
|
|
30
41
|
// TODO: add support for proper typing of old TestResult interface.
|
|
31
42
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/index.ts"],"names":[],"mappings":";;;AAAA,mDAAuD;AACvD,mCAOiB;AACjB,2CAA8C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/index.ts"],"names":[],"mappings":";;;AAAA,mDAAuD;AACvD,mCAOiB;AACjB,2CAA8C;AAC9C,qDAAyD;AAEzD,6DAU8B;AAC9B,iEAA6E;AAC7E,uEAAsD;AACtD,iDAAkD;AAElD,8GAA8G;AAC9G,qDAAqD;AAC9C,KAAK,UAAU,IAAI,CACxB,UAAkB,EAClB,OAAqB;;IAErB,IAAI;QACF,MAAM,GAAG,SAAG,OAAO,CAAC,GAAG,mCAAI,MAAM,CAAC,GAAG,CAAC;QACtC,MAAM,cAAc,GAAG,MAAM,sCAAiB,CAAC,GAAG,CAAC,CAAC;QACpD,MAAM,eAAe,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAExE,MAAM,mCAAc,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;QAE1C,MAAM,YAAY,GAAG,MAAM,8BAAS,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC1D,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,MAAM,+BAAU,CACnD,YAAY,EACZ,OAAO,CACR,CAAC;QAEF,kEAAkE;QAClE,IAAI,eAAe,EAAE;YACnB,WAAW,CAAC,IAAI,CACd,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iCACxB,IAAI,KACP,UAAU,EAAE,kBAAU,CAAC,MAAM,IAC7B,CAAC,CACJ,CAAC;SACH;QAED,MAAM,YAAY,GAAG,MAAM,8BAAS,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,2BAA2B,GAAG,MAAM,0CAAqB,CAC7D,YAAY,EACZ,cAAc,CAAC,cAAc,CAC9B,CAAC;QACF,MAAM,gBAAgB,GAAG,sCAAiB,CACxC,2BAA2B,EAC3B,OAAO,EACP,cAAc,CAAC,IAAI,CACpB,CAAC;QAEF,IAAI;YACF,MAAM,+BAAU,CAAC,gBAAgB,CAAC,CAAC;SACpC;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,YAAY,sCAAqB,EAAE;gBACtC,MAAM,CAAC,CAAC;aACT;YACD,uEAAuE;YACvE,0CAA0C;SAC3C;QAED,2BAAe,CAAC,gBAAgB,CAAC,CAAC;QAElC,mEAAmE;QACnE,OAAO;YACL,OAAO,EAAG,gBAA4C;YACtD,gEAAgE;YAChE,QAAQ,EAAE,sBAAa,CAAC,UAAU,CAAC;gBACjC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC;gBACpC,CAAC,CAAC,SAAS;SACd,CAAC;KACH;YAAS;QACR,oCAAe,EAAE,CAAC;KACnB;AACH,CAAC;AA7DD,oBA6DC;AAED,KAAK,UAAU,qBAAqB,CAClC,eAAmC,EACnC,WAAmB;IAEnB,IAAI,CAAC,eAAe;QAAE,OAAO;IAE7B,MAAM,sBAAsB,GAC1B,CAAC,MAAM,4CAA4B,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE;QACtE,IAAI,CAAC;IACP,IAAI,sBAAsB,EAAE;QAC1B,OAAO,eAAe,CAAC;KACxB;IAED,MAAM,IAAI,mCAAS,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC;AAED,SAAgB,iBAAiB,CAAC,EAChC,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,WAAW,GACyB;IACpC,OAAO;QACL,QAAQ;QACR,QAAQ;QACR,aAAa;QACb,WAAW;KACZ,CAAC;AACJ,CAAC;AAZD,8CAYC"}
|
|
@@ -14,5 +14,6 @@ declare const measurableApplyCustomSeverities: (scannedFiles: import("./types").
|
|
|
14
14
|
}>) => Promise<import("./types").IacFileScanResult[]>;
|
|
15
15
|
declare const measurableCleanLocalCache: () => void;
|
|
16
16
|
declare const measurableFormatScanResults: (scanResults: import("./types").IacFileScanResult[], options: import("./types").IaCTestFlags, meta: import("./types").TestMeta) => import("./types").FormattedResult[];
|
|
17
|
+
declare const measurableTrackUsage: (formattedResults: import("./usage-tracking").TrackableResult[]) => Promise<void>;
|
|
17
18
|
declare const measurableLocalTest: (pathToScan: string, options: import("./types").IaCTestFlags) => Promise<import("./types").TestReturnValue>;
|
|
18
|
-
export { measurableInitLocalCache as initLocalCache, measurableLoadFiles as loadFiles, measurableParseFiles as parseFiles, measurableScanFiles as scanFiles, measurableGetIacOrgSettings as getIacOrgSettings, measurableApplyCustomSeverities as applyCustomSeverities, measurableFormatScanResults as formatScanResults, measurableCleanLocalCache as cleanLocalCache, measurableLocalTest as localTest, };
|
|
19
|
+
export { measurableInitLocalCache as initLocalCache, measurableLoadFiles as loadFiles, measurableParseFiles as parseFiles, measurableScanFiles as scanFiles, measurableGetIacOrgSettings as getIacOrgSettings, measurableApplyCustomSeverities as applyCustomSeverities, measurableFormatScanResults as formatScanResults, measurableTrackUsage as trackUsage, measurableCleanLocalCache as cleanLocalCache, measurableLocalTest as localTest, };
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.localTest = exports.cleanLocalCache = exports.formatScanResults = exports.applyCustomSeverities = exports.getIacOrgSettings = exports.scanFiles = exports.parseFiles = exports.loadFiles = exports.initLocalCache = exports.performanceAnalyticsDecorator = exports.asyncPerformanceAnalyticsDecorator = void 0;
|
|
3
|
+
exports.localTest = exports.cleanLocalCache = exports.trackUsage = exports.formatScanResults = exports.applyCustomSeverities = exports.getIacOrgSettings = exports.scanFiles = exports.parseFiles = exports.loadFiles = exports.initLocalCache = exports.performanceAnalyticsDecorator = exports.asyncPerformanceAnalyticsDecorator = void 0;
|
|
4
4
|
const file_loader_1 = require("./file-loader");
|
|
5
5
|
const file_parser_1 = require("./file-parser");
|
|
6
6
|
const file_scanner_1 = require("./file-scanner");
|
|
7
7
|
const results_formatter_1 = require("./results-formatter");
|
|
8
|
+
const usage_tracking_1 = require("./usage-tracking");
|
|
8
9
|
const local_cache_1 = require("./local-cache");
|
|
9
10
|
const apply_custom_severities_1 = require("./org-settings/apply-custom-severities");
|
|
10
11
|
const get_iac_org_settings_1 = require("./org-settings/get-iac-org-settings");
|
|
@@ -49,6 +50,8 @@ const measurableCleanLocalCache = performanceAnalyticsDecorator(local_cache_1.cl
|
|
|
49
50
|
exports.cleanLocalCache = measurableCleanLocalCache;
|
|
50
51
|
const measurableFormatScanResults = performanceAnalyticsDecorator(results_formatter_1.formatScanResults, analytics_1.PerformanceAnalyticsKey.ResultFormatting);
|
|
51
52
|
exports.formatScanResults = measurableFormatScanResults;
|
|
53
|
+
const measurableTrackUsage = asyncPerformanceAnalyticsDecorator(usage_tracking_1.trackUsage, analytics_1.PerformanceAnalyticsKey.UsageTracking);
|
|
54
|
+
exports.trackUsage = measurableTrackUsage;
|
|
52
55
|
const measurableLocalTest = asyncPerformanceAnalyticsDecorator(index_1.test, analytics_1.PerformanceAnalyticsKey.Total);
|
|
53
56
|
exports.localTest = measurableLocalTest;
|
|
54
57
|
//# sourceMappingURL=measurable-methods.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"measurable-methods.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/measurable-methods.ts"],"names":[],"mappings":";;;AAAA,+CAA0C;AAC1C,+CAA2C;AAC3C,iDAA2C;AAC3C,2DAAwD;AACxD,+CAAgE;AAChE,oFAA+E;AAC/E,8EAAwE;AACxE,mCAA+B;AAC/B,2CAGqB;AAKrB,oFAAoF;AACpF,mEAAmE;AACnE,wEAAwE;AACxE,SAAgB,kCAAkC,CAGhD,gBAAmB,EACnB,YAAqC;IAErC,OAAO,KAAK,WAAU,GAAG,IAAI;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,GAAG,IAAI,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAC1C,sCAA0B,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC;QACtD,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AAbD,gFAaC;AAED,SAAgB,6BAA6B,CAG3C,gBAAmB,EACnB,YAAqC;IAErC,OAAO,UAAS,GAAG,IAAI;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,gBAAgB,CAAC,GAAG,IAAI,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAC1C,sCAA0B,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC;QACtD,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AAbD,sEAaC;AAED,MAAM,wBAAwB,GAAG,kCAAkC,CACjE,4BAAc,EACd,mCAAuB,CAAC,cAAc,CACvC,CAAC;
|
|
1
|
+
{"version":3,"file":"measurable-methods.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/measurable-methods.ts"],"names":[],"mappings":";;;AAAA,+CAA0C;AAC1C,+CAA2C;AAC3C,iDAA2C;AAC3C,2DAAwD;AACxD,qDAA8C;AAC9C,+CAAgE;AAChE,oFAA+E;AAC/E,8EAAwE;AACxE,mCAA+B;AAC/B,2CAGqB;AAKrB,oFAAoF;AACpF,mEAAmE;AACnE,wEAAwE;AACxE,SAAgB,kCAAkC,CAGhD,gBAAmB,EACnB,YAAqC;IAErC,OAAO,KAAK,WAAU,GAAG,IAAI;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,GAAG,IAAI,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAC1C,sCAA0B,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC;QACtD,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AAbD,gFAaC;AAED,SAAgB,6BAA6B,CAG3C,gBAAmB,EACnB,YAAqC;IAErC,OAAO,UAAS,GAAG,IAAI;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,gBAAgB,CAAC,GAAG,IAAI,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAC1C,sCAA0B,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC;QACtD,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AAbD,sEAaC;AAED,MAAM,wBAAwB,GAAG,kCAAkC,CACjE,4BAAc,EACd,mCAAuB,CAAC,cAAc,CACvC,CAAC;AAgD4B,kDAAc;AA9C5C,MAAM,mBAAmB,GAAG,kCAAkC,CAC5D,uBAAS,EACT,mCAAuB,CAAC,WAAW,CACpC,CAAC;AA4CuB,wCAAS;AA1ClC,MAAM,oBAAoB,GAAG,kCAAkC,CAC7D,wBAAU,EACV,mCAAuB,CAAC,WAAW,CACpC,CAAC;AAwCwB,0CAAU;AAtCpC,MAAM,mBAAmB,GAAG,kCAAkC,CAC5D,wBAAS,EACT,mCAAuB,CAAC,YAAY,CACrC,CAAC;AAoCuB,wCAAS;AAlClC,MAAM,2BAA2B,GAAG,kCAAkC,CACpE,wCAAiB,EACjB,mCAAuB,CAAC,WAAW,CACpC,CAAC;AAgC+B,wDAAiB;AA9BlD,MAAM,+BAA+B,GAAG,kCAAkC,CACxE,+CAAqB,EACrB,mCAAuB,CAAC,gBAAgB,CACzC,CAAC;AA4BmC,gEAAqB;AA1B1D,MAAM,yBAAyB,GAAG,6BAA6B,CAC7D,6BAAe,EACf,mCAAuB,CAAC,YAAY,CACrC,CAAC;AA0B6B,oDAAe;AAxB9C,MAAM,2BAA2B,GAAG,6BAA6B,CAC/D,qCAAiB,EACjB,mCAAuB,CAAC,gBAAgB,CACzC,CAAC;AAmB+B,wDAAiB;AAjBlD,MAAM,oBAAoB,GAAG,kCAAkC,CAC7D,2BAAU,EACV,mCAAuB,CAAC,aAAa,CACtC,CAAC;AAewB,0CAAU;AAbpC,MAAM,mBAAmB,GAAG,kCAAkC,CAC5D,YAAI,EACJ,mCAAuB,CAAC,KAAK,CAC9B,CAAC;AAYuB,wCAAS"}
|
|
@@ -12,9 +12,17 @@ const detect_1 = require("../../../../lib/detect");
|
|
|
12
12
|
const SEVERITIES = [common_1.SEVERITY.LOW, common_1.SEVERITY.MEDIUM, common_1.SEVERITY.HIGH];
|
|
13
13
|
function formatScanResults(scanResults, options, meta) {
|
|
14
14
|
try {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
const groupedByFile = scanResults.reduce((memo, scanResult) => {
|
|
16
|
+
const res = formatScanResult(scanResult, meta, options);
|
|
17
|
+
if (memo[scanResult.filePath]) {
|
|
18
|
+
memo[scanResult.filePath].result.cloudConfigResults.push(...res.result.cloudConfigResults);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
memo[scanResult.filePath] = res;
|
|
22
|
+
}
|
|
23
|
+
return memo;
|
|
24
|
+
}, {});
|
|
25
|
+
return Object.values(groupedByFile);
|
|
18
26
|
}
|
|
19
27
|
catch (e) {
|
|
20
28
|
throw new FailedToFormatResults();
|
|
@@ -30,7 +38,7 @@ const engineTypeToProjectType = {
|
|
|
30
38
|
function formatScanResult(scanResult, meta, options) {
|
|
31
39
|
const formattedIssues = scanResult.violatedPolicies.map((policy) => {
|
|
32
40
|
const cloudConfigPath = scanResult.docId !== undefined
|
|
33
|
-
? [`[DocId
|
|
41
|
+
? [`[DocId: ${scanResult.docId}]`].concat(policy.msg.split('.'))
|
|
34
42
|
: policy.msg.split('.');
|
|
35
43
|
const flagsRequiringLineNumber = [
|
|
36
44
|
'json',
|
|
@@ -40,7 +48,7 @@ function formatScanResult(scanResult, meta, options) {
|
|
|
40
48
|
];
|
|
41
49
|
const shouldExtractLineNumber = flagsRequiringLineNumber.some((flag) => options[flag]);
|
|
42
50
|
const lineNumber = shouldExtractLineNumber
|
|
43
|
-
? extract_line_number_1.extractLineNumber(scanResult,
|
|
51
|
+
? extract_line_number_1.extractLineNumber(scanResult.fileContent, scanResult.fileType, cloudConfigPath)
|
|
44
52
|
: -1;
|
|
45
53
|
return Object.assign(Object.assign({}, policy), { id: policy.publicId, name: policy.title, cloudConfigPath, isIgnored: false, iacDescription: {
|
|
46
54
|
issue: policy.issue,
|
|
@@ -95,18 +103,6 @@ function computePaths(filePath, pathArg = '.') {
|
|
|
95
103
|
targetFile,
|
|
96
104
|
};
|
|
97
105
|
}
|
|
98
|
-
function groupMultiDocResults(scanResults) {
|
|
99
|
-
const groupedData = scanResults.reduce((memo, result) => {
|
|
100
|
-
if (memo[result.filePath]) {
|
|
101
|
-
memo[result.filePath].violatedPolicies = memo[result.filePath].violatedPolicies.concat(result.violatedPolicies);
|
|
102
|
-
}
|
|
103
|
-
else {
|
|
104
|
-
memo[result.filePath] = result;
|
|
105
|
-
}
|
|
106
|
-
return memo;
|
|
107
|
-
}, {});
|
|
108
|
-
return Object.values(groupedData);
|
|
109
|
-
}
|
|
110
106
|
function filterPoliciesBySeverity(violatedPolicies, severityThreshold) {
|
|
111
107
|
if (!severityThreshold || severityThreshold === common_1.SEVERITY.LOW) {
|
|
112
108
|
return violatedPolicies.filter((violatedPolicy) => {
|
|
@@ -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,
|
|
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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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { CustomError } from '../../../../lib/errors';
|
|
2
|
+
export declare function trackUsage(formattedResults: TrackableResult[]): Promise<void>;
|
|
3
|
+
export declare class TestLimitReachedError extends CustomError {
|
|
4
|
+
constructor();
|
|
5
|
+
}
|
|
6
|
+
export interface TrackableResult {
|
|
7
|
+
meta: {
|
|
8
|
+
isPrivate: boolean;
|
|
9
|
+
};
|
|
10
|
+
result: {
|
|
11
|
+
cloudConfigResults: any[];
|
|
12
|
+
};
|
|
13
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TestLimitReachedError = exports.trackUsage = void 0;
|
|
4
|
+
const request = require("../../../../lib/request");
|
|
5
|
+
const config = require("../../../../lib/config");
|
|
6
|
+
const api_token_1 = require("../../../../lib/api-token");
|
|
7
|
+
const errors_1 = require("../../../../lib/errors");
|
|
8
|
+
async function trackUsage(formattedResults) {
|
|
9
|
+
const trackingData = formattedResults.map((res) => {
|
|
10
|
+
return {
|
|
11
|
+
isPrivate: res.meta.isPrivate,
|
|
12
|
+
issuesPrevented: res.result.cloudConfigResults.length,
|
|
13
|
+
};
|
|
14
|
+
});
|
|
15
|
+
const trackingResponse = await request({
|
|
16
|
+
method: 'POST',
|
|
17
|
+
headers: {
|
|
18
|
+
Authorization: `token ${api_token_1.api()}`,
|
|
19
|
+
},
|
|
20
|
+
url: `${config.API}/track-iac-usage/cli`,
|
|
21
|
+
body: { results: trackingData },
|
|
22
|
+
gzip: true,
|
|
23
|
+
json: true,
|
|
24
|
+
});
|
|
25
|
+
switch (trackingResponse.res.statusCode) {
|
|
26
|
+
case 200:
|
|
27
|
+
break;
|
|
28
|
+
case 429:
|
|
29
|
+
throw new TestLimitReachedError();
|
|
30
|
+
default:
|
|
31
|
+
throw new errors_1.CustomError('An error occurred while attempting to track test usage: ' +
|
|
32
|
+
JSON.stringify(trackingResponse.res.body));
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
exports.trackUsage = trackUsage;
|
|
36
|
+
class TestLimitReachedError extends errors_1.CustomError {
|
|
37
|
+
constructor() {
|
|
38
|
+
super('Test limit reached! You have exceeded your infrastructure as code test allocation for this billing period.');
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
exports.TestLimitReachedError = TestLimitReachedError;
|
|
42
|
+
//# sourceMappingURL=usage-tracking.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usage-tracking.js","sourceRoot":"","sources":["../../../../../src/cli/commands/test/iac-local-execution/usage-tracking.ts"],"names":[],"mappings":";;;AAAA,mDAAoD;AACpD,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,OAAO,CAAC;QACrC,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"}
|
|
File without changes
|
|
@@ -2,18 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.add = exports.postAnalytics = exports.allowAnalytics = exports.addDataAndSend = void 0;
|
|
4
4
|
const uuid_1 = require("uuid");
|
|
5
|
-
const snyk = require('
|
|
6
|
-
const config = require('
|
|
7
|
-
const version = require('
|
|
8
|
-
const request = require('
|
|
9
|
-
const { getIntegrationName, getIntegrationVersion, getIntegrationEnvironment, getIntegrationEnvironmentVersion, getCommandVersion, } = require('./
|
|
10
|
-
const isCI = require('
|
|
5
|
+
const snyk = require('../../lib');
|
|
6
|
+
const config = require('../config');
|
|
7
|
+
const version = require('../version');
|
|
8
|
+
const request = require('../request');
|
|
9
|
+
const { getIntegrationName, getIntegrationVersion, getIntegrationEnvironment, getIntegrationEnvironmentVersion, getCommandVersion, } = require('./sources');
|
|
10
|
+
const isCI = require('../is-ci').isCI;
|
|
11
11
|
const debug = require('debug')('snyk');
|
|
12
12
|
const os = require('os');
|
|
13
13
|
const osName = require('os-name');
|
|
14
14
|
const crypto = require('crypto');
|
|
15
15
|
const stripAnsi = require('strip-ansi');
|
|
16
|
-
const { MetricsCollector } = require('
|
|
16
|
+
const { MetricsCollector } = require('../metrics');
|
|
17
17
|
const metadata = {};
|
|
18
18
|
// analytics module is required at the beginning of the CLI run cycle
|
|
19
19
|
const startTime = Date.now();
|
|
@@ -51,19 +51,17 @@ exports.allowAnalytics = allowAnalytics;
|
|
|
51
51
|
* given by the data parameter, or called from {@link addDataAndSend}.
|
|
52
52
|
* @param data the analytics data to send to the backend.
|
|
53
53
|
*/
|
|
54
|
-
function postAnalytics(data) {
|
|
54
|
+
async function postAnalytics(data) {
|
|
55
55
|
// if the user opt'ed out of analytics, then let's bail out early
|
|
56
56
|
// ths applies to all sending to protect user's privacy
|
|
57
57
|
if (!allowAnalytics()) {
|
|
58
58
|
debug('analytics disabled');
|
|
59
59
|
return Promise.resolve();
|
|
60
60
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
.
|
|
65
|
-
.then(async (version) => {
|
|
66
|
-
data.version = version;
|
|
61
|
+
try {
|
|
62
|
+
const isStandalone = version.isStandaloneBuild();
|
|
63
|
+
const snykVersion = await version.getVersion();
|
|
64
|
+
data.version = snykVersion;
|
|
67
65
|
data.os = osName(os.platform(), os.release());
|
|
68
66
|
data.nodeVersion = process.version;
|
|
69
67
|
data.standalone = isStandalone;
|
|
@@ -98,9 +96,7 @@ function postAnalytics(data) {
|
|
|
98
96
|
queryStringParams['org'] = data.org;
|
|
99
97
|
}
|
|
100
98
|
debug('analytics', JSON.stringify(data, null, ' '));
|
|
101
|
-
const queryString = Object.keys(queryStringParams).length > 0
|
|
102
|
-
? queryStringParams
|
|
103
|
-
: undefined;
|
|
99
|
+
const queryString = Object.keys(queryStringParams).length > 0 ? queryStringParams : undefined;
|
|
104
100
|
return request({
|
|
105
101
|
body: {
|
|
106
102
|
data: data,
|
|
@@ -111,10 +107,10 @@ function postAnalytics(data) {
|
|
|
111
107
|
method: 'post',
|
|
112
108
|
headers: headers,
|
|
113
109
|
});
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
debug('analytics',
|
|
117
|
-
}
|
|
110
|
+
}
|
|
111
|
+
catch (err) {
|
|
112
|
+
debug('analytics', err); // this swallows the analytics error
|
|
113
|
+
}
|
|
118
114
|
}
|
|
119
115
|
exports.postAnalytics = postAnalytics;
|
|
120
116
|
/**
|
|
@@ -138,4 +134,4 @@ function add(key, value) {
|
|
|
138
134
|
}
|
|
139
135
|
}
|
|
140
136
|
exports.add = add;
|
|
141
|
-
//# sourceMappingURL=
|
|
137
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/analytics/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ArgsOptions } from '
|
|
1
|
+
import { ArgsOptions } from '../../cli/args';
|
|
2
2
|
export declare const INTEGRATION_NAME_ENVVAR = "SNYK_INTEGRATION_NAME";
|
|
3
3
|
export declare const INTEGRATION_VERSION_ENVVAR = "SNYK_INTEGRATION_VERSION";
|
|
4
4
|
export declare const INTEGRATION_ENVIRONMENT_ENVVAR = "SNYK_INTEGRATION_ENVIRONMENT";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sources.js","sourceRoot":"","sources":["../../../src/lib/analytics/sources.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const exec = require('child_process').exec;
|
|
|
7
7
|
const path = require('path');
|
|
8
8
|
const fs = require('fs');
|
|
9
9
|
const semver = require('semver');
|
|
10
|
-
const
|
|
10
|
+
const analytics_1 = require("../analytics");
|
|
11
11
|
function applyPatch(patchFileName, vuln, live, patchUrl) {
|
|
12
12
|
let cwd = vuln.source;
|
|
13
13
|
return new Promise((resolve, reject) => {
|
|
@@ -152,7 +152,7 @@ function patchError(error, dir, vuln, patchUrl) {
|
|
|
152
152
|
// wrong, so we'll ask the user for help to diagnose.
|
|
153
153
|
const filename = path.relative(process.cwd(), dir);
|
|
154
154
|
// post metadata to help diagnose
|
|
155
|
-
|
|
155
|
+
analytics_1.addDataAndSend({
|
|
156
156
|
command: 'patch-fail',
|
|
157
157
|
metadata: {
|
|
158
158
|
from: vuln.from.slice(1),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-patch.js","sourceRoot":"","sources":["../../../src/lib/protect/apply-patch.js"],"names":[],"mappings":";;AAAA,+BAAoC;AACpC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AACvC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC;AAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,
|
|
1
|
+
{"version":3,"file":"apply-patch.js","sourceRoot":"","sources":["../../../src/lib/protect/apply-patch.js"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,13 @@ exports.getQueryParamsAsString = void 0;
|
|
|
5
5
|
const url = require("url");
|
|
6
6
|
const os = require("os");
|
|
7
7
|
const is_docker_1 = require("./is-docker");
|
|
8
|
-
const
|
|
8
|
+
const sources_1 = require("./analytics/sources");
|
|
9
9
|
function getQueryParamsAsString(args) {
|
|
10
10
|
var _a;
|
|
11
11
|
const utm_source = process.env.SNYK_UTM_SOURCE || 'cli';
|
|
12
12
|
const utm_medium = process.env.SNYK_UTM_MEDIUM || 'cli';
|
|
13
|
-
const utm_campaign = process.env.SNYK_UTM_CAMPAIGN ||
|
|
14
|
-
const utm_campaign_content = process.env.SNYK_UTM_CAMPAIGN_CONTENT ||
|
|
13
|
+
const utm_campaign = process.env.SNYK_UTM_CAMPAIGN || sources_1.getIntegrationName(args) || 'cli';
|
|
14
|
+
const utm_campaign_content = process.env.SNYK_UTM_CAMPAIGN_CONTENT || sources_1.getIntegrationVersion(args);
|
|
15
15
|
const osType = (_a = os.type()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
|
|
16
16
|
const docker = is_docker_1.isDocker().toString();
|
|
17
17
|
const queryParams = new url.URLSearchParams({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-strings.js","sourceRoot":"","sources":["../../src/lib/query-strings.ts"],"names":[],"mappings":";;;AAAA,iDAAiD;AACjD,2BAA2B;AAC3B,yBAAyB;AAEzB,2CAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"query-strings.js","sourceRoot":"","sources":["../../src/lib/query-strings.ts"],"names":[],"mappings":";;;AAAA,iDAAiD;AACjD,2BAA2B;AAC3B,yBAAyB;AAEzB,2CAAuC;AACvC,iDAAgF;AAEhF,SAAgB,sBAAsB,CAAC,IAAmB;;IACxD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,KAAK,CAAC;IACxD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,KAAK,CAAC;IACxD,MAAM,YAAY,GAChB,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,4BAAkB,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;IACrE,MAAM,oBAAoB,GACxB,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,+BAAqB,CAAC,IAAI,CAAC,CAAC;IACvE,MAAM,MAAM,SAAG,EAAE,CAAC,IAAI,EAAE,0CAAE,WAAW,EAAE,CAAC;IACxC,MAAM,MAAM,GAAG,oBAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;IAErC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC;QAC1C,UAAU;QACV,UAAU;QACV,YAAY;QACZ,oBAAoB;QACpB,EAAE,EAAE,MAAM;QACV,MAAM;KACP,CAAC,CAAC;IAEH,0EAA0E;IAC1E,IAAI,CAAC,oBAAoB,EAAE;QACzB,WAAW,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;KAC5C;IAED,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC;AAChC,CAAC;AAzBD,wDAyBC"}
|
|
@@ -7,7 +7,6 @@ const zlib = require("zlib");
|
|
|
7
7
|
const config = require("../config");
|
|
8
8
|
const proxy_from_env_1 = require("proxy-from-env");
|
|
9
9
|
const global_agent_1 = require("global-agent");
|
|
10
|
-
const analytics = require("../analytics");
|
|
11
10
|
const version_1 = require("../version");
|
|
12
11
|
const https = require("https");
|
|
13
12
|
const http = require("http");
|
|
@@ -46,13 +45,6 @@ module.exports = function makeRequest(payload) {
|
|
|
46
45
|
callGraphLength = JSON.stringify(body.callGraph).length;
|
|
47
46
|
snykDebug('call graph size:', callGraphLength);
|
|
48
47
|
}
|
|
49
|
-
if (!payload.url.endsWith('/analytics/cli')) {
|
|
50
|
-
analytics.add('payloadSize', json.length);
|
|
51
|
-
analytics.add('gzippedPayloadSize', data.length);
|
|
52
|
-
if (callGraphLength) {
|
|
53
|
-
analytics.add('callGraphPayloadSize', callGraphLength);
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
48
|
payload.headers['content-encoding'] = 'gzip';
|
|
57
49
|
payload.headers['content-length'] = data.length;
|
|
58
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/lib/request/request.ts"],"names":[],"mappings":";AAAA,iCAA6C;AAC7C,iCAAiC;AACjC,6BAAoC;AACpC,2CAA2C;AAC3C,6BAA6B;AAC7B,oCAAoC;AACpC,mDAAgD;AAChD,+CAAyC;
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/lib/request/request.ts"],"names":[],"mappings":"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"}
|
package/help/README.md
CHANGED
|
@@ -17,13 +17,13 @@ This system improves authoring, as markdown is easier to format. It's keeping th
|
|
|
17
17
|
|
|
18
18
|
Contact **Team Hammer** or open an issue in this repository when in doubt.
|
|
19
19
|
|
|
20
|
-
Keep all changes in `help/commands-docs` folder, as
|
|
20
|
+
Keep all changes in `help/commands-docs` folder, as that is used as source for generating Markdown, ronn and txt files. When you are done editing, or you want to preview your changes, run the `npm run generate-help` (see "Running locally" below for troubleshooting). Then commit all changes, including the generated files.
|
|
21
21
|
|
|
22
22
|
See other documents and help files for hints on how to format arguments. Keep formatting simple, as the transformation to `roff` might have issues with complex structures.
|
|
23
23
|
|
|
24
24
|
### CLI options
|
|
25
25
|
|
|
26
|
-
```
|
|
26
|
+
```markdown
|
|
27
27
|
- `--severity-threshold`=low|medium|high|critical:
|
|
28
28
|
Only report vulnerabilities of provided level or higher.
|
|
29
29
|
```
|
|
@@ -34,13 +34,13 @@ CLI flag should be in backticks. Options (filenames, org names…) should use Ke
|
|
|
34
34
|
|
|
35
35
|
There is one non-standard markdown extension:
|
|
36
36
|
|
|
37
|
-
```
|
|
37
|
+
```markdown
|
|
38
38
|
<KEYWORD>
|
|
39
39
|
```
|
|
40
40
|
|
|
41
41
|
Visually, it'll get rendered as underlined text. It's used to mark a "variable". For example this command flag:
|
|
42
42
|
|
|
43
|
-
```
|
|
43
|
+
```markdown
|
|
44
44
|
- `--sarif-file-output`=<OUTPUT_FILE_PATH>:
|
|
45
45
|
(only in `test` command)
|
|
46
46
|
Save test output in SARIF format directly to the <OUTPUT_FILE_PATH> file, regardless of whether or not you use the `--sarif` option.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "snyk",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.669.0",
|
|
4
4
|
"description": "snyk library and cli utility",
|
|
5
5
|
"main": "dist/lib/index.js",
|
|
6
6
|
"files": [
|
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
"packages/*"
|
|
29
29
|
],
|
|
30
30
|
"scripts": {
|
|
31
|
+
"clean": "rimraf dist tsconfig.tsbuildinfo",
|
|
31
32
|
"build": "tsc --build",
|
|
32
33
|
"build-watch": "tsc -w",
|
|
33
34
|
"find-circular": "npm run build && madge --circular ./dist",
|
|
@@ -121,11 +122,11 @@
|
|
|
121
122
|
"snyk-cpp-plugin": "2.2.1",
|
|
122
123
|
"snyk-docker-plugin": "4.22.1",
|
|
123
124
|
"snyk-go-plugin": "1.17.0",
|
|
124
|
-
"snyk-gradle-plugin": "3.16.
|
|
125
|
+
"snyk-gradle-plugin": "3.16.1",
|
|
125
126
|
"snyk-module": "3.1.0",
|
|
126
|
-
"snyk-mvn-plugin": "2.26.
|
|
127
|
+
"snyk-mvn-plugin": "2.26.2",
|
|
127
128
|
"snyk-nodejs-lockfile-parser": "1.35.0",
|
|
128
|
-
"snyk-nuget-plugin": "1.
|
|
129
|
+
"snyk-nuget-plugin": "1.22.0",
|
|
129
130
|
"snyk-php-plugin": "1.9.2",
|
|
130
131
|
"snyk-policy": "1.19.0",
|
|
131
132
|
"snyk-python-plugin": "1.19.11",
|
|
@@ -199,5 +200,5 @@
|
|
|
199
200
|
"registry": "https://registry.npmjs.org/",
|
|
200
201
|
"access": "public"
|
|
201
202
|
},
|
|
202
|
-
"gitHead": "
|
|
203
|
+
"gitHead": "f0d86d3a40bb7766f544e02af880788d7ef4f5dd"
|
|
203
204
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"analytics-sources.js","sourceRoot":"","sources":["../../src/lib/analytics-sources.ts"],"names":[],"mappings":";AAAA;;;;;;;;EAQE;;;AAEF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AACvC,yBAAyB;AACzB,iCAAiC;AAEjC,+BAA4B;AAC5B,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAE7B,QAAA,uBAAuB,GAAG,uBAAuB,CAAC;AAClD,QAAA,0BAA0B,GAAG,0BAA0B,CAAC;AACxD,QAAA,8BAA8B,GAAG,8BAA8B,CAAC;AAChE,QAAA,sCAAsC,GACjD,sCAAsC,CAAC;AAEzC,IAAK,kBAmCJ;AAnCD,WAAK,kBAAkB;IACrB,+BAA+B;IAC/B,iCAAW,CAAA;IACX,+CAAyB,CAAA;IAEzB,8CAA8C;IAC9C,2CAAqB,CAAA;IACrB,qCAAe,CAAA;IAEf,kEAAkE;IAClE,yDAAmC,CAAA;IACnC,iDAA2B,CAAA;IAE3B,oEAAoE;IACpE,qDAA+B,CAAA;IAC/B,yCAAmB,CAAA;IACnB,qDAA+B,CAAA;IAC/B,6DAAuC,CAAA;IAEvC,2DAA2D;IAC3D,yCAAmB,CAAA;IACnB,2CAAqB,CAAA;IACrB,iEAA2C,CAAA;IAC3C,yDAAmC,CAAA;IACnC,mDAA6B,CAAA;IAC7B,uDAAiC,CAAA;IACjC,mDAA6B,CAAA;IAC7B,2DAAqC,CAAA;IAErC,qEAAqE;IACrE,uDAAiC,CAAA;IAEjC,kCAAkC;IAClC,mEAAmE;IACnE,uDAAiC,CAAA;AACnC,CAAC,EAnCI,kBAAkB,KAAlB,kBAAkB,QAmCtB;AAEY,QAAA,kBAAkB,GAAG,CAAC,IAAmB,EAAU,EAAE;;IAChE,MAAM,aAAa,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IACrD,MAAM,UAAU,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAE5C,MAAM,eAAe,GAAG,CACtB,CAAC,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,eAA0B,KAAI,8CAA8C;QACtF,OAAO,CAAC,GAAG,CAAC,+BAAuB,CAAC;QACpC,aAAa;QACb,UAAU;QACV,EAAE,CACH,CAAC,WAAW,EAAE,CAAC;IAChB,IAAI,eAAe,IAAI,kBAAkB,EAAE;QACzC,OAAO,eAAe,CAAC;KACxB;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEW,QAAA,qBAAqB,GAAG,CAAC,IAAmB,EAAU,EAAE;;IACnE,OAAA,CAAC,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,kBAA6B;QACvC,OAAO,CAAC,GAAG,CAAC,kCAA0B,CAAC;QACvC,EAAE,CAAA;CAAA,CAAC;AAEQ,QAAA,yBAAyB,GAAG,CAAC,IAAmB,EAAU,EAAE;;IACvE,OAAA,CAAC,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,sBAAiC;QAC3C,OAAO,CAAC,GAAG,CAAC,sCAA8B,CAAC;QAC3C,EAAE,CAAA;CAAA,CAAC;AAEQ,QAAA,gCAAgC,GAAG,CAAC,IAAmB,EAAU,EAAE;;IAC9E,OAAA,CAAC,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,6BAAwC;QAClD,OAAO,CAAC,GAAG,CAAC,8CAAsC,CAAC;QACnD,EAAE,CAAA;CAAA,CAAC;AAEL,SAAgB,OAAO;IACrB,MAAM,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC5C,MAAM,cAAc,GAClB,kBAAkB,CAAC,QAAQ,CAAC,cAAc,CAAC;QAC3C,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEvC,IAAI,cAAc,EAAE;QAClB,OAAO,yBAAyB,CAAC,kBAAkB,CAAC,CAAC;KACtD;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAXD,0BAWC;AAED,SAAgB,yBAAyB,CAAC,kBAA0B;IAClE,+IAA+I;IAC/I,wEAAwE;IACxE,IAAI;QACF,MAAM,sBAAsB,GAAG,kBAAkB,CAAC,OAAO,CACvD,cAAc,EACd,eAAe,CAChB,CAAC;QACF,IAAI,EAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE;YACzC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAC7B,EAAE,CAAC,YAAY,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAChD,CAAC;YAEF,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;YAC7B,IACE,GAAG,CAAC,UAAU,CAAC,8BAA8B,CAAC;gBAC9C,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,EAC5B;gBACA,OAAO,IAAI,CAAC;aACb;SACF;KACF;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;KACtD;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAzBD,8DAyBC;AAED,SAAgB,UAAU;IACxB,MAAM,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC5C,MAAM,cAAc,GAAG,kBAAkB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACpE,IAAI,cAAc,EAAE;QAClB,OAAO,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;KAC7C;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AARD,gCAQC;AAED,SAAgB,gBAAgB,CAAC,kBAA0B;IACzD,IAAI;QACF,MAAM,uBAAuB,GAAG,WAAI,CAClC,kBAAkB,EAClB,qBAAqB,CACtB,CAAC;QACF,MAAM,iBAAiB,GAAG,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;QACjE,OAAO,iBAAiB,CAAC;KAC1B;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CAAC,0CAA0C,EAAE,KAAK,CAAC,CAAC;KAC1D;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAZD,4CAYC;AAED,SAAS,UAAU,CAAC,GAAW;IAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YAClC,IAAI,KAAK,EAAE;gBACT,KAAK,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAC;aACvD;YACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,cAAsB;IACtD,IAAI,YAAY,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC5B,IAAI,EAAE,KAAK,OAAO,EAAE;QAClB,YAAY,GAAG,OAAO,CAAC;KACxB;SAAM,IAAI,EAAE,KAAK,SAAS,EAAE;QAC3B,YAAY,GAAG,iBAAiB,CAAC;KAClC;IAED,IAAI;QACF,MAAM,UAAU,CAAC,GAAG,YAAY,IAAI,cAAc,EAAE,CAAC,CAAC;KACvD;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,KAAK,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAfD,kCAeC;AAED,4FAA4F;AACrF,KAAK,UAAU,iBAAiB,CACrC,cAAsB;IAEtB,MAAM,kBAAkB,GAAG,MAAM,WAAW,CAAC,cAAc,CAAC,CAAC;IAE7D,IAAI,kBAAkB,EAAE;QACtB,IAAI;YACF,IAAI,OAAO,GAAkB,MAAM,UAAU,CAC3C,GAAG,cAAc,YAAY,CAC9B,CAAC;YACF,iBAAiB;YACjB,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;YACzB,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,OAAO,KAAK,IAAI,EAAE;gBACpB,OAAO,OAAO,CAAC;aAChB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,SAAS,CAAC;SAClB;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AArBD,8CAqBC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../src/lib/analytics.ts"],"names":[],"mappings":"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"}
|