@appland/scanner 1.40.1 → 1.42.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/README.md +63 -39
- package/built/appMapIndex.js +40 -0
- package/built/appMapIndex.js.map +1 -0
- package/built/check.js +3 -3
- package/built/check.js.map +1 -1
- package/built/checkInstance.js +4 -4
- package/built/checkInstance.js.map +1 -1
- package/built/cli/ci/command.js +1 -1
- package/built/cli/ci/command.js.map +1 -1
- package/built/cli/scan/command.js +5 -1
- package/built/cli/scan/command.js.map +1 -1
- package/built/cli/scan.js +4 -2
- package/built/cli/scan.js.map +1 -1
- package/built/cli/upload/command.js +1 -1
- package/built/cli/upload/command.js.map +1 -1
- package/built/database/index.js +136 -161
- package/built/database/index.js.map +1 -1
- package/built/eventUtil.js +61 -0
- package/built/eventUtil.js.map +1 -0
- package/built/integration/appland/upload.js +2 -3
- package/built/integration/appland/upload.js.map +1 -1
- package/built/report/summaryReport.js +1 -1
- package/built/report/summaryReport.js.map +1 -1
- package/built/ruleChecker.js +16 -14
- package/built/ruleChecker.js.map +1 -1
- package/built/rules/authzBeforeAuthn.js +6 -0
- package/built/rules/authzBeforeAuthn.js.map +1 -1
- package/built/rules/circularDependency.js +4 -0
- package/built/rules/circularDependency.js.map +1 -1
- package/built/rules/deserializationOfUntrustedData.js +8 -0
- package/built/rules/deserializationOfUntrustedData.js.map +1 -1
- package/built/rules/http500.js +7 -0
- package/built/rules/http500.js.map +1 -1
- package/built/rules/illegalPackageDependency.js +7 -0
- package/built/rules/illegalPackageDependency.js.map +1 -1
- package/built/rules/incompatibleHttpClientRequest.js +7 -0
- package/built/rules/incompatibleHttpClientRequest.js.map +1 -1
- package/built/rules/insecureCompare.js +4 -0
- package/built/rules/insecureCompare.js.map +1 -1
- package/built/rules/jobNotCancelled.js +3 -0
- package/built/rules/jobNotCancelled.js.map +1 -1
- package/built/rules/lib/matchEvent.js +3 -4
- package/built/rules/lib/matchEvent.js.map +1 -1
- package/built/rules/lib/parseRuleDescription.js +18 -0
- package/built/rules/lib/parseRuleDescription.js.map +1 -0
- package/built/rules/logoutWithoutSessionReset.js +8 -0
- package/built/rules/logoutWithoutSessionReset.js.map +1 -1
- package/built/rules/missingAuthentication.js +6 -0
- package/built/rules/missingAuthentication.js.map +1 -1
- package/built/rules/missingContentType.js +6 -0
- package/built/rules/missingContentType.js.map +1 -1
- package/built/rules/nPlusOneQuery.js +8 -2
- package/built/rules/nPlusOneQuery.js.map +1 -1
- package/built/rules/queryFromInvalidPackage.js +6 -0
- package/built/rules/queryFromInvalidPackage.js.map +1 -1
- package/built/rules/queryFromView.js +6 -0
- package/built/rules/queryFromView.js.map +1 -1
- package/built/rules/rpcWithoutCircuitBreaker.js +6 -0
- package/built/rules/rpcWithoutCircuitBreaker.js.map +1 -1
- package/built/rules/saveWithoutValidation.js +6 -0
- package/built/rules/saveWithoutValidation.js.map +1 -1
- package/built/rules/secretInLog.js +3 -0
- package/built/rules/secretInLog.js.map +1 -1
- package/built/rules/slowFunctionCall.js +6 -0
- package/built/rules/slowFunctionCall.js.map +1 -1
- package/built/rules/slowHttpServerRequest.js +6 -0
- package/built/rules/slowHttpServerRequest.js.map +1 -1
- package/built/rules/slowQuery.js +6 -0
- package/built/rules/slowQuery.js.map +1 -1
- package/built/rules/tooManyJoins.js +9 -3
- package/built/rules/tooManyJoins.js.map +1 -1
- package/built/rules/tooManyUpdates.js +6 -0
- package/built/rules/tooManyUpdates.js.map +1 -1
- package/built/rules/unbatchedMaterializedQuery.js +9 -4
- package/built/rules/unbatchedMaterializedQuery.js.map +1 -1
- package/built/rules/updateInGetRequest.js +6 -0
- package/built/rules/updateInGetRequest.js.map +1 -1
- package/built/scope/sqlTransactionScope.js +3 -2
- package/built/scope/sqlTransactionScope.js.map +1 -1
- package/built/sqlWarning.js +56 -0
- package/built/sqlWarning.js.map +1 -0
- package/doc/architecture.md +48 -0
- package/doc/labels/audit.md +7 -0
- package/doc/labels/dao.materialize.md +12 -0
- package/doc/labels/deserialize.safe.md +9 -0
- package/doc/labels/deserialize.unsafe.md +12 -0
- package/doc/labels/http.session.clear.md +7 -0
- package/doc/labels/job.cancel.md +11 -0
- package/doc/labels/job.create.md +13 -0
- package/doc/labels/log.md +12 -0
- package/doc/labels/public.md +8 -0
- package/doc/labels/rpc.circuit_breaker.md +16 -0
- package/doc/labels/sanitize.md +29 -0
- package/doc/labels/secret.md +11 -0
- package/doc/labels/security.authentication.md +10 -0
- package/doc/labels/security.authorization.md +9 -0
- package/doc/labels/security.logout.md +9 -0
- package/doc/labels/string.equals.md +18 -0
- package/doc/rules/authzBeforeAuthn.md +47 -0
- package/doc/rules/circularDependency.md +57 -0
- package/doc/rules/deserializationOfUntrustedData.md +55 -0
- package/doc/rules/http500.md +36 -0
- package/doc/rules/illegalPackageDependency.md +50 -0
- package/doc/rules/incompatibleHttpClientRequest.md +35 -0
- package/doc/rules/insecureCompare.md +59 -0
- package/doc/rules/jobNotCancelled.md +49 -0
- package/doc/rules/logoutWithoutSessionReset.md +40 -0
- package/doc/rules/missingAuthentication.md +59 -0
- package/doc/rules/missingContentType.md +33 -0
- package/doc/rules/nPlusOneQuery.md +52 -0
- package/doc/rules/queryFromInvalidPackage.md +45 -0
- package/doc/rules/queryFromView.md +42 -0
- package/doc/rules/rpcWithoutCircuitBreaker.md +44 -0
- package/doc/rules/saveWithoutValidation.md +33 -0
- package/doc/rules/secretInLog.md +49 -0
- package/doc/rules/slowFunctionCall.md +39 -0
- package/doc/rules/slowHttpServerRequest.md +34 -0
- package/doc/rules/slowQuery.md +33 -0
- package/doc/rules/tooManyJoins.md +40 -0
- package/doc/rules/tooManyUpdates.md +46 -0
- package/doc/rules/unbatchedMaterializedQuery.md +54 -0
- package/doc/rules/updateInGetRequest.md +44 -0
- package/package.json +10 -6
package/built/database/index.js
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// License: https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE
|
|
3
|
-
// Apache License 2.0
|
|
4
2
|
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
5
3
|
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
6
4
|
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
@@ -28,6 +26,31 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
28
26
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
29
27
|
}
|
|
30
28
|
};
|
|
29
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
30
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
31
|
+
if (!m) return o;
|
|
32
|
+
var i = m.call(o), r, ar = [], e;
|
|
33
|
+
try {
|
|
34
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
35
|
+
}
|
|
36
|
+
catch (error) { e = { error: error }; }
|
|
37
|
+
finally {
|
|
38
|
+
try {
|
|
39
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
40
|
+
}
|
|
41
|
+
finally { if (e) throw e.error; }
|
|
42
|
+
}
|
|
43
|
+
return ar;
|
|
44
|
+
};
|
|
45
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
46
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
47
|
+
if (ar || !(i in from)) {
|
|
48
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
49
|
+
ar[i] = from[i];
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
53
|
+
};
|
|
31
54
|
var __values = (this && this.__values) || function(o) {
|
|
32
55
|
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
33
56
|
if (m) return m.call(o);
|
|
@@ -40,155 +63,114 @@ var __values = (this && this.__values) || function(o) {
|
|
|
40
63
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
41
64
|
};
|
|
42
65
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
43
|
-
exports.countJoins = exports.sqlStrings = exports.isSelect = exports.
|
|
44
|
-
// TODO: Copied and TypeScript-ified from @appland/models
|
|
45
|
-
var visit_1 = require("./visit");
|
|
66
|
+
exports.countJoins = exports.sqlStrings = exports.isSelect = exports.getSqlLabelFromString = exports.getHttpLabel = exports.capitalizeString = void 0;
|
|
46
67
|
var models_1 = require("@appland/models");
|
|
47
|
-
var
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
numeric_literals: /-?\b(?:[0-9]+\.)?[0-9]+([eE][+-]?[0-9]+)?\b/g,
|
|
53
|
-
boolean_literals: /\b(?:true|false|null)\b/gi,
|
|
54
|
-
hexadecimal_literals: /0x[0-9a-fA-F]+/g,
|
|
55
|
-
comments: /(?:#|--).*?(?=\r|\n|$)/gi,
|
|
56
|
-
multi_line_comments: /\/\*(?:[^/]|\/[^*])*?(?:\*\/|\/\*.*)/g,
|
|
57
|
-
oracle_quoted_strings: /q'\[.*?(?:\]'|$)|q'\{.*?(?:\}'|$)|q'<.*?(?:>'|$)|q'\(.*?(?:\)'|$)/g,
|
|
58
|
-
};
|
|
59
|
-
// We use these to check whether the query contains any quote characters
|
|
60
|
-
// after obfuscation. If so, that's a good indication that the original
|
|
61
|
-
// query was malformed, and so our obfuscation can't reliably find
|
|
62
|
-
// literals. In such a case, we'll replace the entire query with a
|
|
63
|
-
// placeholder.
|
|
64
|
-
var CLEANUP_REGEXP = {
|
|
65
|
-
mysql: /'|"|\/\*|\*\//,
|
|
66
|
-
mysql2: /'|"|\/\*|\*\//,
|
|
67
|
-
postgres: /'|\/\*|\*\/|\$(?!\?)/,
|
|
68
|
-
sqlite: /'|\/\*|\*\//,
|
|
69
|
-
cassandra: /'|\/\*|\*\//,
|
|
70
|
-
oracle: /'|\/\*|\*\//,
|
|
71
|
-
oracle_enhanced: /'|\/\*|\*\//,
|
|
72
|
-
};
|
|
73
|
-
/**
|
|
74
|
-
* @type {{string: string[]}}
|
|
75
|
-
*/
|
|
76
|
-
var DIALECT_COMPONENTS = {
|
|
77
|
-
fallback: Object.keys(COMPONENTS_REGEXP_MAP),
|
|
78
|
-
mysql: [
|
|
79
|
-
'single_quotes',
|
|
80
|
-
'double_quotes',
|
|
81
|
-
'numeric_literals',
|
|
82
|
-
'boolean_literals',
|
|
83
|
-
'hexadecimal_literals',
|
|
84
|
-
'comments',
|
|
85
|
-
'multi_line_comments',
|
|
86
|
-
],
|
|
87
|
-
postgres: [
|
|
88
|
-
'single_quotes',
|
|
89
|
-
'dollar_quotes',
|
|
90
|
-
'uuids',
|
|
91
|
-
'numeric_literals',
|
|
92
|
-
'boolean_literals',
|
|
93
|
-
'comments',
|
|
94
|
-
'multi_line_comments',
|
|
95
|
-
],
|
|
96
|
-
sqlite: [
|
|
97
|
-
'single_quotes',
|
|
98
|
-
'numeric_literals',
|
|
99
|
-
'boolean_literals',
|
|
100
|
-
'hexadecimal_literals',
|
|
101
|
-
'comments',
|
|
102
|
-
'multi_line_comments',
|
|
103
|
-
],
|
|
104
|
-
oracle: [
|
|
105
|
-
'single_quotes',
|
|
106
|
-
'oracle_quoted_strings',
|
|
107
|
-
'numeric_literals',
|
|
108
|
-
'comments',
|
|
109
|
-
'multi_line_comments',
|
|
110
|
-
],
|
|
111
|
-
cassandra: [
|
|
112
|
-
'single_quotes',
|
|
113
|
-
'uuids',
|
|
114
|
-
'numeric_literals',
|
|
115
|
-
'boolean_literals',
|
|
116
|
-
'hexadecimal_literals',
|
|
117
|
-
'comments',
|
|
118
|
-
'multi_line_comments',
|
|
119
|
-
],
|
|
120
|
-
};
|
|
121
|
-
var PLACEHOLDER = '?';
|
|
122
|
-
/**
|
|
123
|
-
* @param {string} dialect
|
|
124
|
-
* @returns {RegExp[]}
|
|
125
|
-
*/
|
|
126
|
-
function generateRegexp(dialect) {
|
|
127
|
-
var components = DIALECT_COMPONENTS[dialect];
|
|
128
|
-
// No Regexp.union in JS
|
|
129
|
-
return components.map(function (component) { return COMPONENTS_REGEXP_MAP[component]; });
|
|
130
|
-
}
|
|
131
|
-
var MYSQL_COMPONENTS_REGEXP = generateRegexp('mysql');
|
|
132
|
-
var POSTGRES_COMPONENTS_REGEXP = generateRegexp('postgres');
|
|
133
|
-
var SQLITE_COMPONENTS_REGEXP = generateRegexp('sqlite');
|
|
134
|
-
var ORACLE_COMPONENTS_REGEXP = generateRegexp('oracle');
|
|
135
|
-
var CASSANDRA_COMPONENTS_REGEXP = generateRegexp('cassandra');
|
|
136
|
-
var FALLBACK_REGEXP = generateRegexp('fallback');
|
|
137
|
-
function detectUnmatchedPairs(obfuscated, adapter) {
|
|
138
|
-
if (CLEANUP_REGEXP[adapter]) {
|
|
139
|
-
return CLEANUP_REGEXP[adapter].test(obfuscated);
|
|
68
|
+
var visit_1 = require("./visit");
|
|
69
|
+
var url_1 = require("url");
|
|
70
|
+
function capitalizeString(str) {
|
|
71
|
+
if (typeof str !== 'string') {
|
|
72
|
+
return '';
|
|
140
73
|
}
|
|
141
|
-
return
|
|
74
|
+
return str.slice(0, 1).toUpperCase() + str.slice(1).toLowerCase();
|
|
142
75
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
* @param {string} sql
|
|
148
|
-
* @param {string} adapter
|
|
149
|
-
* @returns {string}
|
|
150
|
-
*/
|
|
151
|
-
function obfuscate(sql, adapter) {
|
|
152
|
-
/** @type {RegExp[]} */ var regexp;
|
|
153
|
-
switch (adapter) {
|
|
154
|
-
case 'mysql':
|
|
155
|
-
case 'mysql2':
|
|
156
|
-
regexp = MYSQL_COMPONENTS_REGEXP;
|
|
157
|
-
break;
|
|
158
|
-
case 'postgres':
|
|
159
|
-
regexp = POSTGRES_COMPONENTS_REGEXP;
|
|
160
|
-
break;
|
|
161
|
-
case 'sqlite':
|
|
162
|
-
regexp = SQLITE_COMPONENTS_REGEXP;
|
|
163
|
-
break;
|
|
164
|
-
case 'oracle':
|
|
165
|
-
case 'oracle_enhanced':
|
|
166
|
-
regexp = ORACLE_COMPONENTS_REGEXP;
|
|
167
|
-
break;
|
|
168
|
-
case 'cassandra':
|
|
169
|
-
regexp = CASSANDRA_COMPONENTS_REGEXP;
|
|
170
|
-
break;
|
|
171
|
-
default:
|
|
172
|
-
regexp = FALLBACK_REGEXP;
|
|
76
|
+
exports.capitalizeString = capitalizeString;
|
|
77
|
+
function getHttpLabel(event) {
|
|
78
|
+
if (!event.httpServerRequest) {
|
|
79
|
+
return;
|
|
173
80
|
}
|
|
174
|
-
var
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
81
|
+
var requestMethod = event.httpServerRequest.request_method;
|
|
82
|
+
var pathInfo = event.httpServerRequest.path_info;
|
|
83
|
+
var label;
|
|
84
|
+
try {
|
|
85
|
+
// the url is fake, we only care about the path info anyway
|
|
86
|
+
var url = new url_1.URL(pathInfo, 'http://hostname');
|
|
87
|
+
label = requestMethod + " " + url.pathname;
|
|
88
|
+
}
|
|
89
|
+
catch (ex) {
|
|
90
|
+
label = 'HTTP Request';
|
|
179
91
|
}
|
|
180
|
-
return
|
|
92
|
+
return label;
|
|
181
93
|
}
|
|
182
|
-
exports.
|
|
183
|
-
|
|
184
|
-
|
|
94
|
+
exports.getHttpLabel = getHttpLabel;
|
|
95
|
+
var sqlLabels = new Set([
|
|
96
|
+
'insert',
|
|
97
|
+
'update',
|
|
98
|
+
'select',
|
|
99
|
+
'delete',
|
|
100
|
+
'alter',
|
|
101
|
+
'create',
|
|
102
|
+
'drop',
|
|
103
|
+
'rename',
|
|
104
|
+
'truncate',
|
|
105
|
+
'replace',
|
|
106
|
+
'savepoint',
|
|
107
|
+
'release',
|
|
108
|
+
'rollback',
|
|
109
|
+
'lock',
|
|
110
|
+
'unlock',
|
|
111
|
+
'set',
|
|
112
|
+
'start',
|
|
113
|
+
'call',
|
|
114
|
+
'delete',
|
|
115
|
+
'do',
|
|
116
|
+
'perform',
|
|
117
|
+
'handler',
|
|
118
|
+
'load',
|
|
119
|
+
'purge',
|
|
120
|
+
'reset',
|
|
121
|
+
'prepare',
|
|
122
|
+
'execute',
|
|
123
|
+
'deallocate',
|
|
124
|
+
'xa',
|
|
125
|
+
]);
|
|
126
|
+
function getSqlLabelFromString(sqlString) {
|
|
127
|
+
var sqlChars = __spreadArray([], __read(sqlString.trimLeft()), false);
|
|
128
|
+
if (sqlChars.length > 0 && sqlChars[0] === '(') {
|
|
129
|
+
// if the query is wrapped in parenthesis, drop the opening parenthesis
|
|
130
|
+
// it doesn't matter if we leave a hanging closing parenthesis.
|
|
131
|
+
// e.g. (SELECT 1);
|
|
132
|
+
sqlChars.shift();
|
|
133
|
+
}
|
|
134
|
+
// drop sub-queries and parenthesized expressions
|
|
135
|
+
var depth = 0;
|
|
136
|
+
var topLevelSql = sqlChars
|
|
137
|
+
.reduce(function (arr, c) {
|
|
138
|
+
if (c === '(') {
|
|
139
|
+
depth += 1;
|
|
140
|
+
}
|
|
141
|
+
if (depth === 0) {
|
|
142
|
+
arr.push(c);
|
|
143
|
+
}
|
|
144
|
+
if (c === ')') {
|
|
145
|
+
depth -= 1;
|
|
146
|
+
}
|
|
147
|
+
return arr;
|
|
148
|
+
}, [])
|
|
149
|
+
.join('');
|
|
150
|
+
var queryType;
|
|
151
|
+
if (topLevelSql.search(/\s/) === -1) {
|
|
152
|
+
// There's only a single token
|
|
153
|
+
// e.g. BEGIN, COMMIT, CHECKPOINT
|
|
154
|
+
queryType = topLevelSql;
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
// convert non-word sequences to spaces and split by space
|
|
158
|
+
// find the first known token
|
|
159
|
+
queryType =
|
|
160
|
+
topLevelSql
|
|
161
|
+
.replace(/[^\w]+/g, ' ')
|
|
162
|
+
.toLowerCase()
|
|
163
|
+
.split(' ')
|
|
164
|
+
.find(function (t) { return sqlLabels.has(t); }) || 'unknown';
|
|
165
|
+
}
|
|
166
|
+
return ['SQL', capitalizeString(queryType) || null].join(' ');
|
|
185
167
|
}
|
|
186
|
-
exports.
|
|
168
|
+
exports.getSqlLabelFromString = getSqlLabelFromString;
|
|
187
169
|
function isSelect(sql) {
|
|
188
|
-
return
|
|
170
|
+
return getSqlLabelFromString(sql) === 'SQL Select';
|
|
189
171
|
}
|
|
190
172
|
exports.isSelect = isSelect;
|
|
191
|
-
function sqlStrings(event, filter) {
|
|
173
|
+
function sqlStrings(event, appMapIndex, filter) {
|
|
192
174
|
var _a, _b, e, sql, e_1_1;
|
|
193
175
|
var e_1, _c;
|
|
194
176
|
if (filter === void 0) { filter = function () { return true; }; }
|
|
@@ -201,19 +183,19 @@ function sqlStrings(event, filter) {
|
|
|
201
183
|
case 1:
|
|
202
184
|
if (!!_b.done) return [3 /*break*/, 4];
|
|
203
185
|
e = _b.value;
|
|
204
|
-
if (!e.event.
|
|
186
|
+
if (!e.event.sql) {
|
|
205
187
|
return [3 /*break*/, 3];
|
|
206
188
|
}
|
|
207
|
-
if (!filter(e.event)) {
|
|
189
|
+
if (!filter(e.event, appMapIndex)) {
|
|
208
190
|
return [3 /*break*/, 3];
|
|
209
191
|
}
|
|
210
192
|
if (!isSelect(e.event.sqlQuery)) {
|
|
211
193
|
return [3 /*break*/, 3];
|
|
212
194
|
}
|
|
213
|
-
if (!filter(event)) {
|
|
195
|
+
if (!filter(event, appMapIndex)) {
|
|
214
196
|
return [3 /*break*/, 3];
|
|
215
197
|
}
|
|
216
|
-
sql = sqlNormalized(e.event
|
|
198
|
+
sql = appMapIndex.sqlNormalized(e.event);
|
|
217
199
|
return [4 /*yield*/, { event: e.event, sql: sql }];
|
|
218
200
|
case 2:
|
|
219
201
|
_d.sent();
|
|
@@ -237,23 +219,16 @@ function sqlStrings(event, filter) {
|
|
|
237
219
|
});
|
|
238
220
|
}
|
|
239
221
|
exports.sqlStrings = sqlStrings;
|
|
240
|
-
function countJoins(
|
|
241
|
-
|
|
242
|
-
var ast = (0, models_1.buildQueryAST)(normalizedSql);
|
|
243
|
-
var joins_1 = 0;
|
|
244
|
-
if (ast) {
|
|
245
|
-
(0, visit_1.visit)(ast, {
|
|
246
|
-
'map.join': function (node) {
|
|
247
|
-
joins_1 += node.map.length;
|
|
248
|
-
},
|
|
249
|
-
});
|
|
250
|
-
}
|
|
251
|
-
return joins_1;
|
|
252
|
-
}
|
|
253
|
-
catch (_) {
|
|
254
|
-
console.warn("Unable to analyze query \"" + normalizedSql + "\"");
|
|
222
|
+
function countJoins(ast) {
|
|
223
|
+
if (!ast)
|
|
255
224
|
return 0;
|
|
256
|
-
|
|
225
|
+
var joins = 0;
|
|
226
|
+
(0, visit_1.visit)(ast, {
|
|
227
|
+
'map.join': function (node) {
|
|
228
|
+
joins += node.map.length;
|
|
229
|
+
},
|
|
230
|
+
});
|
|
231
|
+
return joins;
|
|
257
232
|
}
|
|
258
233
|
exports.countJoins = countJoins;
|
|
259
234
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/database/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/database/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
3
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
4
|
+
if (!m) return o;
|
|
5
|
+
var i = m.call(o), r, ar = [], e;
|
|
6
|
+
try {
|
|
7
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
8
|
+
}
|
|
9
|
+
catch (error) { e = { error: error }; }
|
|
10
|
+
finally {
|
|
11
|
+
try {
|
|
12
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
13
|
+
}
|
|
14
|
+
finally { if (e) throw e.error; }
|
|
15
|
+
}
|
|
16
|
+
return ar;
|
|
17
|
+
};
|
|
18
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
19
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
20
|
+
if (ar || !(i in from)) {
|
|
21
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
22
|
+
ar[i] = from[i];
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
26
|
+
};
|
|
27
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
|
+
exports.cloneEvent = exports.cloneCodeObject = void 0;
|
|
29
|
+
var models_1 = require("@appland/models");
|
|
30
|
+
function cloneCodeObject(sourceObject) {
|
|
31
|
+
var codeObjects = __spreadArray([
|
|
32
|
+
sourceObject
|
|
33
|
+
], __read(sourceObject.ancestors()), false);
|
|
34
|
+
var currentSourceObject = codeObjects.pop();
|
|
35
|
+
var lastClonedObject;
|
|
36
|
+
while (currentSourceObject) {
|
|
37
|
+
lastClonedObject = new models_1.CodeObject(currentSourceObject.data, lastClonedObject);
|
|
38
|
+
currentSourceObject = codeObjects.pop();
|
|
39
|
+
}
|
|
40
|
+
return lastClonedObject;
|
|
41
|
+
}
|
|
42
|
+
exports.cloneCodeObject = cloneCodeObject;
|
|
43
|
+
// FIXME: These methods should live in @appland/models. Perhaps via Event#clone.
|
|
44
|
+
function cloneEvent(sourceEvent) {
|
|
45
|
+
// We need to clone both the sourceEvent and the 'linkedEvent'. The linkedEvent will be a return
|
|
46
|
+
// if `sourceEvent` is a call and vice versa. Some accessors on the Event will use the linkedEvent
|
|
47
|
+
// as a convienence, so we may run into errors if we don't restore this relationship. For example,
|
|
48
|
+
// accessing `elapsedTime` on a call event will retrieve the value from the associated return
|
|
49
|
+
// event.
|
|
50
|
+
var linkedEvent = new models_1.Event(sourceEvent.linkedEvent);
|
|
51
|
+
var event = new models_1.Event(sourceEvent);
|
|
52
|
+
event.linkedEvent = linkedEvent;
|
|
53
|
+
// The codeObject is used as well so it'll need a clone.
|
|
54
|
+
var codeObject = cloneCodeObject(sourceEvent.codeObject);
|
|
55
|
+
if (codeObject) {
|
|
56
|
+
event.codeObject = codeObject;
|
|
57
|
+
}
|
|
58
|
+
return event;
|
|
59
|
+
}
|
|
60
|
+
exports.cloneEvent = cloneEvent;
|
|
61
|
+
//# sourceMappingURL=eventUtil.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eventUtil.js","sourceRoot":"","sources":["../src/eventUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAoD;AAWpD,SAAgB,eAAe,CAAC,YAAwB;IACtD,IAAM,WAAW;QACf,YAAY;cACR,YAAY,CAAC,SAA2C,EAAE,SAC/D,CAAC;IACF,IAAI,mBAAmB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAC5C,IAAI,gBAAgB,CAAC;IAErB,OAAO,mBAAmB,EAAE;QAC1B,gBAAgB,GAAG,IAAK,mBAAoC,CACzD,mBAAoD,CAAC,IAAI,EAC1D,gBAAgB,CACjB,CAAC;QACF,mBAAmB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;KACzC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAjBD,0CAiBC;AAED,gFAAgF;AAEhF,SAAgB,UAAU,CAAC,WAAkB;IAC3C,gGAAgG;IAChG,kGAAkG;IAClG,kGAAkG;IAClG,6FAA6F;IAC7F,SAAS;IACT,IAAM,WAAW,GAAG,IAAK,cAA0B,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAC7E,IAAM,KAAK,GAAG,IAAK,cAA0B,CAAC,WAAW,CAAC,CAAC;IAC3D,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;IAEhC,wDAAwD;IACxD,IAAM,UAAU,GAAG,eAAe,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC3D,IAAI,UAAU,EAAE;QACd,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;KAC/B;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAjBD,gCAiBC"}
|
|
@@ -77,9 +77,8 @@ var async_1 = require("async");
|
|
|
77
77
|
var src_1 = require("@appland/client/dist/src");
|
|
78
78
|
var appMap_1 = require("./appMap");
|
|
79
79
|
var mapset_1 = require("./mapset");
|
|
80
|
-
var path_1 = require("path");
|
|
81
80
|
var promises_1 = require("fs/promises");
|
|
82
|
-
function default_1(scanResults, appId
|
|
81
|
+
function default_1(scanResults, appId) {
|
|
83
82
|
return __awaiter(this, void 0, void 0, function () {
|
|
84
83
|
var findings, relevantFilePaths, appMapUUIDByFileName, branchCount, commitCount, q, mostFrequent, branch, commit, mapset, uploadData, request;
|
|
85
84
|
return __generator(this, function (_a) {
|
|
@@ -93,7 +92,7 @@ function default_1(scanResults, appId, appmapDir) {
|
|
|
93
92
|
commitCount = {};
|
|
94
93
|
q = (0, async_1.queue)(function (filePath, callback) {
|
|
95
94
|
console.log("Uploading AppMap " + filePath);
|
|
96
|
-
(0, promises_1.readFile)(
|
|
95
|
+
(0, promises_1.readFile)(filePath)
|
|
97
96
|
.then(function (buffer) {
|
|
98
97
|
var _a, _b;
|
|
99
98
|
var appMapStruct = JSON.parse(buffer.toString());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/integration/appland/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2BAA0B;AAC1B,+BAA8B;AAG9B,gDAAqE;AAGrE,mCAAwE;AACxE,mCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/integration/appland/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ function default_1(summary, colorize) {
|
|
|
53
53
|
var matchedStr = summary.summary.numFindings + " finding" + (summary.summary.numFindings === 1 ? '' : 's');
|
|
54
54
|
var colouredMatchedStr = colorize ? chalk_1.default.stderr.magenta(matchedStr) : matchedStr;
|
|
55
55
|
console.log();
|
|
56
|
-
console.log(
|
|
56
|
+
console.log(colouredMatchedStr);
|
|
57
57
|
summarizeFindings(summary.findings)
|
|
58
58
|
.sort(function (a, b) { return a.ruleTitle.localeCompare(b.ruleTitle); })
|
|
59
59
|
.forEach(function (finding) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"summaryReport.js","sourceRoot":"","sources":["../../src/report/summaryReport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAK1B,SAAS,iBAAiB,CAAC,QAAmB;IAC5C,IAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAC,IAAI,EAAE,OAAO;QAC3C,IAAI,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,cAAc,EAAE;YAClB,cAAc,CAAC,YAAY,IAAI,CAAC,CAAC;YACjC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC9C;aAAM;YACL,cAAc,GAAG;gBACf,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,YAAY,EAAE,CAAC;gBACf,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACnB,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC;SACvC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAoC,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED,mBAAyB,OAAoB,EAAE,QAAiB;IAC9D,IAAM,UAAU,GAAM,OAAO,CAAC,OAAO,CAAC,WAAW,iBAC/C,OAAO,CAAC,OAAO,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAC5C,CAAC;IACH,IAAM,kBAAkB,GAAG,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAEpF,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"summaryReport.js","sourceRoot":"","sources":["../../src/report/summaryReport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAK1B,SAAS,iBAAiB,CAAC,QAAmB;IAC5C,IAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAC,IAAI,EAAE,OAAO;QAC3C,IAAI,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,cAAc,EAAE;YAClB,cAAc,CAAC,YAAY,IAAI,CAAC,CAAC;YACjC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC9C;aAAM;YACL,cAAc,GAAG;gBACf,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,YAAY,EAAE,CAAC;gBACf,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACnB,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC;SACvC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAoC,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED,mBAAyB,OAAoB,EAAE,QAAiB;IAC9D,IAAM,UAAU,GAAM,OAAO,CAAC,OAAO,CAAC,WAAW,iBAC/C,OAAO,CAAC,OAAO,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAC5C,CAAC;IACH,IAAM,kBAAkB,GAAG,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAEpF,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAEhC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC;SAChC,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,EAAtC,CAAsC,CAAC;SACtD,OAAO,CAAC,UAAC,OAAO;QACf,IAAM,QAAQ,GAAG,SAAO,OAAO,CAAC,SAAS,UAAK,OAAO,CAAC,MAAM,YAAO,OAAO,CAAC,YAAY,aAAU,CAAC;QAClG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAClE,IAAM,cAAc,GAAG,yBAAI,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAE,IAAI,EAAE,CAAC;QAC7D,cAAc,CAAC,OAAO,CAAC,UAAC,OAAO;YAC7B,IAAM,UAAU,GAAG,SAAO,OAAS,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AApBD,4BAoBC"}
|
package/built/ruleChecker.js
CHANGED
|
@@ -84,6 +84,7 @@ var commandScope_1 = __importDefault(require("./scope/commandScope"));
|
|
|
84
84
|
var sqlTransactionScope_1 = __importDefault(require("./scope/sqlTransactionScope"));
|
|
85
85
|
var checkInstance_1 = __importDefault(require("./checkInstance"));
|
|
86
86
|
var crypto_1 = require("crypto");
|
|
87
|
+
var eventUtil_1 = require("./eventUtil");
|
|
87
88
|
var RuleChecker = /** @class */ (function () {
|
|
88
89
|
function RuleChecker() {
|
|
89
90
|
this.scopes = {
|
|
@@ -94,7 +95,7 @@ var RuleChecker = /** @class */ (function () {
|
|
|
94
95
|
transaction: new sqlTransactionScope_1.default(),
|
|
95
96
|
};
|
|
96
97
|
}
|
|
97
|
-
RuleChecker.prototype.check = function (appMapFile,
|
|
98
|
+
RuleChecker.prototype.check = function (appMapFile, appMapIndex, check, findings) {
|
|
98
99
|
return __awaiter(this, void 0, void 0, function () {
|
|
99
100
|
var scopeIterator, callEvents, _a, _b, scope, checkInstance, _c, _d, event, e_1_1, e_2_1;
|
|
100
101
|
var e_2, _e, e_1, _f;
|
|
@@ -102,22 +103,23 @@ var RuleChecker = /** @class */ (function () {
|
|
|
102
103
|
switch (_g.label) {
|
|
103
104
|
case 0:
|
|
104
105
|
if ((0, util_1.verbose)()) {
|
|
105
|
-
console.warn("Checking AppMap " + appMap.name + " with scope " + check.scope);
|
|
106
|
+
console.warn("Checking AppMap " + appMapIndex.appMap.name + " with scope " + check.scope);
|
|
106
107
|
}
|
|
107
108
|
scopeIterator = this.scopes[check.scope];
|
|
108
109
|
if (!scopeIterator) {
|
|
109
110
|
throw new errors_1.AbortError("Invalid scope name \"" + check.scope + "\"");
|
|
110
111
|
}
|
|
111
112
|
callEvents = function () {
|
|
112
|
-
var i;
|
|
113
|
+
var events, i;
|
|
113
114
|
return __generator(this, function (_a) {
|
|
114
115
|
switch (_a.label) {
|
|
115
116
|
case 0:
|
|
117
|
+
events = appMapIndex.appMap.events;
|
|
116
118
|
i = 0;
|
|
117
119
|
_a.label = 1;
|
|
118
120
|
case 1:
|
|
119
|
-
if (!(i <
|
|
120
|
-
return [4 /*yield*/,
|
|
121
|
+
if (!(i < events.length)) return [3 /*break*/, 4];
|
|
122
|
+
return [4 /*yield*/, events[i]];
|
|
121
123
|
case 2:
|
|
122
124
|
_a.sent();
|
|
123
125
|
_a.label = 3;
|
|
@@ -140,7 +142,7 @@ var RuleChecker = /** @class */ (function () {
|
|
|
140
142
|
console.warn("Scope " + scope.scope);
|
|
141
143
|
}
|
|
142
144
|
checkInstance = new checkInstance_1.default(check);
|
|
143
|
-
if (!check.filterScope(scope.scope,
|
|
145
|
+
if (!check.filterScope(scope.scope, appMapIndex)) {
|
|
144
146
|
return [3 /*break*/, 13];
|
|
145
147
|
}
|
|
146
148
|
if (!checkInstance.enumerateScope) return [3 /*break*/, 11];
|
|
@@ -152,7 +154,7 @@ var RuleChecker = /** @class */ (function () {
|
|
|
152
154
|
case 4:
|
|
153
155
|
if (!!_d.done) return [3 /*break*/, 7];
|
|
154
156
|
event = _d.value;
|
|
155
|
-
return [4 /*yield*/, this.checkEvent(event, scope.scope, appMapFile,
|
|
157
|
+
return [4 /*yield*/, this.checkEvent(event, scope.scope, appMapFile, appMapIndex, checkInstance, findings)];
|
|
156
158
|
case 5:
|
|
157
159
|
_g.sent();
|
|
158
160
|
_g.label = 6;
|
|
@@ -171,7 +173,7 @@ var RuleChecker = /** @class */ (function () {
|
|
|
171
173
|
finally { if (e_1) throw e_1.error; }
|
|
172
174
|
return [7 /*endfinally*/];
|
|
173
175
|
case 10: return [3 /*break*/, 13];
|
|
174
|
-
case 11: return [4 /*yield*/, this.checkEvent(scope.scope, scope.scope, appMapFile,
|
|
176
|
+
case 11: return [4 /*yield*/, this.checkEvent(scope.scope, scope.scope, appMapFile, appMapIndex, checkInstance, findings)];
|
|
175
177
|
case 12:
|
|
176
178
|
_g.sent();
|
|
177
179
|
_g.label = 13;
|
|
@@ -194,7 +196,7 @@ var RuleChecker = /** @class */ (function () {
|
|
|
194
196
|
});
|
|
195
197
|
});
|
|
196
198
|
};
|
|
197
|
-
RuleChecker.prototype.checkEvent = function (event, scope, appMapFile,
|
|
199
|
+
RuleChecker.prototype.checkEvent = function (event, scope, appMapFile, appMapIndex, checkInstance, findings) {
|
|
198
200
|
return __awaiter(this, void 0, void 0, function () {
|
|
199
201
|
var buildFinding, matchResult, numFindings, finding, message, finding;
|
|
200
202
|
return __generator(this, function (_a) {
|
|
@@ -212,7 +214,7 @@ var RuleChecker = /** @class */ (function () {
|
|
|
212
214
|
}
|
|
213
215
|
return [2 /*return*/];
|
|
214
216
|
}
|
|
215
|
-
if (!checkInstance.filterEvent(event,
|
|
217
|
+
if (!checkInstance.filterEvent(event, appMapIndex)) {
|
|
216
218
|
return [2 /*return*/];
|
|
217
219
|
}
|
|
218
220
|
buildFinding = function (matchEvent, message, groupMessage, occurranceCount, relatedEvents) {
|
|
@@ -239,17 +241,17 @@ var RuleChecker = /** @class */ (function () {
|
|
|
239
241
|
checkId: checkInstance.checkId,
|
|
240
242
|
ruleId: checkInstance.ruleId,
|
|
241
243
|
ruleTitle: checkInstance.title,
|
|
242
|
-
event: findingEvent,
|
|
244
|
+
event: (0, eventUtil_1.cloneEvent)(findingEvent),
|
|
243
245
|
hash: hash.digest('hex'),
|
|
244
246
|
stack: stack,
|
|
245
|
-
scope: scope,
|
|
247
|
+
scope: (0, eventUtil_1.cloneEvent)(scope),
|
|
246
248
|
message: message || checkInstance.title,
|
|
247
249
|
groupMessage: groupMessage,
|
|
248
250
|
occurranceCount: occurranceCount,
|
|
249
|
-
relatedEvents: relatedEvents,
|
|
251
|
+
relatedEvents: relatedEvents === null || relatedEvents === void 0 ? void 0 : relatedEvents.map(function (event) { return (0, eventUtil_1.cloneEvent)(event); }),
|
|
250
252
|
};
|
|
251
253
|
};
|
|
252
|
-
return [4 /*yield*/, checkInstance.ruleLogic.matcher(event,
|
|
254
|
+
return [4 /*yield*/, checkInstance.ruleLogic.matcher(event, appMapIndex, checkInstance.filterEvent.bind(checkInstance))];
|
|
253
255
|
case 1:
|
|
254
256
|
matchResult = _a.sent();
|
|
255
257
|
numFindings = findings.length;
|
package/built/ruleChecker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ruleChecker.js","sourceRoot":"","sources":["../src/ruleChecker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,mCAAsC;AAEtC,yCAA2C;AAE3C,gEAA0C;AAC1C,0FAAoE;AACpE,0FAAoE;AACpE,sEAAgD;AAChD,oFAA8D;AAC9D,kEAA4C;AAC5C,iCAAoC;
|
|
1
|
+
{"version":3,"file":"ruleChecker.js","sourceRoot":"","sources":["../src/ruleChecker.ts"],"names":[],"mappings":"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"}
|