@mitre/hdf-converters 2.5.0 → 2.6.2
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/lib/data/aws-config-mapping.json +638 -0
- package/lib/data/cci-nist-mapping.json +3553 -0
- package/lib/data/converters/csv2json.d.ts +1 -0
- package/lib/data/converters/csv2json.js +36 -0
- package/lib/data/converters/csv2json.js.map +1 -0
- package/lib/data/converters/csv2json.ts +36 -0
- package/lib/data/converters/xml2json.d.ts +14 -0
- package/lib/data/converters/xml2json.js +42 -0
- package/lib/data/converters/xml2json.js.map +1 -0
- package/lib/data/converters/xml2json.ts +57 -0
- package/lib/data/cwe-nist-mapping.json +1416 -0
- package/lib/data/nessus-plugins-nist-mapping.json +644 -0
- package/lib/data/nikto-nist-mapping.json +53648 -0
- package/lib/data/owasp-nist-mapping.json +72 -0
- package/lib/data/scoutsuite-nist-mapping.json +558 -0
- package/lib/index.d.ts +3 -0
- package/lib/index.js +3 -0
- package/lib/index.js.map +1 -1
- package/lib/package.json +18 -9
- package/lib/src/asff-mapper.d.ts +15 -0
- package/lib/src/asff-mapper.js +508 -0
- package/lib/src/asff-mapper.js.map +1 -0
- package/lib/src/base-converter.d.ts +3 -7
- package/lib/src/base-converter.js +27 -9
- package/lib/src/base-converter.js.map +1 -1
- package/lib/src/burpsuite-mapper.js +6 -8
- package/lib/src/burpsuite-mapper.js.map +1 -1
- package/lib/src/converters-from-hdf/asff/asff-types.d.ts +88 -0
- package/lib/src/converters-from-hdf/asff/asff-types.js +3 -0
- package/lib/src/converters-from-hdf/asff/asff-types.js.map +1 -0
- package/lib/src/converters-from-hdf/asff/reverse-asff-mapper.d.ts +31 -0
- package/lib/src/converters-from-hdf/asff/reverse-asff-mapper.js +132 -0
- package/lib/src/converters-from-hdf/asff/reverse-asff-mapper.js.map +1 -0
- package/lib/src/converters-from-hdf/asff/transformers.d.ts +44 -0
- package/lib/src/converters-from-hdf/asff/transformers.js +397 -0
- package/lib/src/converters-from-hdf/asff/transformers.js.map +1 -0
- package/lib/src/converters-from-hdf/reverse-base-converter.d.ts +24 -0
- package/lib/src/converters-from-hdf/reverse-base-converter.js +111 -0
- package/lib/src/converters-from-hdf/reverse-base-converter.js.map +1 -0
- package/lib/src/dbprotect-mapper.js +1 -1
- package/lib/src/dbprotect-mapper.js.map +1 -1
- package/lib/src/jfrog-xray-mapper.js +3 -5
- package/lib/src/jfrog-xray-mapper.js.map +1 -1
- package/lib/src/mappings/AwsConfigMapping.d.ts +6 -0
- package/lib/src/mappings/AwsConfigMapping.js +39 -0
- package/lib/src/mappings/AwsConfigMapping.js.map +1 -0
- package/lib/src/mappings/AwsConfigMappingItem.d.ts +7 -0
- package/lib/src/mappings/AwsConfigMappingItem.js +28 -0
- package/lib/src/mappings/AwsConfigMappingItem.js.map +1 -0
- package/lib/src/mappings/CciNistMapping.d.ts +1 -1
- package/lib/src/mappings/CciNistMapping.js +5 -24
- package/lib/src/mappings/CciNistMapping.js.map +1 -1
- package/lib/src/mappings/CweNistMapping.d.ts +8 -1
- package/lib/src/mappings/CweNistMapping.js +4 -27
- package/lib/src/mappings/CweNistMapping.js.map +1 -1
- package/lib/src/mappings/CweNistMappingItem.d.ts +2 -1
- package/lib/src/mappings/CweNistMappingItem.js +9 -9
- package/lib/src/mappings/CweNistMappingItem.js.map +1 -1
- package/lib/src/mappings/NessusPluginsNistMapping.d.ts +7 -1
- package/lib/src/mappings/NessusPluginsNistMapping.js +4 -8
- package/lib/src/mappings/NessusPluginsNistMapping.js.map +1 -1
- package/lib/src/mappings/NessusPluginsNistMappingItem.d.ts +2 -1
- package/lib/src/mappings/NessusPluginsNistMappingItem.js +16 -6
- package/lib/src/mappings/NessusPluginsNistMappingItem.js.map +1 -1
- package/lib/src/mappings/NiktoNistMapping.d.ts +7 -1
- package/lib/src/mappings/NiktoNistMapping.js +4 -8
- package/lib/src/mappings/NiktoNistMapping.js.map +1 -1
- package/lib/src/mappings/NiktoNistMappingItem.d.ts +2 -1
- package/lib/src/mappings/NiktoNistMappingItem.js +7 -7
- package/lib/src/mappings/NiktoNistMappingItem.js.map +1 -1
- package/lib/src/mappings/OwaspNistMapping.d.ts +8 -1
- package/lib/src/mappings/OwaspNistMapping.js +4 -8
- package/lib/src/mappings/OwaspNistMapping.js.map +1 -1
- package/lib/src/mappings/OwaspNistMappingItem.d.ts +2 -1
- package/lib/src/mappings/OwaspNistMappingItem.js +9 -9
- package/lib/src/mappings/OwaspNistMappingItem.js.map +1 -1
- package/lib/src/mappings/ScoutsuiteNistMapping.d.ts +5 -1
- package/lib/src/mappings/ScoutsuiteNistMapping.js +4 -10
- package/lib/src/mappings/ScoutsuiteNistMapping.js.map +1 -1
- package/lib/src/mappings/ScoutsuiteNistMappingItem.d.ts +2 -1
- package/lib/src/mappings/ScoutsuiteNistMappingItem.js +4 -4
- package/lib/src/mappings/ScoutsuiteNistMappingItem.js.map +1 -1
- package/lib/src/nessus-mapper.js +9 -12
- package/lib/src/nessus-mapper.js.map +1 -1
- package/lib/src/netsparker-mapper.js +4 -7
- package/lib/src/netsparker-mapper.js.map +1 -1
- package/lib/src/nikto-mapper.js +1 -3
- package/lib/src/nikto-mapper.js.map +1 -1
- package/lib/src/sarif-mapper.js +1 -3
- package/lib/src/sarif-mapper.js.map +1 -1
- package/lib/src/scoutsuite-mapper.js +2 -4
- package/lib/src/scoutsuite-mapper.js.map +1 -1
- package/lib/src/snyk-mapper.js +2 -7
- package/lib/src/snyk-mapper.js.map +1 -1
- package/lib/src/sonarqube-mapper.d.ts +54 -0
- package/lib/src/sonarqube-mapper.js +196 -0
- package/lib/src/sonarqube-mapper.js.map +1 -0
- package/lib/src/xccdf-results-mapper.js +4 -6
- package/lib/src/xccdf-results-mapper.js.map +1 -1
- package/lib/src/zap-mapper.d.ts +1 -1
- package/lib/src/zap-mapper.js +8 -5
- package/lib/src/zap-mapper.js.map +1 -1
- package/package.json +18 -9
- package/lib/data/U_CCI_List.xml +0 -38403
- package/lib/data/aws-config-mapping.csv +0 -107
- package/lib/data/cwe-nist-mapping.csv +0 -203
- package/lib/data/nessus-plugins-nist-mapping.csv +0 -108
- package/lib/data/nikto-nist-mapping.csv +0 -8942
- package/lib/data/owasp-nist-mapping.csv +0 -11
- package/lib/data/scoutsuite-nist-mapping.csv +0 -140
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.SonarQubeMapper = exports.SonarQubeResults = void 0;
|
|
7
|
+
const axios_1 = __importDefault(require("axios"));
|
|
8
|
+
const inspecjs_1 = require("inspecjs");
|
|
9
|
+
const package_json_1 = require("../package.json");
|
|
10
|
+
const base_converter_1 = require("./base-converter");
|
|
11
|
+
const CweNistMapping_1 = require("./mappings/CweNistMapping");
|
|
12
|
+
const OwaspNistMapping_1 = require("./mappings/OwaspNistMapping");
|
|
13
|
+
const IMPACT_MAPPING = new Map([
|
|
14
|
+
['blocker', 1.0],
|
|
15
|
+
['critical', 0.7],
|
|
16
|
+
['major', 0.5],
|
|
17
|
+
['minor', 0.3],
|
|
18
|
+
['info', 0.0]
|
|
19
|
+
]);
|
|
20
|
+
const CWE_NIST_MAPPING = new CweNistMapping_1.CweNistMapping();
|
|
21
|
+
const OWASP_NIST_MAPPING = new OwaspNistMapping_1.OwaspNistMapping();
|
|
22
|
+
function formatCodeDesc(vulnerability) {
|
|
23
|
+
const typedVulnerability = vulnerability;
|
|
24
|
+
if (typedVulnerability.textRange) {
|
|
25
|
+
const snipHtml = `StartLine: ${typedVulnerability.textRange.startLine}, EndLine: ${typedVulnerability.textRange.endLine}<br>Code:<pre>${typedVulnerability.snip}</pre>`;
|
|
26
|
+
return `Path:${typedVulnerability.component}:${typedVulnerability.textRange.startLine}:${typedVulnerability.textRange.endLine} ${snipHtml}`;
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
return '';
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
function parseNistTags(issue) {
|
|
33
|
+
var _a, _b;
|
|
34
|
+
const tags = [];
|
|
35
|
+
(_a = issue.sysTags) === null || _a === void 0 ? void 0 : _a.forEach((sysTag) => {
|
|
36
|
+
if (sysTag.toLowerCase().startsWith('owasp-')) {
|
|
37
|
+
const identifier = [
|
|
38
|
+
sysTag.toLowerCase().replace('owasp-', '').toUpperCase()
|
|
39
|
+
];
|
|
40
|
+
tags.push(...OWASP_NIST_MAPPING.nistFilterNoDefault(identifier));
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
(_b = issue.summary.match(/CWE-\d\d\d?\d?\d?\d?\d/gi)) === null || _b === void 0 ? void 0 : _b.forEach((match) => {
|
|
44
|
+
tags.push(...CWE_NIST_MAPPING.nistFilter(match.split('-')[1]));
|
|
45
|
+
});
|
|
46
|
+
return tags;
|
|
47
|
+
}
|
|
48
|
+
class SonarQubeResults {
|
|
49
|
+
constructor(sonarQubeHost, projectId, userToken) {
|
|
50
|
+
this.data = {
|
|
51
|
+
issues: []
|
|
52
|
+
};
|
|
53
|
+
this.sonarQubeHost = '';
|
|
54
|
+
this.projectId = '';
|
|
55
|
+
this.userToken = '';
|
|
56
|
+
this.sonarQubeHost = sonarQubeHost;
|
|
57
|
+
this.projectId = projectId;
|
|
58
|
+
this.userToken = userToken;
|
|
59
|
+
}
|
|
60
|
+
async toHdf() {
|
|
61
|
+
return this.getProjectData();
|
|
62
|
+
}
|
|
63
|
+
async getProjectData() {
|
|
64
|
+
var _a, _b;
|
|
65
|
+
let paging = true;
|
|
66
|
+
let page = 1;
|
|
67
|
+
while (paging) {
|
|
68
|
+
await axios_1.default
|
|
69
|
+
.get(`${this.sonarQubeHost}/api/issues/search`, {
|
|
70
|
+
auth: { username: this.userToken, password: '' },
|
|
71
|
+
params: {
|
|
72
|
+
componentKeys: this.projectId,
|
|
73
|
+
types: 'VULNERABILITY',
|
|
74
|
+
p: page
|
|
75
|
+
}
|
|
76
|
+
})
|
|
77
|
+
.then(({ data }) => {
|
|
78
|
+
var _a;
|
|
79
|
+
if (data.issues) {
|
|
80
|
+
this.data.issues.push(...data.issues);
|
|
81
|
+
}
|
|
82
|
+
paging = ((_a = data.paging) === null || _a === void 0 ? void 0 : _a.total) === 100;
|
|
83
|
+
page += 1;
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
let requests = [];
|
|
87
|
+
(_a = this.data.issues) === null || _a === void 0 ? void 0 : _a.forEach((issue) => {
|
|
88
|
+
requests.push(axios_1.default.get(`${this.sonarQubeHost}/api/sources/raw`, {
|
|
89
|
+
auth: { username: this.userToken, password: '' },
|
|
90
|
+
params: {
|
|
91
|
+
key: issue.component
|
|
92
|
+
}
|
|
93
|
+
}));
|
|
94
|
+
});
|
|
95
|
+
await axios_1.default.all(requests).then(axios_1.default.spread((...responses) => {
|
|
96
|
+
responses.forEach((response, index) => {
|
|
97
|
+
var _a, _b;
|
|
98
|
+
this.data.issues[index].snip = response.data
|
|
99
|
+
.split('\n')
|
|
100
|
+
.slice(((_a = this.data.issues[index].textRange) === null || _a === void 0 ? void 0 : _a.startLine) - 3, ((_b = this.data.issues[index].textRange) === null || _b === void 0 ? void 0 : _b.endLine) + 3)
|
|
101
|
+
.join('\n');
|
|
102
|
+
});
|
|
103
|
+
}));
|
|
104
|
+
requests = [];
|
|
105
|
+
(_b = this.data.issues) === null || _b === void 0 ? void 0 : _b.forEach((issue) => {
|
|
106
|
+
requests.push(axios_1.default.get(`${this.sonarQubeHost}/api/rules/show`, {
|
|
107
|
+
auth: { username: this.userToken, password: '' },
|
|
108
|
+
params: {
|
|
109
|
+
key: issue.rule
|
|
110
|
+
}
|
|
111
|
+
}));
|
|
112
|
+
});
|
|
113
|
+
await axios_1.default.all(requests).then(axios_1.default.spread((...responses) => {
|
|
114
|
+
responses.forEach((response, index) => {
|
|
115
|
+
this.data.issues[index].sysTags = response.data.rule.sysTags;
|
|
116
|
+
this.data.issues[index].name = response.data.rule.name;
|
|
117
|
+
this.data.issues[index].summary = response.data.rule.htmlDesc;
|
|
118
|
+
});
|
|
119
|
+
}));
|
|
120
|
+
const result = new SonarQubeMapper(this.data, this.projectId);
|
|
121
|
+
return result.toHdf();
|
|
122
|
+
}
|
|
123
|
+
setMappings(customMapping) {
|
|
124
|
+
this.customMapping = customMapping;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
exports.SonarQubeResults = SonarQubeResults;
|
|
128
|
+
class SonarQubeMapper extends base_converter_1.BaseConverter {
|
|
129
|
+
constructor(issuesJSON, projectName) {
|
|
130
|
+
super(issuesJSON);
|
|
131
|
+
this.projectName = '';
|
|
132
|
+
this.mappings = {
|
|
133
|
+
platform: {
|
|
134
|
+
name: 'Heimdall Tools',
|
|
135
|
+
release: package_json_1.version,
|
|
136
|
+
target_id: this.projectName
|
|
137
|
+
},
|
|
138
|
+
version: package_json_1.version,
|
|
139
|
+
statistics: {
|
|
140
|
+
duration: null
|
|
141
|
+
},
|
|
142
|
+
profiles: [
|
|
143
|
+
{
|
|
144
|
+
name: 'Sonarqube Scan',
|
|
145
|
+
version: '',
|
|
146
|
+
title: `SonarQube Scan of Project ${this.projectName}`,
|
|
147
|
+
maintainer: null,
|
|
148
|
+
summary: `SonarQube Scan of Project ${this.projectName}`,
|
|
149
|
+
license: null,
|
|
150
|
+
copyright: null,
|
|
151
|
+
copyright_email: null,
|
|
152
|
+
supports: [],
|
|
153
|
+
attributes: [],
|
|
154
|
+
depends: [],
|
|
155
|
+
groups: [],
|
|
156
|
+
status: 'loaded',
|
|
157
|
+
controls: [
|
|
158
|
+
{
|
|
159
|
+
path: 'issues',
|
|
160
|
+
key: 'id',
|
|
161
|
+
desc: { path: 'summary' },
|
|
162
|
+
descriptions: [],
|
|
163
|
+
refs: [],
|
|
164
|
+
source_location: {},
|
|
165
|
+
id: { path: 'rule' },
|
|
166
|
+
title: { path: 'name' },
|
|
167
|
+
impact: {
|
|
168
|
+
path: 'severity',
|
|
169
|
+
transformer: (0, base_converter_1.impactMapping)(IMPACT_MAPPING)
|
|
170
|
+
},
|
|
171
|
+
code: null,
|
|
172
|
+
tags: {
|
|
173
|
+
nist: { transformer: parseNistTags }
|
|
174
|
+
},
|
|
175
|
+
results: [
|
|
176
|
+
{
|
|
177
|
+
status: inspecjs_1.ExecJSON.ControlResultStatus.Failed,
|
|
178
|
+
code_desc: { transformer: formatCodeDesc },
|
|
179
|
+
run_time: 0,
|
|
180
|
+
start_time: ''
|
|
181
|
+
}
|
|
182
|
+
]
|
|
183
|
+
}
|
|
184
|
+
],
|
|
185
|
+
sha256: ''
|
|
186
|
+
}
|
|
187
|
+
]
|
|
188
|
+
};
|
|
189
|
+
this.projectName = projectName;
|
|
190
|
+
}
|
|
191
|
+
setMappings(customMappings) {
|
|
192
|
+
super.setMappings(customMappings);
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
exports.SonarQubeMapper = SonarQubeMapper;
|
|
196
|
+
//# sourceMappingURL=sonarqube-mapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sonarqube-mapper.js","sourceRoot":"","sources":["../../src/sonarqube-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ exports.XCCDFResultsMapper = void 0;
|
|
|
7
7
|
const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
|
|
8
8
|
const inspecjs_1 = require("inspecjs");
|
|
9
9
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
|
-
const path_1 = __importDefault(require("path"));
|
|
11
10
|
const package_json_1 = require("../package.json");
|
|
12
11
|
const base_converter_1 = require("./base-converter");
|
|
13
12
|
const CciNistMapping_1 = require("./mappings/CciNistMapping");
|
|
@@ -19,8 +18,7 @@ const IMPACT_MAPPING = new Map([
|
|
|
19
18
|
]);
|
|
20
19
|
const RULE_DESCRIPTION = 'cdf:Rule.cdf:description';
|
|
21
20
|
const CCI_REGEX = /CCI-(\d*)/;
|
|
22
|
-
const
|
|
23
|
-
const CCI_NIST_MAPPING = new CciNistMapping_1.CciNistMapping(CCI_NIST_MAPPING_FILE);
|
|
21
|
+
const CCI_NIST_MAPPING = new CciNistMapping_1.CciNistMapping();
|
|
24
22
|
const DEFAULT_NIST_TAG = ['SA-11', 'RA-5', 'Rev_4'];
|
|
25
23
|
let counter = '';
|
|
26
24
|
function getStatus(file) {
|
|
@@ -102,7 +100,7 @@ class XCCDFResultsMapper extends base_converter_1.BaseConverter {
|
|
|
102
100
|
path: RULE_DESCRIPTION,
|
|
103
101
|
transformer: (input) => {
|
|
104
102
|
if (typeof input === 'string') {
|
|
105
|
-
return base_converter_1.parseHtml(input.split('Satisfies')[0]);
|
|
103
|
+
return (0, base_converter_1.parseHtml)(input.split('Satisfies')[0]);
|
|
106
104
|
}
|
|
107
105
|
else {
|
|
108
106
|
return '';
|
|
@@ -115,7 +113,7 @@ class XCCDFResultsMapper extends base_converter_1.BaseConverter {
|
|
|
115
113
|
path: RULE_DESCRIPTION,
|
|
116
114
|
transformer: (input) => {
|
|
117
115
|
if (typeof input === 'string') {
|
|
118
|
-
return base_converter_1.parseHtml(input);
|
|
116
|
+
return (0, base_converter_1.parseHtml)(input);
|
|
119
117
|
}
|
|
120
118
|
else {
|
|
121
119
|
return '';
|
|
@@ -145,7 +143,7 @@ class XCCDFResultsMapper extends base_converter_1.BaseConverter {
|
|
|
145
143
|
],
|
|
146
144
|
impact: {
|
|
147
145
|
path: 'cdf:Rule.severity',
|
|
148
|
-
transformer: base_converter_1.impactMapping(IMPACT_MAPPING)
|
|
146
|
+
transformer: (0, base_converter_1.impactMapping)(IMPACT_MAPPING)
|
|
149
147
|
},
|
|
150
148
|
refs: [],
|
|
151
149
|
tags: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xccdf-results-mapper.js","sourceRoot":"","sources":["../../src/xccdf-results-mapper.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAqC;AACrC,uCAAkC;AAClC,oDAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"xccdf-results-mapper.js","sourceRoot":"","sources":["../../src/xccdf-results-mapper.ts"],"names":[],"mappings":"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"}
|
package/lib/src/zap-mapper.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { ExecJSON } from 'inspecjs';
|
|
|
2
2
|
import { BaseConverter, ILookupPath, MappedTransform } from './base-converter';
|
|
3
3
|
export declare class ZapMapper extends BaseConverter {
|
|
4
4
|
mappings: MappedTransform<ExecJSON.Execution, ILookupPath>;
|
|
5
|
-
constructor(zapJson: string, name
|
|
5
|
+
constructor(zapJson: string, name?: string);
|
|
6
6
|
setMappings(customMappings: MappedTransform<ExecJSON.Execution, ILookupPath>): void;
|
|
7
7
|
toHdf(): ExecJSON.Execution;
|
|
8
8
|
}
|
package/lib/src/zap-mapper.js
CHANGED
|
@@ -6,15 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.ZapMapper = void 0;
|
|
7
7
|
const inspecjs_1 = require("inspecjs");
|
|
8
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
|
-
const path_1 = __importDefault(require("path"));
|
|
10
9
|
const package_json_1 = require("../package.json");
|
|
11
10
|
const base_converter_1 = require("./base-converter");
|
|
12
11
|
const CweNistMapping_1 = require("./mappings/CweNistMapping");
|
|
13
|
-
const
|
|
14
|
-
const CWE_NIST_MAPPING = new CweNistMapping_1.CweNistMapping(CWE_NIST_MAPPING_FILE);
|
|
12
|
+
const CWE_NIST_MAPPING = new CweNistMapping_1.CweNistMapping();
|
|
15
13
|
const DEFAULT_NIST_TAG = ['SA-11', 'RA-5'];
|
|
16
14
|
function filterSite(input, name) {
|
|
17
|
-
|
|
15
|
+
if (name) {
|
|
16
|
+
return input.find((element) => lodash_1.default.get(element, '@name') === name);
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
return input.reduce((a, b) => lodash_1.default.get(a, 'alerts').length > lodash_1.default.get(b, 'alerts').length ? a : b);
|
|
20
|
+
}
|
|
18
21
|
}
|
|
19
22
|
function impactMapping(input) {
|
|
20
23
|
if (typeof input === 'string') {
|
|
@@ -65,7 +68,7 @@ function deduplicateId(input) {
|
|
|
65
68
|
const controlId = input.map((element) => {
|
|
66
69
|
return lodash_1.default.get(element, 'id');
|
|
67
70
|
});
|
|
68
|
-
const dupId = lodash_1.default(controlId)
|
|
71
|
+
const dupId = (0, lodash_1.default)(controlId)
|
|
69
72
|
.groupBy()
|
|
70
73
|
.pickBy((value) => value.length > 1)
|
|
71
74
|
.keys()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zap-mapper.js","sourceRoot":"","sources":["../../src/zap-mapper.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAkC;AAClC,oDAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"zap-mapper.js","sourceRoot":"","sources":["../../src/zap-mapper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mitre/hdf-converters",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.6.2",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"description": "Converter util library used to transform various scan results into HDF format",
|
|
6
6
|
"files": [
|
|
@@ -16,25 +16,34 @@
|
|
|
16
16
|
"build": "tsc -p ./tsconfig.build.json && cp -R ./data ./lib",
|
|
17
17
|
"lint": "eslint \"**/*.ts\" --fix",
|
|
18
18
|
"lint:ci": "eslint \"**/*.ts\" --max-warnings 0",
|
|
19
|
-
"test": "jest
|
|
19
|
+
"test": "jest",
|
|
20
|
+
"csv2json": "ts-node data/converters/csv2json.ts",
|
|
21
|
+
"xml2json": "ts-node data/converters/xml2json.ts"
|
|
20
22
|
},
|
|
21
23
|
"dependencies": {
|
|
22
|
-
"
|
|
24
|
+
"@types/csv2json": "^1.4.2",
|
|
25
|
+
"@types/xml2js": "^0.4.9",
|
|
26
|
+
"axios": "^0.24.0",
|
|
27
|
+
"csv-parse": "^5.0.1",
|
|
28
|
+
"csv2json": "^2.0.2",
|
|
23
29
|
"fast-xml-parser": "^3.19.0",
|
|
24
|
-
"
|
|
25
|
-
"
|
|
26
|
-
"
|
|
30
|
+
"html-entities": "^2.3.2",
|
|
31
|
+
"htmlparser2": "^7.1.2",
|
|
32
|
+
"inspecjs": "^2.6.2",
|
|
33
|
+
"lodash": "^4.17.21",
|
|
34
|
+
"moment": "^2.29.1",
|
|
35
|
+
"xml2js": "^0.4.23"
|
|
27
36
|
},
|
|
28
37
|
"devDependencies": {
|
|
29
|
-
"@types/jest": "^
|
|
38
|
+
"@types/jest": "^27.0.0",
|
|
30
39
|
"@types/lodash": "^4.14.161",
|
|
31
40
|
"@types/node": "^15.0.1",
|
|
32
|
-
"htmlparser2": "^
|
|
41
|
+
"htmlparser2": "^7.1.2",
|
|
33
42
|
"jest": "^27.0.6",
|
|
34
43
|
"quicktype": "^15.0.260",
|
|
35
44
|
"ts-jest": "^27.0.3",
|
|
36
45
|
"ts-node": "^10.0.0",
|
|
37
|
-
"typedoc": "^0.
|
|
46
|
+
"typedoc": "^0.22.1"
|
|
38
47
|
},
|
|
39
48
|
"jest": {
|
|
40
49
|
"rootDir": ".",
|