@mitre/hdf-converters 2.6.5 → 2.6.6
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/package.json +3 -3
- package/lib/src/base-converter.d.ts +4 -3
- package/lib/src/base-converter.js +37 -7
- package/lib/src/base-converter.js.map +1 -1
- package/lib/src/burpsuite-mapper.js +1 -10
- package/lib/src/burpsuite-mapper.js.map +1 -1
- package/lib/src/dbprotect-mapper.js +1 -10
- package/lib/src/dbprotect-mapper.js.map +1 -1
- package/lib/src/fortify-mapper.js +1 -10
- package/lib/src/fortify-mapper.js.map +1 -1
- package/lib/src/nessus-mapper.js +1 -10
- package/lib/src/nessus-mapper.js.map +1 -1
- package/lib/src/netsparker-mapper.js +1 -10
- package/lib/src/netsparker-mapper.js.map +1 -1
- package/lib/src/xccdf-results-mapper.js +292 -89
- package/lib/src/xccdf-results-mapper.js.map +1 -1
- package/package.json +3 -3
package/lib/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mitre/hdf-converters",
|
|
3
|
-
"version": "2.6.
|
|
3
|
+
"version": "2.6.6",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"description": "Converter util library used to transform various scan results into HDF format",
|
|
6
6
|
"files": [
|
|
@@ -27,10 +27,10 @@
|
|
|
27
27
|
"axios": "^0.24.0",
|
|
28
28
|
"csv-parse": "^5.0.1",
|
|
29
29
|
"csv2json": "^2.0.2",
|
|
30
|
-
"fast-xml-parser": "^3.
|
|
30
|
+
"fast-xml-parser": "^3.21.1",
|
|
31
31
|
"html-entities": "^2.3.2",
|
|
32
32
|
"htmlparser2": "^7.1.2",
|
|
33
|
-
"inspecjs": "^2.6.
|
|
33
|
+
"inspecjs": "^2.6.6",
|
|
34
34
|
"lodash": "^4.17.21",
|
|
35
35
|
"moment": "^2.29.1",
|
|
36
36
|
"xml2js": "^0.4.23"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ExecJSON } from 'inspecjs';
|
|
2
2
|
export interface ILookupPath {
|
|
3
|
-
path?: string;
|
|
3
|
+
path?: string | string[];
|
|
4
4
|
transformer?: (value: any) => unknown;
|
|
5
5
|
arrayTransformer?: (value: unknown[], file: any) => unknown[];
|
|
6
6
|
key?: string;
|
|
@@ -16,6 +16,7 @@ export declare type MappedReform<T, U> = {
|
|
|
16
16
|
};
|
|
17
17
|
export declare function generateHash(data: string, algorithm?: string): string;
|
|
18
18
|
export declare function parseHtml(input: unknown): string;
|
|
19
|
+
export declare function parseXml(xml: string): Record<string, unknown>;
|
|
19
20
|
export declare function impactMapping(mapping: Map<string, number>): (severity: unknown) => number;
|
|
20
21
|
export declare class BaseConverter {
|
|
21
22
|
data: Record<string, unknown>;
|
|
@@ -30,6 +31,6 @@ export declare class BaseConverter {
|
|
|
30
31
|
convertInternal<T>(file: Record<string, unknown>, fields: T): MappedReform<T, ILookupPath>;
|
|
31
32
|
evaluate<T extends object>(file: Record<string, unknown>, v: Array<T> | T): T | Array<T> | MappedReform<T, ILookupPath>;
|
|
32
33
|
handleArray<T extends object>(file: Record<string, unknown>, v: Array<T & ILookupPath>): Array<T>;
|
|
33
|
-
handlePath(file: Record<string, unknown>, path: string): unknown;
|
|
34
|
-
hasPath(file: Record<string, unknown>, path: string): boolean;
|
|
34
|
+
handlePath(file: Record<string, unknown>, path: string | string[]): unknown;
|
|
35
|
+
hasPath(file: Record<string, unknown>, path: string | string[]): boolean;
|
|
35
36
|
}
|
|
@@ -22,8 +22,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
22
22
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
23
|
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
exports.BaseConverter = exports.impactMapping = exports.parseHtml = exports.generateHash = void 0;
|
|
25
|
+
exports.BaseConverter = exports.impactMapping = exports.parseXml = exports.parseHtml = exports.generateHash = void 0;
|
|
26
26
|
const crypto_1 = require("crypto");
|
|
27
|
+
const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
|
|
27
28
|
const htmlparser = __importStar(require("htmlparser2"));
|
|
28
29
|
const lodash_1 = __importDefault(require("lodash"));
|
|
29
30
|
function generateHash(data, algorithm = 'sha256') {
|
|
@@ -45,6 +46,15 @@ function parseHtml(input) {
|
|
|
45
46
|
return textData.join('');
|
|
46
47
|
}
|
|
47
48
|
exports.parseHtml = parseHtml;
|
|
49
|
+
function parseXml(xml) {
|
|
50
|
+
const options = {
|
|
51
|
+
attributeNamePrefix: '',
|
|
52
|
+
textNodeName: 'text',
|
|
53
|
+
ignoreAttributes: false
|
|
54
|
+
};
|
|
55
|
+
return fast_xml_parser_1.default.parse(xml, options);
|
|
56
|
+
}
|
|
57
|
+
exports.parseXml = parseXml;
|
|
48
58
|
function impactMapping(mapping) {
|
|
49
59
|
return (severity) => {
|
|
50
60
|
if (typeof severity === 'string' || typeof severity === 'number') {
|
|
@@ -214,20 +224,40 @@ class BaseConverter {
|
|
|
214
224
|
}
|
|
215
225
|
}
|
|
216
226
|
handlePath(file, path) {
|
|
217
|
-
|
|
218
|
-
|
|
227
|
+
let pathArray;
|
|
228
|
+
if (typeof path === 'string') {
|
|
229
|
+
pathArray = [path];
|
|
219
230
|
}
|
|
220
231
|
else {
|
|
221
|
-
|
|
232
|
+
pathArray = path;
|
|
233
|
+
}
|
|
234
|
+
const index = lodash_1.default.findIndex(pathArray, (p) => this.hasPath(file, p));
|
|
235
|
+
if (index === -1) {
|
|
236
|
+
return '';
|
|
237
|
+
}
|
|
238
|
+
else if (pathArray[index].startsWith('$.')) {
|
|
239
|
+
return lodash_1.default.get(this.data, pathArray[index].slice(2)) || '';
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
return lodash_1.default.get(file, pathArray[index]) || '';
|
|
222
243
|
}
|
|
223
244
|
}
|
|
224
245
|
hasPath(file, path) {
|
|
225
|
-
|
|
226
|
-
|
|
246
|
+
let pathArray;
|
|
247
|
+
if (typeof path === 'string') {
|
|
248
|
+
pathArray = [path];
|
|
227
249
|
}
|
|
228
250
|
else {
|
|
229
|
-
|
|
251
|
+
pathArray = path;
|
|
230
252
|
}
|
|
253
|
+
return lodash_1.default.some(pathArray, (p) => {
|
|
254
|
+
if (p.startsWith('$.')) {
|
|
255
|
+
return lodash_1.default.has(this.data, p.slice(2));
|
|
256
|
+
}
|
|
257
|
+
else {
|
|
258
|
+
return lodash_1.default.has(file, p);
|
|
259
|
+
}
|
|
260
|
+
});
|
|
231
261
|
}
|
|
232
262
|
}
|
|
233
263
|
exports.BaseConverter = BaseConverter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-converter.js","sourceRoot":"","sources":["../../src/base-converter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAkC;AAClC,wDAA0C;AAE1C,oDAAuB;AA8BvB,SAAgB,YAAY,CAAC,IAAY,EAAE,SAAS,GAAG,QAAQ;IAC7D,MAAM,IAAI,GAAG,IAAA,mBAAU,EAAC,SAAS,CAAC,CAAC;IACnC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACzC,CAAC;AAHD,oCAGC;AAED,SAAgB,SAAS,CAAC,KAAc;IACtC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC;QACrC,MAAM,CAAC,IAAY;YACjB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;KACF,CAAC,CAAC;IACH,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtB,QAAQ,CAAC,GAAG,EAAE,CAAC;KAChB;IACD,OAAO,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC3B,CAAC;AAZD,8BAYC;
|
|
1
|
+
{"version":3,"file":"base-converter.js","sourceRoot":"","sources":["../../src/base-converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.BurpSuiteMapper = void 0;
|
|
7
|
-
const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
|
|
8
7
|
const inspecjs_1 = require("inspecjs");
|
|
9
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
9
|
const package_json_1 = require("../package.json");
|
|
@@ -61,17 +60,9 @@ function nistTag(input) {
|
|
|
61
60
|
cwe = cwe.map((x) => x.split(':')[0]);
|
|
62
61
|
return CWE_NIST_MAPPING.nistFilter(cwe, DEFAULT_NIST_TAG).concat(['Rev_4']);
|
|
63
62
|
}
|
|
64
|
-
function parseXml(xml) {
|
|
65
|
-
const options = {
|
|
66
|
-
attributeNamePrefix: '',
|
|
67
|
-
textNodeName: 'text',
|
|
68
|
-
ignoreAttributes: false
|
|
69
|
-
};
|
|
70
|
-
return fast_xml_parser_1.default.parse(xml, options);
|
|
71
|
-
}
|
|
72
63
|
class BurpSuiteMapper extends base_converter_1.BaseConverter {
|
|
73
64
|
constructor(burpsXml) {
|
|
74
|
-
super(parseXml(burpsXml));
|
|
65
|
+
super((0, base_converter_1.parseXml)(burpsXml));
|
|
75
66
|
this.mappings = {
|
|
76
67
|
platform: {
|
|
77
68
|
name: 'Heimdall Tools',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"burpsuite-mapper.js","sourceRoot":"","sources":["../../src/burpsuite-mapper.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"burpsuite-mapper.js","sourceRoot":"","sources":["../../src/burpsuite-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DBProtectMapper = void 0;
|
|
7
|
-
const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
|
|
8
7
|
const inspecjs_1 = require("inspecjs");
|
|
9
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
9
|
const package_json_1 = require("../package.json");
|
|
@@ -15,14 +14,6 @@ const IMPACT_MAPPING = new Map([
|
|
|
15
14
|
['low', 0.3],
|
|
16
15
|
['informational', 0]
|
|
17
16
|
]);
|
|
18
|
-
function parseXml(xml) {
|
|
19
|
-
const options = {
|
|
20
|
-
attributeNamePrefix: '',
|
|
21
|
-
textNodeName: 'text',
|
|
22
|
-
ignoreAttributes: false
|
|
23
|
-
};
|
|
24
|
-
return fast_xml_parser_1.default.parse(xml, options);
|
|
25
|
-
}
|
|
26
17
|
function compileFindings(input) {
|
|
27
18
|
const keys = lodash_1.default.get(input, 'dataset.metadata.item');
|
|
28
19
|
const findings = lodash_1.default.get(input, 'dataset.data.row');
|
|
@@ -98,7 +89,7 @@ function idToString(id) {
|
|
|
98
89
|
}
|
|
99
90
|
class DBProtectMapper extends base_converter_1.BaseConverter {
|
|
100
91
|
constructor(dbProtectXml) {
|
|
101
|
-
super(compileFindings(parseXml(dbProtectXml)));
|
|
92
|
+
super(compileFindings((0, base_converter_1.parseXml)(dbProtectXml)));
|
|
102
93
|
this.mappings = {
|
|
103
94
|
platform: {
|
|
104
95
|
name: 'Heimdall Tools',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbprotect-mapper.js","sourceRoot":"","sources":["../../src/dbprotect-mapper.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dbprotect-mapper.js","sourceRoot":"","sources":["../../src/dbprotect-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,21 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.FortifyMapper = void 0;
|
|
7
|
-
const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
|
|
8
7
|
const inspecjs_1 = require("inspecjs");
|
|
9
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
9
|
const package_json_1 = require("../package.json");
|
|
11
10
|
const base_converter_1 = require("./base-converter");
|
|
12
11
|
const NIST_REFERENCE_NAME = 'Standards Mapping - NIST Special Publication 800-53 Revision 4';
|
|
13
12
|
const DEFAULT_NIST_TAG = ['unmapped', 'Rev_4'];
|
|
14
|
-
function parseXml(xml) {
|
|
15
|
-
const options = {
|
|
16
|
-
attributeNamePrefix: '',
|
|
17
|
-
textNodeName: 'text',
|
|
18
|
-
ignoreAttributes: false
|
|
19
|
-
};
|
|
20
|
-
return fast_xml_parser_1.default.parse(xml, options);
|
|
21
|
-
}
|
|
22
13
|
function impactMapping(input, id) {
|
|
23
14
|
if (Array.isArray(input)) {
|
|
24
15
|
const matches = input.find((element) => {
|
|
@@ -103,7 +94,7 @@ function filterVuln(input, file) {
|
|
|
103
94
|
}
|
|
104
95
|
class FortifyMapper extends base_converter_1.BaseConverter {
|
|
105
96
|
constructor(fvdl) {
|
|
106
|
-
super(parseXml(fvdl));
|
|
97
|
+
super((0, base_converter_1.parseXml)(fvdl));
|
|
107
98
|
this.mappings = {
|
|
108
99
|
platform: {
|
|
109
100
|
name: 'Heimdall Tools',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fortify-mapper.js","sourceRoot":"","sources":["../../src/fortify-mapper.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"fortify-mapper.js","sourceRoot":"","sources":["../../src/fortify-mapper.ts"],"names":[],"mappings":"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"}
|
package/lib/src/nessus-mapper.js
CHANGED
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.NessusMapper = exports.NessusResults = void 0;
|
|
7
|
-
const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
|
|
8
7
|
const inspecjs_1 = require("inspecjs");
|
|
9
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
9
|
const package_json_1 = require("../package.json");
|
|
@@ -26,14 +25,6 @@ const NA_PLUGIN_OUTPUT = 'This Nessus Plugin does not provide output message.';
|
|
|
26
25
|
const NESSUS_PLUGINS_NIST_MAPPING = new NessusPluginsNistMapping_1.NessusPluginsNistMapping();
|
|
27
26
|
const CCI_NIST_MAPPING = new CciNistMapping_1.CciNistMapping();
|
|
28
27
|
const DEFAULT_NIST_TAG = ['unmapped'];
|
|
29
|
-
function parseXml(xml) {
|
|
30
|
-
const options = {
|
|
31
|
-
attributeNamePrefix: '',
|
|
32
|
-
textNodeName: 'text',
|
|
33
|
-
ignoreAttributes: false
|
|
34
|
-
};
|
|
35
|
-
return fast_xml_parser_1.default.parse(xml, options);
|
|
36
|
-
}
|
|
37
28
|
let policyName;
|
|
38
29
|
let version;
|
|
39
30
|
function getPolicyName() {
|
|
@@ -189,7 +180,7 @@ function cleanData(control) {
|
|
|
189
180
|
}
|
|
190
181
|
class NessusResults {
|
|
191
182
|
constructor(nessusXml) {
|
|
192
|
-
this.data = parseXml(nessusXml);
|
|
183
|
+
this.data = (0, base_converter_1.parseXml)(nessusXml);
|
|
193
184
|
}
|
|
194
185
|
toHdf() {
|
|
195
186
|
const results = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nessus-mapper.js","sourceRoot":"","sources":["../../src/nessus-mapper.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"nessus-mapper.js","sourceRoot":"","sources":["../../src/nessus-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.NetsparkerMapper = void 0;
|
|
7
|
-
const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
|
|
8
7
|
const inspecjs_1 = require("inspecjs");
|
|
9
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
9
|
const package_json_1 = require("../package.json");
|
|
@@ -22,14 +21,6 @@ const IMPACT_MAPPING = new Map([
|
|
|
22
21
|
const CWE_NIST_MAPPING = new CweNistMapping_1.CweNistMapping();
|
|
23
22
|
const OWASP_NIST_MAPPING = new OwaspNistMapping_1.OwaspNistMapping();
|
|
24
23
|
const DEFAULT_NIST_TAG = ['SA-11', 'RA-5'];
|
|
25
|
-
function parseXml(xml) {
|
|
26
|
-
const options = {
|
|
27
|
-
attributeNamePrefix: '',
|
|
28
|
-
textNodeName: 'text',
|
|
29
|
-
ignoreAttributes: false
|
|
30
|
-
};
|
|
31
|
-
return fast_xml_parser_1.default.parse(xml, options);
|
|
32
|
-
}
|
|
33
24
|
function nistTag(classification) {
|
|
34
25
|
let cweTag = lodash_1.default.get(classification, 'cwe');
|
|
35
26
|
if (!Array.isArray(cweTag)) {
|
|
@@ -136,7 +127,7 @@ function formatMessage(response) {
|
|
|
136
127
|
}
|
|
137
128
|
class NetsparkerMapper extends base_converter_1.BaseConverter {
|
|
138
129
|
constructor(netsparkerXml) {
|
|
139
|
-
super(parseXml(netsparkerXml));
|
|
130
|
+
super((0, base_converter_1.parseXml)(netsparkerXml));
|
|
140
131
|
this.mappings = {
|
|
141
132
|
platform: {
|
|
142
133
|
name: 'Heimdall Tools',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"netsparker-mapper.js","sourceRoot":"","sources":["../../src/netsparker-mapper.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"netsparker-mapper.js","sourceRoot":"","sources":["../../src/netsparker-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
2
21
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
22
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
23
|
};
|
|
5
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
25
|
exports.XCCDFResultsMapper = void 0;
|
|
7
26
|
const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
|
|
27
|
+
const htmlparser = __importStar(require("htmlparser2"));
|
|
8
28
|
const inspecjs_1 = require("inspecjs");
|
|
9
29
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
30
|
const package_json_1 = require("../package.json");
|
|
@@ -16,25 +36,113 @@ const IMPACT_MAPPING = new Map([
|
|
|
16
36
|
['medium', 0.5],
|
|
17
37
|
['low', 0.3]
|
|
18
38
|
]);
|
|
19
|
-
const RULE_DESCRIPTION = 'cdf:Rule.cdf:description';
|
|
20
|
-
const CCI_REGEX = /CCI-(\d*)/;
|
|
21
39
|
const CCI_NIST_MAPPING = new CciNistMapping_1.CciNistMapping();
|
|
22
40
|
const DEFAULT_NIST_TAG = ['SA-11', 'RA-5', 'Rev_4'];
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
41
|
+
const RULE_RESULT_PATHS = ['cdf:rule-result', 'rule-result'];
|
|
42
|
+
let idTracker = '';
|
|
43
|
+
let valueIdTracker = undefined;
|
|
44
|
+
function getRuleResultItem(testResult, pathRuleResultPossibilities, pathIdRefPossibilities = ['idref'], pathItemPossibilities = undefined) {
|
|
45
|
+
for (const pathRuleResult of pathRuleResultPossibilities) {
|
|
46
|
+
const ruleResult = lodash_1.default.get(testResult, pathRuleResult);
|
|
47
|
+
if (ruleResult === undefined) {
|
|
48
|
+
continue;
|
|
49
|
+
}
|
|
50
|
+
const match = ruleResult.find((element) => lodash_1.default.some(pathIdRefPossibilities.map((pathIDRef) => lodash_1.default.get(element, pathIDRef) === idTracker), Boolean));
|
|
51
|
+
if (pathItemPossibilities === undefined) {
|
|
52
|
+
return match;
|
|
53
|
+
}
|
|
54
|
+
for (const pathItem of pathItemPossibilities) {
|
|
55
|
+
const item = lodash_1.default.get(match, pathItem);
|
|
56
|
+
if (item !== undefined) {
|
|
57
|
+
return item;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return undefined;
|
|
62
|
+
}
|
|
63
|
+
function getStatus(testResult) {
|
|
64
|
+
const status = getRuleResultItem(testResult, RULE_RESULT_PATHS, ['idref'], ['cdf:result', 'result']);
|
|
65
|
+
if (typeof status === 'string' && status === 'pass') {
|
|
27
66
|
return inspecjs_1.ExecJSON.ControlResultStatus.Passed;
|
|
28
67
|
}
|
|
29
68
|
else {
|
|
30
69
|
return inspecjs_1.ExecJSON.ControlResultStatus.Failed;
|
|
31
70
|
}
|
|
32
71
|
}
|
|
72
|
+
function getStartTime(testResult) {
|
|
73
|
+
const time = getRuleResultItem(testResult, RULE_RESULT_PATHS, ['idref'], ['time']);
|
|
74
|
+
if (typeof time === 'string') {
|
|
75
|
+
return time;
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
return '';
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
function convertEncodedXmlIntoJson(encodedXml) {
|
|
82
|
+
const xmlChunks = [];
|
|
83
|
+
const htmlParser = new htmlparser.Parser({
|
|
84
|
+
ontext(text) {
|
|
85
|
+
xmlChunks.push(text);
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
htmlParser.write(encodedXml);
|
|
89
|
+
htmlParser.end();
|
|
90
|
+
const xmlParsed = xmlChunks.join('');
|
|
91
|
+
return fast_xml_parser_1.default.parse(xmlParsed);
|
|
92
|
+
}
|
|
93
|
+
function extractProfile(profile, pathProfileItemPossibilities) {
|
|
94
|
+
const profileInfo = {
|
|
95
|
+
id: '',
|
|
96
|
+
description: '',
|
|
97
|
+
title: ''
|
|
98
|
+
};
|
|
99
|
+
for (const profileKey of Object.keys(pathProfileItemPossibilities)) {
|
|
100
|
+
for (const pathProfileItem of pathProfileItemPossibilities[profileKey]) {
|
|
101
|
+
const item = lodash_1.default.get(profile, pathProfileItem);
|
|
102
|
+
if (item) {
|
|
103
|
+
if (profileKey === 'description') {
|
|
104
|
+
profileInfo[profileKey] =
|
|
105
|
+
convertEncodedXmlIntoJson(item);
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
profileInfo[profileKey] = item;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
return profileInfo;
|
|
114
|
+
}
|
|
115
|
+
function getProfiles(profiles, pathSelectPossibilities, pathProfileItemPossibilities) {
|
|
116
|
+
const profileInfos = [];
|
|
117
|
+
for (const profile of profiles) {
|
|
118
|
+
for (const pathSelect of pathSelectPossibilities) {
|
|
119
|
+
const select = lodash_1.default.get(profile, pathSelect);
|
|
120
|
+
if (select === undefined) {
|
|
121
|
+
continue;
|
|
122
|
+
}
|
|
123
|
+
const selected = lodash_1.default.some(select, (element) => idTracker.replace('rule_SV', 'group_V').replace(/r\d+_rule/, '') ===
|
|
124
|
+
lodash_1.default.get(element, 'idref') && lodash_1.default.get(element, 'selected') === 'true');
|
|
125
|
+
if (selected) {
|
|
126
|
+
profileInfos.push(extractProfile(profile, pathProfileItemPossibilities));
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
return profileInfos;
|
|
131
|
+
}
|
|
33
132
|
function extractCci(input) {
|
|
133
|
+
let inputArray;
|
|
134
|
+
if (Array.isArray(input)) {
|
|
135
|
+
inputArray = input;
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
inputArray = [input];
|
|
139
|
+
}
|
|
140
|
+
const CCI_REGEX = /CCI-(\d*)/;
|
|
34
141
|
const output = [];
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
142
|
+
inputArray.forEach((element) => {
|
|
143
|
+
const text = lodash_1.default.get(element, 'text');
|
|
144
|
+
if (text.match(CCI_REGEX)) {
|
|
145
|
+
output.push(text);
|
|
38
146
|
}
|
|
39
147
|
});
|
|
40
148
|
return output;
|
|
@@ -43,22 +151,16 @@ function nistTag(input) {
|
|
|
43
151
|
const identifiers = extractCci(input);
|
|
44
152
|
return CCI_NIST_MAPPING.nistFilter(identifiers, DEFAULT_NIST_TAG, false);
|
|
45
153
|
}
|
|
46
|
-
function parseXml(xml) {
|
|
47
|
-
const options = {
|
|
48
|
-
attributeNamePrefix: '',
|
|
49
|
-
textNodeName: 'text',
|
|
50
|
-
ignoreAttributes: false
|
|
51
|
-
};
|
|
52
|
-
return fast_xml_parser_1.default.parse(xml, options);
|
|
53
|
-
}
|
|
54
154
|
class XCCDFResultsMapper extends base_converter_1.BaseConverter {
|
|
55
155
|
constructor(scapXml) {
|
|
56
|
-
super(parseXml(scapXml));
|
|
156
|
+
super((0, base_converter_1.parseXml)(scapXml));
|
|
57
157
|
this.mappings = {
|
|
58
158
|
platform: {
|
|
59
159
|
name: 'Heimdall Tools',
|
|
60
160
|
release: package_json_1.version,
|
|
61
|
-
target_id:
|
|
161
|
+
target_id: {
|
|
162
|
+
path: ['cdf:Benchmark.cdf:platform.idref', 'Benchmark.platform.idref']
|
|
163
|
+
}
|
|
62
164
|
},
|
|
63
165
|
version: package_json_1.version,
|
|
64
166
|
statistics: {
|
|
@@ -66,13 +168,79 @@ class XCCDFResultsMapper extends base_converter_1.BaseConverter {
|
|
|
66
168
|
},
|
|
67
169
|
profiles: [
|
|
68
170
|
{
|
|
69
|
-
name: { path: 'cdf:Benchmark.id' },
|
|
70
|
-
version: { path: 'cdf:Benchmark.style' },
|
|
71
|
-
title: { path: 'cdf:Benchmark.cdf:title' },
|
|
72
|
-
maintainer: {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
171
|
+
name: { path: ['cdf:Benchmark.id', 'Benchmark.id'] },
|
|
172
|
+
version: { path: ['cdf:Benchmark.style', 'Benchmark.style'] },
|
|
173
|
+
title: { path: ['cdf:Benchmark.cdf:title', 'Benchmark.title.text'] },
|
|
174
|
+
maintainer: {
|
|
175
|
+
path: [
|
|
176
|
+
'cdf:Benchmark.cdf:reference.dc:publisher',
|
|
177
|
+
'Benchmark.reference.dc:publisher'
|
|
178
|
+
]
|
|
179
|
+
},
|
|
180
|
+
summary: {
|
|
181
|
+
path: ['cdf:Benchmark.cdf:description', 'Benchmark.description.text']
|
|
182
|
+
},
|
|
183
|
+
description: {
|
|
184
|
+
path: ['cdf:Benchmark', 'Benchmark'],
|
|
185
|
+
transformer: (input) => {
|
|
186
|
+
const descriptionPaths = [
|
|
187
|
+
['cdf:description', 'description'],
|
|
188
|
+
['cdf:front-matter', 'front-matter'],
|
|
189
|
+
['cdf:metadata', 'metadata'],
|
|
190
|
+
['model'],
|
|
191
|
+
['cdf:plain-text', 'plain-text'],
|
|
192
|
+
['cdf:rear-matter', 'rear-matter'],
|
|
193
|
+
['cdf:reference', 'reference'],
|
|
194
|
+
['cdf:status', 'status'],
|
|
195
|
+
['cdf:version', 'version'],
|
|
196
|
+
['xml:lang'],
|
|
197
|
+
['xmlns:cdf', 'xmlns'],
|
|
198
|
+
['xmlns:dc'],
|
|
199
|
+
['xmlns:dsi'],
|
|
200
|
+
['xsi:schemaLocation'],
|
|
201
|
+
['cdf:TestResult.cdf:benchmark', 'TestResult.benchmark'],
|
|
202
|
+
['cdf:TestResult.start-time', 'TestResult.start-time'],
|
|
203
|
+
['cdf:TestResult.end-time', 'TestResult.end-time'],
|
|
204
|
+
['cdf:TestResult.id', 'TestResult.id'],
|
|
205
|
+
['cdf:TestResult.cdf:identity', 'TestResult.identity'],
|
|
206
|
+
['cdf:TestResult.cdf:organization'],
|
|
207
|
+
[
|
|
208
|
+
'cdf:TestResult.cdf:platform.idref',
|
|
209
|
+
'TestResult.platform.idref'
|
|
210
|
+
],
|
|
211
|
+
['cdf:TestResult.cdf:profile.idref', 'TestResult.profile.idref'],
|
|
212
|
+
['cdf:TestResult.cdf:score', 'TestResult.score'],
|
|
213
|
+
['cdf:TestResult.cdf:set-value', 'TestResult.set-value'],
|
|
214
|
+
['cdf:TestResult.cdf:target', 'TestResult.target'],
|
|
215
|
+
[
|
|
216
|
+
'cdf:TestResult.cdf:target-address',
|
|
217
|
+
'TestResult.target-address'
|
|
218
|
+
],
|
|
219
|
+
['cdf:TestResult.cdf:target-facts', 'TestResult.target-facts'],
|
|
220
|
+
['cdf:TestResult.cdf:target-id-ref'],
|
|
221
|
+
['cdf:TestResult.test-system', 'TestResult.test-system'],
|
|
222
|
+
['TestResult.title'],
|
|
223
|
+
['cdf:TestResult.version', 'TestResult.version']
|
|
224
|
+
];
|
|
225
|
+
const fullDescription = {};
|
|
226
|
+
for (const paths of descriptionPaths) {
|
|
227
|
+
for (const path of paths) {
|
|
228
|
+
const item = lodash_1.default.get(input, path);
|
|
229
|
+
if (item !== undefined) {
|
|
230
|
+
fullDescription[path] = item;
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
return JSON.stringify(fullDescription, null, 2);
|
|
235
|
+
}
|
|
236
|
+
},
|
|
237
|
+
license: { path: ['cdf:Benchmark.cdf:notice.id', 'Benchmark.notice.id'] },
|
|
238
|
+
copyright: {
|
|
239
|
+
path: [
|
|
240
|
+
'cdf:Benchmark.cdf:metadata.dc:creator',
|
|
241
|
+
'Benchmark.metadata.dc:creator.text'
|
|
242
|
+
]
|
|
243
|
+
},
|
|
76
244
|
copyright_email: 'disa.stig_spt@mail.mil',
|
|
77
245
|
supports: [],
|
|
78
246
|
attributes: [],
|
|
@@ -81,113 +249,148 @@ class XCCDFResultsMapper extends base_converter_1.BaseConverter {
|
|
|
81
249
|
status: 'loaded',
|
|
82
250
|
controls: [
|
|
83
251
|
{
|
|
84
|
-
path: 'cdf:Benchmark.cdf:Group',
|
|
252
|
+
path: ['cdf:Benchmark.cdf:Group', 'Benchmark.Group'],
|
|
85
253
|
key: 'id',
|
|
86
254
|
id: {
|
|
87
|
-
path: 'cdf:Rule
|
|
255
|
+
path: ['cdf:Rule', 'Rule'],
|
|
88
256
|
transformer: (input) => {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
257
|
+
const valueIdPaths = [
|
|
258
|
+
'cdf:check.cdf:check-export.value-id',
|
|
259
|
+
'check.check-export.value-id'
|
|
260
|
+
];
|
|
261
|
+
let setValueIdTracker = false;
|
|
262
|
+
for (const path of valueIdPaths) {
|
|
263
|
+
const valueId = lodash_1.default.get(input, path);
|
|
264
|
+
if (valueId !== undefined) {
|
|
265
|
+
valueIdTracker = valueId;
|
|
266
|
+
setValueIdTracker = true;
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
if (!setValueIdTracker) {
|
|
270
|
+
valueIdTracker = undefined;
|
|
271
|
+
}
|
|
272
|
+
const id = lodash_1.default.get(input, 'id');
|
|
273
|
+
if (typeof id === 'string') {
|
|
274
|
+
idTracker = id;
|
|
275
|
+
return id.split('_S')[1].split('r')[0];
|
|
92
276
|
}
|
|
93
277
|
else {
|
|
94
278
|
return '';
|
|
95
279
|
}
|
|
96
280
|
}
|
|
97
281
|
},
|
|
98
|
-
title: { path: 'cdf:Rule.cdf:title' },
|
|
282
|
+
title: { path: ['cdf:Rule.cdf:title', 'Rule.title.text'] },
|
|
99
283
|
desc: {
|
|
100
|
-
path:
|
|
101
|
-
transformer: (
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
}
|
|
105
|
-
else {
|
|
106
|
-
return '';
|
|
107
|
-
}
|
|
284
|
+
path: ['cdf:Rule.cdf:description', 'Rule.description.text'],
|
|
285
|
+
transformer: (description) => {
|
|
286
|
+
const descTextJson = convertEncodedXmlIntoJson(description);
|
|
287
|
+
return lodash_1.default.get(descTextJson, 'VulnDiscussion', '');
|
|
108
288
|
}
|
|
109
289
|
},
|
|
110
290
|
descriptions: [
|
|
111
291
|
{
|
|
112
292
|
data: {
|
|
113
|
-
path:
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
}
|
|
118
|
-
else {
|
|
119
|
-
return '';
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
},
|
|
123
|
-
label: 'default'
|
|
124
|
-
},
|
|
125
|
-
{
|
|
126
|
-
data: 'NA',
|
|
127
|
-
label: 'rationale'
|
|
128
|
-
},
|
|
129
|
-
{
|
|
130
|
-
data: {
|
|
131
|
-
path: 'cdf:Rule.cdf:check.cdf:check-content-ref.name',
|
|
293
|
+
path: [
|
|
294
|
+
'cdf:Rule.cdf:check.cdf:check-content-ref.name',
|
|
295
|
+
'Rule.check.check-content-ref.name'
|
|
296
|
+
],
|
|
132
297
|
transformer: base_converter_1.parseHtml
|
|
133
298
|
},
|
|
134
299
|
label: 'check'
|
|
135
300
|
},
|
|
136
301
|
{
|
|
137
302
|
data: {
|
|
138
|
-
path: 'cdf:Rule.cdf:fixtext.text',
|
|
303
|
+
path: ['cdf:Rule.cdf:fixtext.text', 'Rule.fixtext.text'],
|
|
139
304
|
transformer: base_converter_1.parseHtml
|
|
140
305
|
},
|
|
141
306
|
label: 'fix'
|
|
142
307
|
}
|
|
143
308
|
],
|
|
144
309
|
impact: {
|
|
145
|
-
path: 'cdf:Rule.severity',
|
|
310
|
+
path: ['cdf:Rule.severity', 'Rule.severity'],
|
|
146
311
|
transformer: (0, base_converter_1.impactMapping)(IMPACT_MAPPING)
|
|
147
312
|
},
|
|
148
313
|
refs: [],
|
|
149
314
|
tags: {
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
.split('Satisfies: ')[1]
|
|
158
|
-
.split('<')[0]
|
|
159
|
-
.replace(/', /gi, ',')
|
|
160
|
-
.split(',');
|
|
161
|
-
}
|
|
162
|
-
else {
|
|
163
|
-
return [];
|
|
164
|
-
}
|
|
165
|
-
}
|
|
315
|
+
cci: {
|
|
316
|
+
path: ['cdf:Rule.cdf:ident', 'Rule.ident'],
|
|
317
|
+
transformer: extractCci
|
|
318
|
+
},
|
|
319
|
+
nist: {
|
|
320
|
+
path: ['cdf:Rule.cdf:ident', 'Rule.ident'],
|
|
321
|
+
transformer: nistTag
|
|
166
322
|
},
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
323
|
+
severity: { path: ['cdf:Rule.severity', 'Rule.severity'] },
|
|
324
|
+
description: {
|
|
325
|
+
path: ['cdf:Rule.cdf:description', 'Rule.description.text'],
|
|
326
|
+
transformer: convertEncodedXmlIntoJson
|
|
327
|
+
},
|
|
328
|
+
group_id: { path: 'id' },
|
|
329
|
+
group_title: { path: ['cdf:title', 'title.text'] },
|
|
330
|
+
group_description: {
|
|
331
|
+
path: ['cdf:description', 'description.text'],
|
|
332
|
+
transformer: convertEncodedXmlIntoJson
|
|
333
|
+
},
|
|
334
|
+
rule_id: { path: ['cdf:Rule.id', 'Rule.id'] },
|
|
335
|
+
check: { path: ['cdf:Rule.cdf:check', 'Rule.check'] },
|
|
336
|
+
fix_id: { path: ['cdf:Rule.cdf:fix.id', 'Rule.fix.id'] },
|
|
337
|
+
fixtext_fixref: {
|
|
338
|
+
path: ['cdf:Rule.cdf:fixtext.fixref', 'Rule.fixtext.fixref']
|
|
339
|
+
},
|
|
340
|
+
ident: { path: ['cdf:Rule.cdf:ident', 'Rule.ident'] },
|
|
341
|
+
reference: { path: ['cdf:Rule.cdf:reference', 'Rule.reference'] },
|
|
342
|
+
selected: { path: 'Rule.selected' },
|
|
343
|
+
version: { path: ['cdf:Rule.id', 'Rule.version.text'] },
|
|
344
|
+
weight: { path: ['cdf:Rule.weight', 'Rule.weight'] },
|
|
345
|
+
profiles: {
|
|
346
|
+
path: ['$.cdf:Benchmark.cdf:Profile', '$.Benchmark.Profile'],
|
|
347
|
+
transformer: (profiles) => {
|
|
348
|
+
const pathsSelect = ['cdf:select', 'select'];
|
|
349
|
+
const paths = {
|
|
350
|
+
id: ['id'],
|
|
351
|
+
description: ['cdf:description', 'description.text'],
|
|
352
|
+
title: ['cdf:title', 'title.text']
|
|
353
|
+
};
|
|
354
|
+
return getProfiles(profiles, pathsSelect, paths);
|
|
171
355
|
}
|
|
172
356
|
},
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
357
|
+
rule_result: {
|
|
358
|
+
path: [
|
|
359
|
+
'$.cdf:Benchmark.cdf:TestResult',
|
|
360
|
+
'$.Benchmark.TestResult'
|
|
361
|
+
],
|
|
362
|
+
transformer: (testResult) => getRuleResultItem(testResult, RULE_RESULT_PATHS)
|
|
363
|
+
},
|
|
364
|
+
value: {
|
|
365
|
+
path: ['$.cdf:Benchmark.cdf:Value', '$.Benchmark.Value'],
|
|
366
|
+
transformer: (values) => {
|
|
367
|
+
return lodash_1.default.find(values, (value) => {
|
|
368
|
+
const id = lodash_1.default.get(value, 'id');
|
|
369
|
+
return id && id === valueIdTracker;
|
|
370
|
+
});
|
|
371
|
+
}
|
|
372
|
+
}
|
|
179
373
|
},
|
|
180
374
|
code: '',
|
|
181
375
|
source_location: {},
|
|
182
376
|
results: [
|
|
183
377
|
{
|
|
184
378
|
status: {
|
|
185
|
-
path:
|
|
379
|
+
path: [
|
|
380
|
+
'$.cdf:Benchmark.cdf:TestResult',
|
|
381
|
+
'$.Benchmark.TestResult'
|
|
382
|
+
],
|
|
186
383
|
transformer: getStatus
|
|
187
384
|
},
|
|
188
385
|
code_desc: '',
|
|
189
386
|
run_time: 0,
|
|
190
|
-
start_time: {
|
|
387
|
+
start_time: {
|
|
388
|
+
path: [
|
|
389
|
+
'$.cdf:Benchmark.cdf:TestResult',
|
|
390
|
+
'$.Benchmark.TestResult'
|
|
391
|
+
],
|
|
392
|
+
transformer: getStartTime
|
|
393
|
+
},
|
|
191
394
|
message: '',
|
|
192
395
|
resource: ''
|
|
193
396
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xccdf-results-mapper.js","sourceRoot":"","sources":["../../src/xccdf-results-mapper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"xccdf-results-mapper.js","sourceRoot":"","sources":["../../src/xccdf-results-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.6.
|
|
3
|
+
"version": "2.6.6",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"description": "Converter util library used to transform various scan results into HDF format",
|
|
6
6
|
"files": [
|
|
@@ -27,10 +27,10 @@
|
|
|
27
27
|
"axios": "^0.24.0",
|
|
28
28
|
"csv-parse": "^5.0.1",
|
|
29
29
|
"csv2json": "^2.0.2",
|
|
30
|
-
"fast-xml-parser": "^3.
|
|
30
|
+
"fast-xml-parser": "^3.21.1",
|
|
31
31
|
"html-entities": "^2.3.2",
|
|
32
32
|
"htmlparser2": "^7.1.2",
|
|
33
|
-
"inspecjs": "^2.6.
|
|
33
|
+
"inspecjs": "^2.6.6",
|
|
34
34
|
"lodash": "^4.17.21",
|
|
35
35
|
"moment": "^2.29.1",
|
|
36
36
|
"xml2js": "^0.4.23"
|