@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
|
@@ -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.FortifyMapper = 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");
|
|
@@ -14,39 +34,39 @@ const DEFAULT_NIST_TAG = [];
|
|
|
14
34
|
function impactMapping(input, id) {
|
|
15
35
|
if (Array.isArray(input)) {
|
|
16
36
|
const matches = input.find((element) => {
|
|
17
|
-
return
|
|
37
|
+
return _.get(element, 'ClassInfo.ClassID') === id;
|
|
18
38
|
});
|
|
19
|
-
return parseFloat(
|
|
39
|
+
return parseFloat(_.get(matches, 'ClassInfo.DefaultSeverity')) / 5;
|
|
20
40
|
}
|
|
21
41
|
else {
|
|
22
|
-
return parseFloat(
|
|
42
|
+
return parseFloat(_.get(input, 'ClassInfo.DefaultSeverity')) / 5;
|
|
23
43
|
}
|
|
24
44
|
}
|
|
25
45
|
function nistTag(rule) {
|
|
26
|
-
let references =
|
|
46
|
+
let references = _.get(rule, 'References.Reference');
|
|
27
47
|
if (!Array.isArray(references)) {
|
|
28
48
|
references = [references];
|
|
29
49
|
}
|
|
30
50
|
if (Array.isArray(references)) {
|
|
31
51
|
const tag = references.find((element) => {
|
|
32
|
-
return
|
|
52
|
+
return _.get(element, 'Author') === NIST_REFERENCE_NAME;
|
|
33
53
|
});
|
|
34
54
|
if (tag === null || tag === undefined) {
|
|
35
55
|
return DEFAULT_NIST_TAG;
|
|
36
56
|
}
|
|
37
57
|
else {
|
|
38
|
-
return
|
|
58
|
+
return _.get(tag, 'Title').match(/[a-zA-Z][a-zA-Z]-\d{1,2}/);
|
|
39
59
|
}
|
|
40
60
|
}
|
|
41
61
|
return [];
|
|
42
62
|
}
|
|
43
63
|
function processEntry(input) {
|
|
44
64
|
const output = [];
|
|
45
|
-
output.push(`${
|
|
46
|
-
output.push(`\nPath: ${
|
|
47
|
-
output.push(`StartLine: ${
|
|
48
|
-
output.push(`EndLine: ${
|
|
49
|
-
output.push(`Code:\n${
|
|
65
|
+
output.push(`${_.get(input, 'id')}<=SNIPPET`);
|
|
66
|
+
output.push(`\nPath: ${_.get(input, 'File')}\n`);
|
|
67
|
+
output.push(`StartLine: ${_.get(input, 'StartLine')}, `);
|
|
68
|
+
output.push(`EndLine: ${_.get(input, 'EndLine')}\n`);
|
|
69
|
+
output.push(`Code:\n${_.get(input, 'Text').trim()}`);
|
|
50
70
|
return output.join('');
|
|
51
71
|
}
|
|
52
72
|
function makeArray(input) {
|
|
@@ -60,24 +80,24 @@ function makeArray(input) {
|
|
|
60
80
|
function filterVuln(input, file) {
|
|
61
81
|
input.forEach((element) => {
|
|
62
82
|
if (element instanceof Object) {
|
|
63
|
-
|
|
64
|
-
const codedesc =
|
|
83
|
+
_.set(element, 'results', _.get(element, 'results').filter((result) => {
|
|
84
|
+
const codedesc = _.get(result, 'code_desc').split('<=SNIPPET');
|
|
65
85
|
const snippetid = codedesc[0];
|
|
66
|
-
const classid =
|
|
67
|
-
|
|
86
|
+
const classid = _.get(element, 'id');
|
|
87
|
+
_.set(result, 'code_desc', codedesc[1]);
|
|
68
88
|
let isMatch = false;
|
|
69
|
-
const matches =
|
|
70
|
-
return
|
|
89
|
+
const matches = _.get(file, 'FVDL.Vulnerabilities.Vulnerability').filter((subElement) => {
|
|
90
|
+
return _.get(subElement, 'ClassInfo.ClassID') === classid;
|
|
71
91
|
});
|
|
72
92
|
matches.forEach((match) => {
|
|
73
|
-
const traces = makeArray(
|
|
93
|
+
const traces = makeArray(_.get(match, 'AnalysisInfo.Unified.Trace'));
|
|
74
94
|
traces.forEach((trace) => {
|
|
75
|
-
const entries = makeArray(
|
|
95
|
+
const entries = makeArray(_.get(trace, 'Primary.Entry'));
|
|
76
96
|
const filteredEntries = entries.filter((entry) => {
|
|
77
|
-
return
|
|
97
|
+
return _.has(entry, 'Node.SourceLocation.snippet');
|
|
78
98
|
});
|
|
79
99
|
filteredEntries.forEach((entry) => {
|
|
80
|
-
if (
|
|
100
|
+
if (_.get(entry, 'Node.SourceLocation.snippet') === snippetid) {
|
|
81
101
|
isMatch = true;
|
|
82
102
|
}
|
|
83
103
|
});
|
|
@@ -85,7 +105,7 @@ function filterVuln(input, file) {
|
|
|
85
105
|
});
|
|
86
106
|
return isMatch;
|
|
87
107
|
}));
|
|
88
|
-
|
|
108
|
+
_.set(element, 'impact', impactMapping(_.get(element, 'impact'), _.get(element, 'id')));
|
|
89
109
|
}
|
|
90
110
|
return element;
|
|
91
111
|
});
|
|
@@ -148,7 +168,7 @@ class FortifyMapper extends base_converter_1.BaseConverter {
|
|
|
148
168
|
start_time: {
|
|
149
169
|
path: '$.FVDL.CreatedTS',
|
|
150
170
|
transformer: (input) => {
|
|
151
|
-
return `${
|
|
171
|
+
return `${_.get(input, 'date')} ${_.get(input, 'time')}`;
|
|
152
172
|
}
|
|
153
173
|
}
|
|
154
174
|
}
|
|
@@ -160,9 +180,9 @@ class FortifyMapper extends base_converter_1.BaseConverter {
|
|
|
160
180
|
],
|
|
161
181
|
passthrough: {
|
|
162
182
|
transformer: (data) => {
|
|
163
|
-
let auxData =
|
|
164
|
-
if (
|
|
165
|
-
auxData =
|
|
183
|
+
let auxData = _.get(data, 'FVDL');
|
|
184
|
+
if (_.isObject(auxData)) {
|
|
185
|
+
auxData = _.omit(auxData, [
|
|
166
186
|
'CreatedTS',
|
|
167
187
|
'UUID',
|
|
168
188
|
'Description',
|
|
@@ -181,7 +201,7 @@ class FortifyMapper extends base_converter_1.BaseConverter {
|
|
|
181
201
|
}
|
|
182
202
|
}
|
|
183
203
|
};
|
|
184
|
-
this.startTime = `${
|
|
204
|
+
this.startTime = `${_.get(this.data, 'FVDL.CreatedTS.date')} ${_.get(this.data, 'FVDL.CreatedTS.time')}`;
|
|
185
205
|
this.withRaw = withRaw;
|
|
186
206
|
}
|
|
187
207
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fortify-mapper.js","sourceRoot":"","sources":["../../src/fortify-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fortify-mapper.js","sourceRoot":"","sources":["../../src/fortify-mapper.ts"],"names":[],"mappings":"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"}
|
package/lib/src/gosec-mapper.js
CHANGED
|
@@ -1,22 +1,42 @@
|
|
|
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.GoSecMapper = 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");
|
|
12
32
|
const CWE_NIST_MAPPING = new CweNistMapping_1.CweNistMapping();
|
|
13
33
|
const DEFAULT_NIST_TAG = ['SI-2', 'RA-5'];
|
|
14
34
|
function nistTag(input) {
|
|
15
|
-
const cwe = [`${
|
|
35
|
+
const cwe = [`${_.get(input, 'id')}`];
|
|
16
36
|
return CWE_NIST_MAPPING.nistFilter(cwe, DEFAULT_NIST_TAG);
|
|
17
37
|
}
|
|
18
38
|
function formatMessage(input) {
|
|
19
|
-
return `${
|
|
39
|
+
return `${_.get(input, 'file')}, line:${_.get(input, 'line')}, column:${_.get(input, 'column')}`;
|
|
20
40
|
}
|
|
21
41
|
class GoSecMapper extends base_converter_1.BaseConverter {
|
|
22
42
|
constructor(gosecJson, withRaw = false) {
|
|
@@ -29,7 +49,7 @@ class GoSecMapper extends base_converter_1.BaseConverter {
|
|
|
29
49
|
{
|
|
30
50
|
name: 'Gosec',
|
|
31
51
|
data: {
|
|
32
|
-
'Golang errors':
|
|
52
|
+
'Golang errors': _.get(data, 'Golang errors')
|
|
33
53
|
}
|
|
34
54
|
}
|
|
35
55
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gosec-mapper.js","sourceRoot":"","sources":["../../src/gosec-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gosec-mapper.js","sourceRoot":"","sources":["../../src/gosec-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -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.IonChannelMapper = exports.IonChannelAPIMapper = void 0;
|
|
7
30
|
const axios_1 = __importDefault(require("axios"));
|
|
8
|
-
const
|
|
31
|
+
const _ = __importStar(require("lodash"));
|
|
9
32
|
const package_json_1 = require("../package.json");
|
|
10
33
|
const base_converter_1 = require("./base-converter");
|
|
11
34
|
const global_1 = require("./utils/global");
|
|
@@ -41,8 +64,8 @@ function preprocessIonChannelData(ionchannelData) {
|
|
|
41
64
|
}
|
|
42
65
|
};
|
|
43
66
|
const parsed = JSON.parse(ionchannelData);
|
|
44
|
-
const scanSummaries =
|
|
45
|
-
result.metadata =
|
|
67
|
+
const scanSummaries = _.get(parsed, 'scan_summaries');
|
|
68
|
+
result.metadata = _.omit(parsed, 'scan_summaries');
|
|
46
69
|
if (!Array.isArray(scanSummaries)) {
|
|
47
70
|
throw new Error(`Ion Channel scan_summaries invalid summary data (expecting array, got ${typeof scanSummaries})`);
|
|
48
71
|
}
|
|
@@ -207,13 +230,13 @@ class IonChannelMapper extends base_converter_1.BaseConverter {
|
|
|
207
230
|
transformer: (dependency) => {
|
|
208
231
|
return Array.isArray(dependency.dependencies)
|
|
209
232
|
? {
|
|
210
|
-
...
|
|
233
|
+
..._.omit(dependency, 'dependencies'),
|
|
211
234
|
nist: global_1.DEFAULT_INFORMATION_SYSTEM_COMPONENT_MANAGEMENT_NIST_TAGS,
|
|
212
235
|
cci: (0, global_1.getCCIsForNISTTags)(global_1.DEFAULT_INFORMATION_SYSTEM_COMPONENT_MANAGEMENT_NIST_TAGS),
|
|
213
236
|
dependencies: dependency.dependencies.map((subDependency) => `${subDependency.name}`)
|
|
214
237
|
}
|
|
215
238
|
: {
|
|
216
|
-
...
|
|
239
|
+
..._.omit(dependency, 'dependencies'),
|
|
217
240
|
nist: global_1.DEFAULT_INFORMATION_SYSTEM_COMPONENT_MANAGEMENT_NIST_TAGS,
|
|
218
241
|
cci: (0, global_1.getCCIsForNISTTags)(global_1.DEFAULT_INFORMATION_SYSTEM_COMPONENT_MANAGEMENT_NIST_TAGS)
|
|
219
242
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ionchannel-mapper.js","sourceRoot":"","sources":["../../src/ionchannel-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ionchannel-mapper.js","sourceRoot":"","sources":["../../src/ionchannel-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.JfrogXrayMapper = 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");
|
|
@@ -18,22 +38,22 @@ const IMPACT_MAPPING = new Map([
|
|
|
18
38
|
const CWE_PATH = 'component_versions.more_details.cves[0].cwe';
|
|
19
39
|
const CWE_NIST_MAPPING = new CweNistMapping_1.CweNistMapping();
|
|
20
40
|
function hashId(vulnerability) {
|
|
21
|
-
if (
|
|
22
|
-
return (0, base_converter_1.generateHash)(
|
|
41
|
+
if (_.get(vulnerability, 'id') === '') {
|
|
42
|
+
return (0, base_converter_1.generateHash)(_.get(vulnerability, 'summary').toString(), 'md5');
|
|
23
43
|
}
|
|
24
44
|
else {
|
|
25
|
-
return
|
|
45
|
+
return _.get(vulnerability, 'id');
|
|
26
46
|
}
|
|
27
47
|
}
|
|
28
48
|
function formatDesc(vulnerability) {
|
|
29
49
|
const text = [];
|
|
30
|
-
if (
|
|
31
|
-
text.push(
|
|
50
|
+
if (_.has(vulnerability, 'description')) {
|
|
51
|
+
text.push(_.get(vulnerability, 'description').toString());
|
|
32
52
|
}
|
|
33
|
-
if (
|
|
53
|
+
if (_.has(vulnerability, 'cves')) {
|
|
34
54
|
const re1 = /":/gi;
|
|
35
55
|
const re2 = /,/gi;
|
|
36
|
-
text.push(`cves: ${JSON.stringify(
|
|
56
|
+
text.push(`cves: ${JSON.stringify(_.get(vulnerability, 'cves'))
|
|
37
57
|
.replace(re1, '"=>')
|
|
38
58
|
.replace(re2, ', ')}`);
|
|
39
59
|
}
|
|
@@ -42,32 +62,32 @@ function formatDesc(vulnerability) {
|
|
|
42
62
|
function formatCodeDesc(vulnerability) {
|
|
43
63
|
const codeDescArray = [];
|
|
44
64
|
const re = /,/gi;
|
|
45
|
-
if (
|
|
46
|
-
codeDescArray.push(`source_comp_id : ${
|
|
65
|
+
if (_.has(vulnerability, 'source_comp_id')) {
|
|
66
|
+
codeDescArray.push(`source_comp_id : ${_.get(vulnerability, 'source_comp_id')}`);
|
|
47
67
|
}
|
|
48
68
|
else {
|
|
49
69
|
codeDescArray.push('source_comp_id : ');
|
|
50
70
|
}
|
|
51
|
-
if (
|
|
52
|
-
codeDescArray.push(`vulnerable_versions : ${JSON.stringify(
|
|
71
|
+
if (_.has(vulnerability, 'component_versions.vulnerable_versions')) {
|
|
72
|
+
codeDescArray.push(`vulnerable_versions : ${JSON.stringify(_.get(vulnerability, 'component_versions.vulnerable_versions'))}`);
|
|
53
73
|
}
|
|
54
74
|
else {
|
|
55
75
|
codeDescArray.push('vulnerable_versions : ');
|
|
56
76
|
}
|
|
57
|
-
if (
|
|
58
|
-
codeDescArray.push(`fixed_versions : ${JSON.stringify(
|
|
77
|
+
if (_.has(vulnerability, 'component_versions.fixed_versions')) {
|
|
78
|
+
codeDescArray.push(`fixed_versions : ${JSON.stringify(_.get(vulnerability, 'component_versions.fixed_versions'))}`);
|
|
59
79
|
}
|
|
60
80
|
else {
|
|
61
81
|
codeDescArray.push('fixed_versions : ');
|
|
62
82
|
}
|
|
63
|
-
if (
|
|
64
|
-
codeDescArray.push(`issue_type : ${
|
|
83
|
+
if (_.has(vulnerability, 'issue_type')) {
|
|
84
|
+
codeDescArray.push(`issue_type : ${_.get(vulnerability, 'issue_type')}`);
|
|
65
85
|
}
|
|
66
86
|
else {
|
|
67
87
|
codeDescArray.push('issue_type : ');
|
|
68
88
|
}
|
|
69
|
-
if (
|
|
70
|
-
codeDescArray.push(`provider : ${
|
|
89
|
+
if (_.has(vulnerability, 'provider')) {
|
|
90
|
+
codeDescArray.push(`provider : ${_.get(vulnerability, 'provider')}`);
|
|
71
91
|
}
|
|
72
92
|
else {
|
|
73
93
|
codeDescArray.push('provider : ');
|
|
@@ -154,7 +174,7 @@ class JfrogXrayMapper extends base_converter_1.BaseConverter {
|
|
|
154
174
|
auxiliary_data: [
|
|
155
175
|
{
|
|
156
176
|
name: 'JFrog Xray',
|
|
157
|
-
data:
|
|
177
|
+
data: _.pick(data, ['total_count'])
|
|
158
178
|
}
|
|
159
179
|
],
|
|
160
180
|
...(this.withRaw && { raw: data })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jfrog-xray-mapper.js","sourceRoot":"","sources":["../../src/jfrog-xray-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jfrog-xray-mapper.js","sourceRoot":"","sources":["../../src/jfrog-xray-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,30 @@
|
|
|
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.AwsConfigMapping = void 0;
|
|
7
|
-
const
|
|
27
|
+
const _ = __importStar(require("lodash"));
|
|
8
28
|
const AwsConfigMappingData_1 = require("./AwsConfigMappingData");
|
|
9
29
|
class AwsConfigMapping {
|
|
10
30
|
constructor() {
|
|
@@ -38,7 +58,7 @@ class AwsConfigMapping {
|
|
|
38
58
|
}
|
|
39
59
|
});
|
|
40
60
|
});
|
|
41
|
-
return
|
|
61
|
+
return _.uniq(matches);
|
|
42
62
|
}
|
|
43
63
|
}
|
|
44
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsConfigMapping.js","sourceRoot":"","sources":["../../../src/mappings/AwsConfigMapping.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AwsConfigMapping.js","sourceRoot":"","sources":["../../../src/mappings/AwsConfigMapping.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA4B;AAC5B,iEAAoE;AAEpE,MAAa,gBAAgB;IAI3B;QAHA,8BAAyB,GAA6B,EAAE,CAAC;QACzD,0CAAqC,GAA6B,EAAE,CAAC;QAGnE,2BAAoB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACvC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,iBAAiB,CAAC;gBACvD,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAChC,IAAI,CAAC,qCAAqC,CACxC,OAAO,CAAC,6BAA6B,CACtC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,WAAqB;QAC9B,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,OAAO,EAAE,CAAC;SACX;aAAM;YACL,IAAI,OAAO,GAAa,EAAE,CAAC;YAC3B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,OAAO,CACpD,CAAC,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,EAAE;gBAChC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;oBACjC,IACE,UAAU,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAClE;wBACA,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;qBACpC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CACF,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC,OAAO,CAChE,CAAC,CAAC,6BAA6B,EAAE,QAAQ,CAAC,EAAE,EAAE;gBAC5C,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;oBACjC,IACE,UAAU;yBACP,WAAW,EAAE;yBACb,QAAQ,CAAC,6BAA6B,CAAC,WAAW,EAAE,CAAC,EACxD;wBACA,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;qBACpC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CACF,CAAC;YACF,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;IACH,CAAC;CACF;AA/CD,4CA+CC"}
|