@mitre/hdf-converters 2.7.0 → 2.8.1
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 +21 -20
- package/lib/data/converters/xml2json.js +25 -2
- package/lib/data/converters/xml2json.js.map +1 -1
- package/lib/data/converters/xml2json.ts +1 -1
- package/lib/index.d.ts +3 -0
- package/lib/index.js +3 -0
- package/lib/index.js.map +1 -1
- package/lib/package.json +8 -5
- package/lib/src/asff-mapper/asff-mapper.js +94 -74
- package/lib/src/asff-mapper/asff-mapper.js.map +1 -1
- package/lib/src/asff-mapper/case-cms-inspec.js +29 -9
- package/lib/src/asff-mapper/case-cms-inspec.js.map +1 -1
- package/lib/src/asff-mapper/case-firewall-manager.js +25 -5
- package/lib/src/asff-mapper/case-firewall-manager.js.map +1 -1
- package/lib/src/asff-mapper/case-guardduty.js +24 -4
- package/lib/src/asff-mapper/case-guardduty.js.map +1 -1
- package/lib/src/asff-mapper/case-inspector.js +24 -4
- package/lib/src/asff-mapper/case-inspector.js.map +1 -1
- package/lib/src/asff-mapper/case-previously-hdf.js +81 -61
- package/lib/src/asff-mapper/case-previously-hdf.js.map +1 -1
- package/lib/src/asff-mapper/case-prowler.js +26 -6
- package/lib/src/asff-mapper/case-prowler.js.map +1 -1
- package/lib/src/asff-mapper/case-security-hub.js +44 -24
- package/lib/src/asff-mapper/case-security-hub.js.map +1 -1
- package/lib/src/asff-mapper/case-trivy.js +30 -10
- package/lib/src/asff-mapper/case-trivy.js.map +1 -1
- package/lib/src/aws-config-mapper.js +31 -8
- package/lib/src/aws-config-mapper.js.map +1 -1
- package/lib/src/base-converter.d.ts +4 -4
- package/lib/src/base-converter.js +35 -35
- package/lib/src/base-converter.js.map +1 -1
- package/lib/src/burpsuite-mapper.js +31 -11
- package/lib/src/burpsuite-mapper.js.map +1 -1
- package/lib/src/ckl-mapper/checklist-jsonix-converter.d.ts +5 -5
- package/lib/src/ckl-mapper/checklist-jsonix-converter.js +47 -27
- package/lib/src/ckl-mapper/checklist-jsonix-converter.js.map +1 -1
- package/lib/src/ckl-mapper/checklist-mapper.js +2 -5
- package/lib/src/ckl-mapper/checklist-mapper.js.map +1 -1
- package/lib/src/converters-from-hdf/asff/reverse-asff-mapper.d.ts +1 -1
- package/lib/src/converters-from-hdf/asff/reverse-asff-mapper.js +26 -6
- package/lib/src/converters-from-hdf/asff/reverse-asff-mapper.js.map +1 -1
- package/lib/src/converters-from-hdf/asff/transformers.d.ts +1 -1
- package/lib/src/converters-from-hdf/asff/transformers.js +42 -19
- package/lib/src/converters-from-hdf/asff/transformers.js.map +1 -1
- package/lib/src/converters-from-hdf/caat/reverse-caat-mapper.d.ts +31 -0
- package/lib/src/converters-from-hdf/caat/reverse-caat-mapper.js +200 -0
- package/lib/src/converters-from-hdf/caat/reverse-caat-mapper.js.map +1 -0
- package/lib/src/converters-from-hdf/html/html-types.d.ts +74 -0
- package/lib/src/converters-from-hdf/html/html-types.js +3 -0
- package/lib/src/converters-from-hdf/html/html-types.js.map +1 -0
- package/lib/src/converters-from-hdf/html/reverse-html-mapper.d.ts +39 -0
- package/lib/src/converters-from-hdf/html/reverse-html-mapper.js +374 -0
- package/lib/src/converters-from-hdf/html/reverse-html-mapper.js.map +1 -0
- package/lib/src/converters-from-hdf/reverse-any-base-converter.d.ts +1 -1
- package/lib/src/converters-from-hdf/reverse-any-base-converter.js.map +1 -1
- package/lib/src/converters-from-hdf/reverse-base-converter.d.ts +1 -1
- package/lib/src/converters-from-hdf/reverse-base-converter.js +29 -9
- package/lib/src/converters-from-hdf/reverse-base-converter.js.map +1 -1
- package/lib/src/converters-from-hdf/splunk/reverse-splunk-mapper.d.ts +1 -2
- package/lib/src/converters-from-hdf/splunk/reverse-splunk-mapper.js +29 -16
- package/lib/src/converters-from-hdf/splunk/reverse-splunk-mapper.js.map +1 -1
- package/lib/src/converters-from-hdf/xccdf/reverse-xccdf-mapper.js +25 -2
- package/lib/src/converters-from-hdf/xccdf/reverse-xccdf-mapper.js.map +1 -1
- package/lib/src/conveyor-mapper.js +58 -36
- package/lib/src/conveyor-mapper.js.map +1 -1
- package/lib/src/dbprotect-mapper.js +36 -16
- package/lib/src/dbprotect-mapper.js.map +1 -1
- package/lib/src/fortify-mapper.js +50 -30
- package/lib/src/fortify-mapper.js.map +1 -1
- package/lib/src/gosec-mapper.js +26 -6
- package/lib/src/gosec-mapper.js.map +1 -1
- package/lib/src/ionchannel-mapper.js +28 -5
- package/lib/src/ionchannel-mapper.js.map +1 -1
- package/lib/src/jfrog-xray-mapper.js +41 -21
- package/lib/src/jfrog-xray-mapper.js.map +1 -1
- package/lib/src/mappings/AwsConfigMapping.js +24 -4
- package/lib/src/mappings/AwsConfigMapping.js.map +1 -1
- package/lib/src/nessus-mapper.js +70 -50
- package/lib/src/nessus-mapper.js.map +1 -1
- package/lib/src/netsparker-mapper.js +56 -36
- package/lib/src/netsparker-mapper.js.map +1 -1
- package/lib/src/nikto-mapper.js +26 -6
- package/lib/src/nikto-mapper.js.map +1 -1
- package/lib/src/prisma-mapper.d.ts +1 -1
- package/lib/src/prisma-mapper.js +28 -8
- package/lib/src/prisma-mapper.js.map +1 -1
- package/lib/src/sarif-mapper.js +32 -12
- package/lib/src/sarif-mapper.js.map +1 -1
- package/lib/src/scoutsuite-mapper.js +39 -19
- package/lib/src/scoutsuite-mapper.js.map +1 -1
- package/lib/src/snyk-mapper.js +27 -7
- package/lib/src/snyk-mapper.js.map +1 -1
- package/lib/src/sonarqube-mapper.d.ts +2 -2
- package/lib/src/splunk-mapper.d.ts +4 -4
- package/lib/src/splunk-mapper.js +29 -6
- package/lib/src/splunk-mapper.js.map +1 -1
- package/lib/src/twistlock-mapper.js +43 -23
- package/lib/src/twistlock-mapper.js.map +1 -1
- package/lib/src/utils/attestations.d.ts +1 -1
- package/lib/src/utils/attestations.js +31 -8
- package/lib/src/utils/attestations.js.map +1 -1
- package/lib/src/utils/compliance.d.ts +3 -0
- package/lib/src/utils/compliance.js +27 -0
- package/lib/src/utils/compliance.js.map +1 -0
- package/lib/src/utils/fingerprinting.js +27 -7
- package/lib/src/utils/fingerprinting.js.map +1 -1
- package/lib/src/utils/global.d.ts +2 -1
- package/lib/src/utils/global.js +35 -5
- package/lib/src/utils/global.js.map +1 -1
- package/lib/src/utils/splunk-tools.js +26 -3
- package/lib/src/utils/splunk-tools.js.map +1 -1
- package/lib/src/veracode-mapper.js +105 -85
- package/lib/src/veracode-mapper.js.map +1 -1
- package/lib/src/xccdf-results-mapper.js +69 -49
- package/lib/src/xccdf-results-mapper.js.map +1 -1
- package/lib/src/zap-mapper.js +39 -19
- package/lib/src/zap-mapper.js.map +1 -1
- package/lib/types/splunk-config-types.d.ts +1 -1
- package/lib/types/splunk-control-types.d.ts +4 -4
- package/lib/types/splunk-profile-types.d.ts +6 -6
- package/lib/types/splunk-report-types.d.ts +3 -3
- package/package.json +8 -5
package/lib/src/prisma-mapper.js
CHANGED
|
@@ -1,11 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
4
24
|
};
|
|
5
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
26
|
exports.PrismaMapper = exports.PrismaControlMapper = exports.nistTag = void 0;
|
|
7
27
|
const inspecjs_1 = require("inspecjs");
|
|
8
|
-
const
|
|
28
|
+
const _ = __importStar(require("lodash"));
|
|
9
29
|
const package_json_1 = require("../package.json");
|
|
10
30
|
const base_converter_1 = require("./base-converter");
|
|
11
31
|
const global_1 = require("./utils/global");
|
|
@@ -157,10 +177,6 @@ class PrismaControlMapper extends base_converter_1.BaseConverter {
|
|
|
157
177
|
}
|
|
158
178
|
exports.PrismaControlMapper = PrismaControlMapper;
|
|
159
179
|
class PrismaMapper {
|
|
160
|
-
constructor(prismaCsv) {
|
|
161
|
-
this.data = [];
|
|
162
|
-
this.data = (0, base_converter_1.parseCsv)(prismaCsv);
|
|
163
|
-
}
|
|
164
180
|
toHdf() {
|
|
165
181
|
const executions = [];
|
|
166
182
|
const hostnameToControls = {};
|
|
@@ -171,11 +187,15 @@ class PrismaMapper {
|
|
|
171
187
|
});
|
|
172
188
|
Object.entries(hostnameToControls).forEach(([hostname, controls]) => {
|
|
173
189
|
const converted = new PrismaControlMapper(controls).toHdf();
|
|
174
|
-
|
|
190
|
+
_.set(converted, 'platform.target_id', hostname);
|
|
175
191
|
executions.push(converted);
|
|
176
192
|
});
|
|
177
193
|
return executions;
|
|
178
194
|
}
|
|
195
|
+
constructor(prismaCsv) {
|
|
196
|
+
this.data = [];
|
|
197
|
+
this.data = (0, base_converter_1.parseCsv)(prismaCsv);
|
|
198
|
+
}
|
|
179
199
|
}
|
|
180
200
|
exports.PrismaMapper = PrismaMapper;
|
|
181
201
|
//# sourceMappingURL=prisma-mapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prisma-mapper.js","sourceRoot":"","sources":["../../src/prisma-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prisma-mapper.js","sourceRoot":"","sources":["../../src/prisma-mapper.ts"],"names":[],"mappings":"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"}
|
package/lib/src/sarif-mapper.js
CHANGED
|
@@ -1,11 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
4
24
|
};
|
|
5
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
26
|
exports.SarifMapper = void 0;
|
|
7
27
|
const inspecjs_1 = require("inspecjs");
|
|
8
|
-
const
|
|
28
|
+
const _ = __importStar(require("lodash"));
|
|
9
29
|
const package_json_1 = require("../package.json");
|
|
10
30
|
const base_converter_1 = require("./base-converter");
|
|
11
31
|
const CweNistMapping_1 = require("./mappings/CweNistMapping");
|
|
@@ -34,9 +54,9 @@ function impactMapping(severity) {
|
|
|
34
54
|
}
|
|
35
55
|
function formatCodeDesc(input) {
|
|
36
56
|
const output = [];
|
|
37
|
-
output.push(`URL : ${
|
|
38
|
-
output.push(`LINE : ${
|
|
39
|
-
output.push(`COLUMN : ${
|
|
57
|
+
output.push(`URL : ${_.get(input, 'artifactLocation.uri')}`);
|
|
58
|
+
output.push(`LINE : ${_.get(input, 'region.startLine')}`);
|
|
59
|
+
output.push(`COLUMN : ${_.get(input, 'region.startColumn')}`);
|
|
40
60
|
return output.join(' ');
|
|
41
61
|
}
|
|
42
62
|
function nistTag(text) {
|
|
@@ -83,9 +103,9 @@ class SarifMapper extends base_converter_1.BaseConverter {
|
|
|
83
103
|
refs: [],
|
|
84
104
|
source_location: {
|
|
85
105
|
transformer: (control) => {
|
|
86
|
-
return
|
|
87
|
-
ref:
|
|
88
|
-
line:
|
|
106
|
+
return _.omitBy({
|
|
107
|
+
ref: _.get(control, 'locations[0].physicalLocation.artifactLocation.uri'),
|
|
108
|
+
line: _.get(control, 'locations[0].physicalLocation.region.startLine')
|
|
89
109
|
}, (value) => value === '');
|
|
90
110
|
}
|
|
91
111
|
},
|
|
@@ -133,16 +153,16 @@ class SarifMapper extends base_converter_1.BaseConverter {
|
|
|
133
153
|
],
|
|
134
154
|
passthrough: {
|
|
135
155
|
transformer: (data) => {
|
|
136
|
-
let runsData =
|
|
156
|
+
let runsData = _.get(data, 'runs');
|
|
137
157
|
if (Array.isArray(runsData)) {
|
|
138
|
-
runsData = runsData.map((run) =>
|
|
158
|
+
runsData = runsData.map((run) => _.omit(run, ['results']));
|
|
139
159
|
}
|
|
140
160
|
return {
|
|
141
161
|
auxiliary_data: [
|
|
142
162
|
{
|
|
143
163
|
name: 'SARIF',
|
|
144
164
|
data: {
|
|
145
|
-
$schema:
|
|
165
|
+
$schema: _.get(data, '$schema'),
|
|
146
166
|
runs: runsData
|
|
147
167
|
}
|
|
148
168
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sarif-mapper.js","sourceRoot":"","sources":["../../src/sarif-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sarif-mapper.js","sourceRoot":"","sources":["../../src/sarif-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
4
24
|
};
|
|
5
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
26
|
exports.ScoutsuiteMapper = void 0;
|
|
7
27
|
const inspecjs_1 = require("inspecjs");
|
|
8
|
-
const
|
|
28
|
+
const _ = __importStar(require("lodash"));
|
|
9
29
|
const package_json_1 = require("../package.json");
|
|
10
30
|
const base_converter_1 = require("./base-converter");
|
|
11
31
|
const ScoutsuiteNistMapping_1 = require("./mappings/ScoutsuiteNistMapping");
|
|
@@ -25,18 +45,18 @@ const IMPACT_MAPPING = new Map([
|
|
|
25
45
|
]);
|
|
26
46
|
const SCOUTSUITE_NIST_MAPPING = new ScoutsuiteNistMapping_1.ScoutsuiteNistMapping();
|
|
27
47
|
function getRulesetName(file) {
|
|
28
|
-
return
|
|
48
|
+
return _.get(file, 'last_run.ruleset_name');
|
|
29
49
|
}
|
|
30
50
|
function formatTargetId(file) {
|
|
31
|
-
return `${getRulesetName(file)} ruleset:${
|
|
51
|
+
return `${getRulesetName(file)} ruleset:${_.get(file, 'provider_name')}:${_.get(file, 'account_id')}`;
|
|
32
52
|
}
|
|
33
53
|
function formatTitle(file) {
|
|
34
|
-
return `Scout Suite Report using ${getRulesetName(file)} ruleset on ${
|
|
54
|
+
return `Scout Suite Report using ${getRulesetName(file)} ruleset on ${_.get(file, 'provider_name')} with account ${_.get(file, 'account_id')}`;
|
|
35
55
|
}
|
|
36
56
|
function compliance(input) {
|
|
37
57
|
if (Array.isArray(input)) {
|
|
38
58
|
return input
|
|
39
|
-
.map((element) => `Compliant with ${
|
|
59
|
+
.map((element) => `Compliant with ${_.get(element, 'name')}, reference ${_.get(element, 'reference')}, version ${_.get(element, 'version')}`)
|
|
40
60
|
.join('\n');
|
|
41
61
|
}
|
|
42
62
|
else {
|
|
@@ -44,10 +64,10 @@ function compliance(input) {
|
|
|
44
64
|
}
|
|
45
65
|
}
|
|
46
66
|
function getStatus(input) {
|
|
47
|
-
if (
|
|
67
|
+
if (_.get(input, 'checked_items') === 0) {
|
|
48
68
|
return inspecjs_1.ExecJSON.ControlResultStatus.Skipped;
|
|
49
69
|
}
|
|
50
|
-
else if (
|
|
70
|
+
else if (_.get(input, 'flagged_items') === 0) {
|
|
51
71
|
return inspecjs_1.ExecJSON.ControlResultStatus.Passed;
|
|
52
72
|
}
|
|
53
73
|
else {
|
|
@@ -55,7 +75,7 @@ function getStatus(input) {
|
|
|
55
75
|
}
|
|
56
76
|
}
|
|
57
77
|
function checkSkip(input) {
|
|
58
|
-
if (
|
|
78
|
+
if (_.get(input, 'checked_items') === 0) {
|
|
59
79
|
return 'Skipped because no items were checked';
|
|
60
80
|
}
|
|
61
81
|
else {
|
|
@@ -63,14 +83,14 @@ function checkSkip(input) {
|
|
|
63
83
|
}
|
|
64
84
|
}
|
|
65
85
|
function getMessage(input) {
|
|
66
|
-
if (
|
|
86
|
+
if (_.get(input, 'checked_items') === 0) {
|
|
67
87
|
return '';
|
|
68
88
|
}
|
|
69
|
-
else if (
|
|
70
|
-
return `0 flagged items out of ${
|
|
89
|
+
else if (_.get(input, 'flagged_items') === 0) {
|
|
90
|
+
return `0 flagged items out of ${_.get(input, 'checked_items')} checked items`;
|
|
71
91
|
}
|
|
72
92
|
else {
|
|
73
|
-
return `${
|
|
93
|
+
return `${_.get(input, 'flagged_items')} flagged items out of ${_.get(input, 'checked_items')} checked items:\n${_.get(input, 'items').join('\n')}`;
|
|
74
94
|
}
|
|
75
95
|
}
|
|
76
96
|
function nistTag(rule) {
|
|
@@ -83,10 +103,10 @@ function checkArray(input) {
|
|
|
83
103
|
return input.join(', ');
|
|
84
104
|
}
|
|
85
105
|
function collapseServices(file) {
|
|
86
|
-
const services = Object.values(
|
|
106
|
+
const services = Object.values(_.get(file, 'services'));
|
|
87
107
|
const findings = [];
|
|
88
108
|
services.forEach((element) => {
|
|
89
|
-
findings.push(
|
|
109
|
+
findings.push(_.get(element, 'findings'));
|
|
90
110
|
});
|
|
91
111
|
const entries = [];
|
|
92
112
|
Object.values(findings).forEach((element) => {
|
|
@@ -94,7 +114,7 @@ function collapseServices(file) {
|
|
|
94
114
|
entries.push(subElement);
|
|
95
115
|
});
|
|
96
116
|
});
|
|
97
|
-
|
|
117
|
+
_.set(file, 'services', entries);
|
|
98
118
|
return file;
|
|
99
119
|
}
|
|
100
120
|
class ScoutsuiteMapper extends base_converter_1.BaseConverter {
|
|
@@ -248,7 +268,7 @@ class ScoutsuiteMapper extends base_converter_1.BaseConverter {
|
|
|
248
268
|
],
|
|
249
269
|
passthrough: {
|
|
250
270
|
transformer: (data) => {
|
|
251
|
-
const auxData =
|
|
271
|
+
const auxData = _.omit(data, [
|
|
252
272
|
'account_id',
|
|
253
273
|
'environment',
|
|
254
274
|
'partition',
|
|
@@ -256,7 +276,7 @@ class ScoutsuiteMapper extends base_converter_1.BaseConverter {
|
|
|
256
276
|
'provider_name',
|
|
257
277
|
'services'
|
|
258
278
|
]);
|
|
259
|
-
auxData.last_run =
|
|
279
|
+
auxData.last_run = _.pick(auxData.last_run, ['summary']);
|
|
260
280
|
return {
|
|
261
281
|
auxiliary_data: auxData,
|
|
262
282
|
...(this.withRaw && { raw: data })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scoutsuite-mapper.js","sourceRoot":"","sources":["../../src/scoutsuite-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scoutsuite-mapper.js","sourceRoot":"","sources":["../../src/scoutsuite-mapper.ts"],"names":[],"mappings":"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"}
|
package/lib/src/snyk-mapper.js
CHANGED
|
@@ -1,11 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
4
24
|
};
|
|
5
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
26
|
exports.SnykMapper = exports.SnykResults = void 0;
|
|
7
27
|
const inspecjs_1 = require("inspecjs");
|
|
8
|
-
const
|
|
28
|
+
const _ = __importStar(require("lodash"));
|
|
9
29
|
const package_json_1 = require("../package.json");
|
|
10
30
|
const base_converter_1 = require("./base-converter");
|
|
11
31
|
const CweNistMapping_1 = require("./mappings/CweNistMapping");
|
|
@@ -78,10 +98,10 @@ class SnykMapper extends base_converter_1.BaseConverter {
|
|
|
78
98
|
name: 'Snyk Scan',
|
|
79
99
|
title: {
|
|
80
100
|
transformer: (data) => {
|
|
81
|
-
const projectName =
|
|
82
|
-
? `Snyk Project: ${
|
|
101
|
+
const projectName = _.has(data, 'projectName')
|
|
102
|
+
? `Snyk Project: ${_.get(data, 'projectName')} `
|
|
83
103
|
: '';
|
|
84
|
-
return `${projectName}Snyk Path: ${
|
|
104
|
+
return `${projectName}Snyk Path: ${_.get(data, 'path')}`;
|
|
85
105
|
}
|
|
86
106
|
},
|
|
87
107
|
maintainer: null,
|
|
@@ -154,7 +174,7 @@ class SnykMapper extends base_converter_1.BaseConverter {
|
|
|
154
174
|
passthrough: {
|
|
155
175
|
snyk_metadata: {
|
|
156
176
|
transformer: (data) => {
|
|
157
|
-
return
|
|
177
|
+
return _.omit(data, ['vulnerabilities']);
|
|
158
178
|
}
|
|
159
179
|
}
|
|
160
180
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snyk-mapper.js","sourceRoot":"","sources":["../../src/snyk-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"snyk-mapper.js","sourceRoot":"","sources":["../../src/snyk-mapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAkC;AAClC,0CAA4B;AAC5B,kDAAgE;AAChE,qDAK0B;AAC1B,8DAAyD;AACzD,2CAGwB;AAExB,MAAM,cAAc,GAAwB,IAAI,GAAG,CAAC;IAClD,CAAC,MAAM,EAAE,GAAG,CAAC;IACb,CAAC,QAAQ,EAAE,GAAG,CAAC;IACf,CAAC,KAAK,EAAE,GAAG,CAAC;CACb,CAAC,CAAC;AACH,MAAM,gBAAgB,GAAG,IAAI,+BAAc,EAAE,CAAC;AAE9C,MAAM,QAAQ,GAAG,iBAAiB,CAAC;AAEnC,SAAS,eAAe,CAAC,WAAgC;IACvD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,WAAW,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAC3D,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnC,OAAO,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;KACf;SAAM;QACL,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AACD,SAAS,OAAO,CAAC,WAAsB;IACrC,OAAO,gBAAgB,CAAC,UAAU,CAChC,eAAe,CAAC,WAAW,CAAC,EAC5B,+CAAsC,CACvC,CAAC;AACJ,CAAC;AAED,MAAa,WAAW;IAGtB,YAAY,QAAgB;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,KAAK;QACH,MAAM,OAAO,GAAyB,EAAE,CAAC;QACzC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC5B,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;gBACtC,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;oBACpC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;iBACvC;gBACD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;YACH,OAAO,OAAO,CAAC;SAChB;aAAM;YACL,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;gBACpC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aACxC;YACD,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC;SACvB;IACH,CAAC;CACF;AA1BD,kCA0BC;AAED,MAAa,UAAW,SAAQ,8BAAa;IAsG3C,YAAY,QAAiC;QAC3C,KAAK,CAAC,QAAQ,CAAC,CAAC;QAtGlB,aAAQ,GAGJ;YACF,QAAQ,EAAE;gBACR,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,sBAAoB;gBAC7B,SAAS,EAAE,EAAC,IAAI,EAAE,aAAa,EAAC;aACjC;YACD,OAAO,EAAE,sBAAoB;YAC7B,UAAU,EAAE;gBACV,QAAQ,EAAE,IAAI;aACf;YACD,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,WAAW;oBACjB,KAAK,EAAE;wBACL,WAAW,EAAE,CAAC,IAA6B,EAAU,EAAE;4BACrD,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC;gCAC5C,CAAC,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG;gCAChD,CAAC,CAAC,EAAE,CAAC;4BACP,OAAO,GAAG,WAAW,cAAc,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;wBAC3D,CAAC;qBACF;oBACD,UAAU,EAAE,IAAI;oBAChB,OAAO,EAAE;wBACP,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,CAAC,OAAe,EAAU,EAAE;4BACvC,OAAO,iBAAiB,OAAO,EAAE,CAAC;wBACpC,CAAC;qBACF;oBACD,OAAO,EAAE,IAAI;oBACb,SAAS,EAAE,IAAI;oBACf,eAAe,EAAE,IAAI;oBACrB,QAAQ,EAAE,EAAE;oBACZ,UAAU,EAAE,EAAE;oBACd,OAAO,EAAE,EAAE;oBACX,MAAM,EAAE,EAAE;oBACV,MAAM,EAAE,QAAQ;oBAChB,QAAQ,EAAE;wBACR;4BACE,IAAI,EAAE,iBAAiB;4BACvB,GAAG,EAAE,IAAI;4BACT,IAAI,EAAE;gCACJ,GAAG,EAAE;oCACH,IAAI,EAAE,QAAQ;oCACd,WAAW,EAAE,CAAC,GAAc,EAAE,EAAE,CAC9B,IAAA,2BAAkB,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC;iCACnC;gCACD,IAAI,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAC;gCAC5C,KAAK,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAC;gCACrD,KAAK,EAAE,EAAC,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,eAAe,EAAC;gCAC9D,MAAM,EAAE,EAAC,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,eAAe,EAAC;6BACjE;4BACD,YAAY,EAAE,EAAE;4BAChB,IAAI,EAAE,EAAE;4BACR,eAAe,EAAE,EAAE;4BACnB,KAAK,EAAE,EAAC,IAAI,EAAE,OAAO,EAAC;4BACtB,EAAE,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC;4BAChB,IAAI,EAAE,EAAC,IAAI,EAAE,aAAa,EAAC;4BAC3B,MAAM,EAAE;gCACN,IAAI,EAAE,UAAU;gCAChB,WAAW,EAAE,IAAA,8BAAa,EAAC,cAAc,CAAC;6BAC3C;4BACD,IAAI,EAAE;gCACJ,WAAW,EAAE,CAAC,aAAsC,EAAU,EAAE;oCAC9D,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;gCAChD,CAAC;6BACF;4BACD,OAAO,EAAE;gCACP;oCACE,MAAM,EAAE,mBAAQ,CAAC,mBAAmB,CAAC,MAAM;oCAC3C,SAAS,EAAE;wCACT,IAAI,EAAE,MAAM;wCACZ,WAAW,EAAE,CAAC,KAAc,EAAU,EAAE;4CACtC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gDACxB,OAAO,YAAY,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;6CAC1C;iDAAM;gDACL,OAAO,EAAE,CAAC;6CACX;wCACH,CAAC;qCACF;oCACD,QAAQ,EAAE,CAAC;oCACX,UAAU,EAAE,EAAE;iCACf;6BACF;yBACF;qBACF;oBACD,MAAM,EAAE,EAAE;iBACX;aACF;YACD,WAAW,EAAE;gBACX,aAAa,EAAE;oBACb,WAAW,EAAE,CACX,IAA6B,EACJ,EAAE;wBAC3B,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;oBAC3C,CAAC;iBACF;aACF;SACF,CAAC;IAGF,CAAC;CACF;AAzGD,gCAyGC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ExecJSON } from 'inspecjs';
|
|
2
2
|
import { BaseConverter, ILookupPath, MappedTransform } from './base-converter';
|
|
3
|
-
export
|
|
3
|
+
export type Issue = {
|
|
4
4
|
key: string;
|
|
5
5
|
rule: string;
|
|
6
6
|
severity: string;
|
|
@@ -25,7 +25,7 @@ export declare type Issue = {
|
|
|
25
25
|
sysTags?: string[];
|
|
26
26
|
name?: string;
|
|
27
27
|
};
|
|
28
|
-
export
|
|
28
|
+
export type IssueData = {
|
|
29
29
|
total?: number;
|
|
30
30
|
p?: number;
|
|
31
31
|
ps?: number;
|
|
@@ -3,15 +3,15 @@ import { ExecJSON } from 'inspecjs';
|
|
|
3
3
|
import { Logger } from 'winston';
|
|
4
4
|
import { SplunkConfig } from '../types/splunk-config-types';
|
|
5
5
|
import { SplunkReport } from '../types/splunk-report-types';
|
|
6
|
-
export
|
|
6
|
+
export type Hash<T> = {
|
|
7
7
|
[key: string]: T;
|
|
8
8
|
};
|
|
9
|
-
export
|
|
10
|
-
export
|
|
9
|
+
export type SplunkConfigNoIndex = Omit<SplunkConfig, 'index'>;
|
|
10
|
+
export type GenericPayloadWithMetaData = {
|
|
11
11
|
meta: FileMetaData;
|
|
12
12
|
[key: string]: never[] | Record<string, unknown>;
|
|
13
13
|
};
|
|
14
|
-
export
|
|
14
|
+
export type FileMetaData = {
|
|
15
15
|
guid: string;
|
|
16
16
|
subtype: string;
|
|
17
17
|
hdf_splunk_schema: string;
|
package/lib/src/splunk-mapper.js
CHANGED
|
@@ -1,11 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
29
|
exports.SplunkMapper = exports.replaceKeyValueDescriptions = exports.consolidatePayloads = exports.mapHash = exports.groupBy = void 0;
|
|
7
30
|
const axios_1 = __importDefault(require("axios"));
|
|
8
|
-
const
|
|
31
|
+
const _ = __importStar(require("lodash"));
|
|
9
32
|
const global_1 = require("./utils/global");
|
|
10
33
|
const splunk_tools_1 = require("./utils/splunk-tools");
|
|
11
34
|
const MAPPER_NAME = 'Splunk2HDF';
|
|
@@ -106,7 +129,7 @@ class SplunkMapper {
|
|
|
106
129
|
const errorCode = (0, splunk_tools_1.handleSplunkErrorResponse)(error);
|
|
107
130
|
throw new Error(`Failed to create search job - ${errorCode}`);
|
|
108
131
|
}
|
|
109
|
-
if (
|
|
132
|
+
if (_.has(jobSID, ['data', 'sid'])) {
|
|
110
133
|
return jobSID.data.sid;
|
|
111
134
|
}
|
|
112
135
|
else {
|
|
@@ -140,7 +163,7 @@ class SplunkMapper {
|
|
|
140
163
|
clearInterval(awaitJob);
|
|
141
164
|
throw new Error(`Failed search job - ${(0, splunk_tools_1.handleSplunkErrorResponse)(error)}`);
|
|
142
165
|
}
|
|
143
|
-
if (
|
|
166
|
+
if (_.has(queryStatus, 'data.entry[0].content')) {
|
|
144
167
|
if (queryStatus.data.entry.length !== 1) {
|
|
145
168
|
clearTimeout(queryTimer);
|
|
146
169
|
clearInterval(awaitJob);
|
|
@@ -192,10 +215,10 @@ class SplunkMapper {
|
|
|
192
215
|
throw new Error('Unable to parse file. Have you configured EVENT_BREAKER? See https://github.com/mitre/saf/wiki/Splunk-Configuration');
|
|
193
216
|
}
|
|
194
217
|
try {
|
|
195
|
-
|
|
218
|
+
_.set(object, 'meta.parse_time', unixTimeToDate(value[indexTimeIndex]).toISOString());
|
|
196
219
|
}
|
|
197
220
|
catch {
|
|
198
|
-
|
|
221
|
+
_.set(object, 'meta.parse_time', new Date().toISOString());
|
|
199
222
|
}
|
|
200
223
|
objects.push(object);
|
|
201
224
|
}
|
|
@@ -217,7 +240,7 @@ class SplunkMapper {
|
|
|
217
240
|
catch (error) {
|
|
218
241
|
throw new Error(`Failed search job - ${(0, splunk_tools_1.handleSplunkErrorResponse)(error)}`);
|
|
219
242
|
}
|
|
220
|
-
if (
|
|
243
|
+
if (_.has(queryJob, ['data'])) {
|
|
221
244
|
return this.parseSplunkResponse(query, queryJob.data);
|
|
222
245
|
}
|
|
223
246
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"splunk-mapper.js","sourceRoot":"","sources":["../../src/splunk-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"splunk-mapper.js","sourceRoot":"","sources":["../../src/splunk-mapper.ts"],"names":[],"mappings":"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"}
|