@mitre/hdf-converters 2.7.0 → 2.7.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/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 +1 -0
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/lib/package.json +3 -3
- package/lib/src/asff-mapper/asff-mapper.js +78 -58
- 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.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.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.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.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/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 +0 -1
- 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 +52 -32
- 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 +49 -29
- 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.js +24 -4
- 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/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.js +31 -8
- package/lib/src/utils/attestations.js.map +1 -1
- 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 +84 -64
- 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/package.json +3 -3
|
@@ -1,23 +1,43 @@
|
|
|
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.getSecurityHub = void 0;
|
|
7
27
|
const html_entities_1 = require("html-entities");
|
|
8
|
-
const
|
|
28
|
+
const _ = __importStar(require("lodash"));
|
|
9
29
|
const AwsConfigMapping_1 = require("../mappings/AwsConfigMapping");
|
|
10
30
|
const FINDING_STANDARDS_CONTROL_ARN = 'ProductFields.StandardsControlArn';
|
|
11
31
|
function correspondingControl(controls, finding) {
|
|
12
|
-
return controls.find((control) =>
|
|
13
|
-
|
|
32
|
+
return controls.find((control) => _.get(control, 'StandardsControlArn') ===
|
|
33
|
+
_.get(finding, FINDING_STANDARDS_CONTROL_ARN));
|
|
14
34
|
}
|
|
15
35
|
function securityhubSupportingDocs(standards) {
|
|
16
36
|
let controls;
|
|
17
37
|
try {
|
|
18
38
|
if (Array.isArray(standards)) {
|
|
19
39
|
controls = standards
|
|
20
|
-
.map((standard) =>
|
|
40
|
+
.map((standard) => _.get(JSON.parse(standard), 'Controls'))
|
|
21
41
|
.flat();
|
|
22
42
|
}
|
|
23
43
|
else {
|
|
@@ -37,16 +57,16 @@ function findingId(finding, { controls = null }) {
|
|
|
37
57
|
let control;
|
|
38
58
|
if (controls !== null &&
|
|
39
59
|
(control = correspondingControl(controls, finding)) !== null) {
|
|
40
|
-
return (0, html_entities_1.encode)(
|
|
60
|
+
return (0, html_entities_1.encode)(_.get(control, 'ControlId'));
|
|
41
61
|
}
|
|
42
|
-
else if (
|
|
43
|
-
return
|
|
62
|
+
else if (_.has(finding, 'ProductFields.ControlId')) {
|
|
63
|
+
return _.get(finding, 'ProductFields.ControlId');
|
|
44
64
|
}
|
|
45
|
-
else if (
|
|
46
|
-
return (0, html_entities_1.encode)(
|
|
65
|
+
else if (_.has(finding, 'ProductFields.RuleId')) {
|
|
66
|
+
return (0, html_entities_1.encode)(_.get(finding, 'ProductFields.RuleId'));
|
|
47
67
|
}
|
|
48
68
|
else {
|
|
49
|
-
return (0, html_entities_1.encode)(
|
|
69
|
+
return (0, html_entities_1.encode)(_.get(finding, 'GeneratorId')
|
|
50
70
|
.split('/')
|
|
51
71
|
.slice(-1)[0]);
|
|
52
72
|
}
|
|
@@ -56,12 +76,12 @@ function findingImpact(finding, { controls = null }) {
|
|
|
56
76
|
let control;
|
|
57
77
|
if (controls !== null &&
|
|
58
78
|
(control = correspondingControl(controls, finding)) !== null) {
|
|
59
|
-
impact =
|
|
79
|
+
impact = _.get(control, 'SeverityRating');
|
|
60
80
|
}
|
|
61
81
|
else {
|
|
62
82
|
impact =
|
|
63
|
-
|
|
64
|
-
|
|
83
|
+
_.get(finding, 'Severity.Label') ||
|
|
84
|
+
_.get(finding, 'Severity.Normalized') / 100.0;
|
|
65
85
|
if (typeof impact === 'string' && impact === 'INFORMATIONAL') {
|
|
66
86
|
impact = 'MEDIUM';
|
|
67
87
|
}
|
|
@@ -69,44 +89,44 @@ function findingImpact(finding, { controls = null }) {
|
|
|
69
89
|
return impact;
|
|
70
90
|
}
|
|
71
91
|
function findingNistTag(finding, { awsConfigMapping }) {
|
|
72
|
-
if (
|
|
92
|
+
if (_.get(finding, 'ProductFields.RelatedAWSResources:0/type') !==
|
|
73
93
|
'AWS::Config::ConfigRule') {
|
|
74
94
|
return [];
|
|
75
95
|
}
|
|
76
96
|
return awsConfigMapping.searchNIST([
|
|
77
|
-
|
|
97
|
+
_.get(finding, 'ProductFields.RelatedAWSResources:0/name')
|
|
78
98
|
]);
|
|
79
99
|
}
|
|
80
100
|
function findingTitle(finding, { controls = null }) {
|
|
81
101
|
let control;
|
|
82
102
|
if (controls !== null &&
|
|
83
103
|
(control = correspondingControl(controls, finding)) !== null) {
|
|
84
|
-
return (0, html_entities_1.encode)(
|
|
104
|
+
return (0, html_entities_1.encode)(_.get(control, 'Title'));
|
|
85
105
|
}
|
|
86
106
|
else {
|
|
87
|
-
return (0, html_entities_1.encode)(
|
|
107
|
+
return (0, html_entities_1.encode)(_.get(finding, 'Title'));
|
|
88
108
|
}
|
|
89
109
|
}
|
|
90
110
|
function productName(findings) {
|
|
91
111
|
const finding = Array.isArray(findings) ? findings[0] : findings;
|
|
92
112
|
let standardName;
|
|
93
|
-
if (
|
|
113
|
+
if (_.get(finding, 'Types[0]')
|
|
94
114
|
.split('/')
|
|
95
115
|
.slice(-1)[0]
|
|
96
116
|
.replace(/-/gi, ' ')
|
|
97
117
|
.toLowerCase() ===
|
|
98
|
-
|
|
118
|
+
_.get(finding, FINDING_STANDARDS_CONTROL_ARN)
|
|
99
119
|
.split('/')
|
|
100
120
|
.slice(-4)[0]
|
|
101
121
|
.replace(/-/gi, ' ')
|
|
102
122
|
.toLowerCase()) {
|
|
103
|
-
standardName =
|
|
123
|
+
standardName = _.get(finding, 'Types[0]')
|
|
104
124
|
.split('/')
|
|
105
125
|
.slice(-1)[0]
|
|
106
126
|
.replace(/-/gi, ' ');
|
|
107
127
|
}
|
|
108
128
|
else {
|
|
109
|
-
standardName =
|
|
129
|
+
standardName = _.get(finding, FINDING_STANDARDS_CONTROL_ARN)
|
|
110
130
|
.split('/')
|
|
111
131
|
.slice(-4)[0]
|
|
112
132
|
.replace(/-/gi, ' ')
|
|
@@ -116,7 +136,7 @@ function productName(findings) {
|
|
|
116
136
|
})
|
|
117
137
|
.join(' ');
|
|
118
138
|
}
|
|
119
|
-
return (0, html_entities_1.encode)(`${standardName} v${
|
|
139
|
+
return (0, html_entities_1.encode)(`${standardName} v${_.get(finding, FINDING_STANDARDS_CONTROL_ARN)
|
|
120
140
|
.split('/')
|
|
121
141
|
.slice(-2)[0]}`);
|
|
122
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"case-security-hub.js","sourceRoot":"","sources":["../../../src/asff-mapper/case-security-hub.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"case-security-hub.js","sourceRoot":"","sources":["../../../src/asff-mapper/case-security-hub.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,46 @@
|
|
|
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.getTrivy = void 0;
|
|
7
27
|
const html_entities_1 = require("html-entities");
|
|
8
28
|
const inspecjs_1 = require("inspecjs");
|
|
9
|
-
const
|
|
29
|
+
const _ = __importStar(require("lodash"));
|
|
10
30
|
const global_1 = require("../utils/global");
|
|
11
31
|
function findingId(finding) {
|
|
12
|
-
const generatorId =
|
|
13
|
-
const cveId =
|
|
32
|
+
const generatorId = _.get(finding, 'GeneratorId');
|
|
33
|
+
const cveId = _.get(finding, 'Resources[0].Details.Other.CVE ID');
|
|
14
34
|
if (typeof cveId === 'string') {
|
|
15
35
|
return (0, html_entities_1.encode)(`${generatorId}/${cveId}`);
|
|
16
36
|
}
|
|
17
37
|
else {
|
|
18
|
-
const id =
|
|
38
|
+
const id = _.get(finding, 'Id');
|
|
19
39
|
return (0, html_entities_1.encode)(`${generatorId}/${id}`);
|
|
20
40
|
}
|
|
21
41
|
}
|
|
22
42
|
function findingNistTag(finding) {
|
|
23
|
-
const cveId =
|
|
43
|
+
const cveId = _.get(finding, 'Resources[0].Details.Other.CVE ID');
|
|
24
44
|
if (typeof cveId === 'string') {
|
|
25
45
|
return global_1.DEFAULT_UPDATE_REMEDIATION_NIST_TAGS;
|
|
26
46
|
}
|
|
@@ -32,13 +52,13 @@ function subfindingsStatus() {
|
|
|
32
52
|
return inspecjs_1.ExecJSON.ControlResultStatus.Failed;
|
|
33
53
|
}
|
|
34
54
|
function subfindingsMessage(finding) {
|
|
35
|
-
const cveId =
|
|
55
|
+
const cveId = _.get(finding, 'Resources[0].Details.Other.CVE ID');
|
|
36
56
|
if (typeof cveId === 'string') {
|
|
37
|
-
const patchedPackage =
|
|
57
|
+
const patchedPackage = _.get(finding, 'Resources[0].Details.Other.Patched Package');
|
|
38
58
|
const patchedVersionMessage = patchedPackage.length === 0
|
|
39
59
|
? 'There is no patched version of the package.'
|
|
40
60
|
: `The package has been patched since version(s): ${patchedPackage}.`;
|
|
41
|
-
return `For package ${
|
|
61
|
+
return `For package ${_.get(finding, 'Resources[0].Details.Other.PkgName')}, the current version that is installed is ${_.get(finding, 'Resources[0].Details.Other.Installed Package')}. ${patchedVersionMessage}`;
|
|
42
62
|
}
|
|
43
63
|
else {
|
|
44
64
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"case-trivy.js","sourceRoot":"","sources":["../../../src/asff-mapper/case-trivy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"case-trivy.js","sourceRoot":"","sources":["../../../src/asff-mapper/case-trivy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAqC;AACrC,uCAAkC;AAClC,0CAA4B;AAC5B,4CAAqE;AAErE,SAAS,SAAS,CAAC,OAAgB;IACjC,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAClD,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,mCAAmC,CAAC,CAAC;IAClE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,IAAA,sBAAM,EAAC,GAAG,WAAW,IAAI,KAAK,EAAE,CAAC,CAAC;KAC1C;SAAM;QACL,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAChC,OAAO,IAAA,sBAAM,EAAC,GAAG,WAAW,IAAI,EAAE,EAAE,CAAC,CAAC;KACvC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,OAAgB;IACtC,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,mCAAmC,CAAC,CAAC;IAClE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,6CAAoC,CAAC;KAC7C;SAAM;QACL,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAED,SAAS,iBAAiB;IACxB,OAAO,mBAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC;AAC7C,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAgB;IAC1C,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,mCAAmC,CAAC,CAAC;IAClE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,MAAM,cAAc,GAAG,CAAC,CAAC,GAAG,CAC1B,OAAO,EACP,4CAA4C,CACxB,CAAC;QACvB,MAAM,qBAAqB,GACzB,cAAc,CAAC,MAAM,KAAK,CAAC;YACzB,CAAC,CAAC,6CAA6C;YAC/C,CAAC,CAAC,kDAAkD,cAAc,GAAG,CAAC;QAC1E,OAAO,eAAe,CAAC,CAAC,GAAG,CACzB,OAAO,EACP,oCAAoC,CACrC,8CAA8C,CAAC,CAAC,GAAG,CAClD,OAAO,EACP,8CAA8C,CAC/C,MAAM,qBAAqB,EAAE,CAAC;KAChC;SAAM;QACL,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAED,SAAS,WAAW;IAClB,OAAO,uBAAuB,CAAC;AACjC,CAAC;AAED,SAAS,WAAW;IAClB,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,QAAQ;IACf,OAAO,GAAG,WAAW,EAAE,OAAO,CAAC;AACjC,CAAC;AAED,SAAS,IAAI;IACX,OAAO,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAC,CAAC;AAClD,CAAC;AAED,SAAgB,QAAQ;IACtB,OAAO;QACL,SAAS;QACT,cAAc;QACd,iBAAiB;QACjB,kBAAkB;QAClB,WAAW;QACX,WAAW;QACX,QAAQ;QACR,IAAI;KACL,CAAC;AACJ,CAAC;AAXD,4BAWC"}
|
|
@@ -1,4 +1,27 @@
|
|
|
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
|
};
|
|
@@ -7,7 +30,7 @@ exports.AwsConfigMapper = void 0;
|
|
|
7
30
|
const aws_sdk_1 = __importDefault(require("aws-sdk"));
|
|
8
31
|
const https_1 = __importDefault(require("https"));
|
|
9
32
|
const inspecjs_1 = require("inspecjs");
|
|
10
|
-
const
|
|
33
|
+
const _ = __importStar(require("lodash"));
|
|
11
34
|
const package_json_1 = require("../package.json");
|
|
12
35
|
const AwsConfigMapping_1 = require("./mappings/AwsConfigMapping");
|
|
13
36
|
const NOT_APPLICABLE_MSG = 'No AWS resources found to evaluate compliance for this rule';
|
|
@@ -46,7 +69,7 @@ class AwsConfigMapper {
|
|
|
46
69
|
configRules.push(rule);
|
|
47
70
|
});
|
|
48
71
|
if (response.NextToken) {
|
|
49
|
-
params =
|
|
72
|
+
params = _.set(params, 'NextToken', response.NextToken);
|
|
50
73
|
}
|
|
51
74
|
else {
|
|
52
75
|
break;
|
|
@@ -85,7 +108,7 @@ class AwsConfigMapper {
|
|
|
85
108
|
let ruleResults = response.EvaluationResults || [];
|
|
86
109
|
allRulesResolved.push(...ruleResults);
|
|
87
110
|
while (response.NextToken !== undefined) {
|
|
88
|
-
params =
|
|
111
|
+
params = _.set(params, 'NextToken', response.NextToken);
|
|
89
112
|
await this.delay(150);
|
|
90
113
|
response = await this.configService
|
|
91
114
|
.getComplianceDetailsByConfigRule(params)
|
|
@@ -158,8 +181,8 @@ class AwsConfigMapper {
|
|
|
158
181
|
const resourceMap = {};
|
|
159
182
|
const resolvedResourcesMap = {};
|
|
160
183
|
evaluationResults.forEach((result) => {
|
|
161
|
-
const resourceType =
|
|
162
|
-
const resourceId =
|
|
184
|
+
const resourceType = _.get(result, 'EvaluationResultIdentifier.EvaluationResultQualifier.ResourceType');
|
|
185
|
+
const resourceId = _.get(result, 'EvaluationResultIdentifier.EvaluationResultQualifier.ResourceId');
|
|
163
186
|
if (!(resourceType in resourceMap)) {
|
|
164
187
|
resourceMap[resourceType] = [resourceId];
|
|
165
188
|
}
|
|
@@ -254,13 +277,13 @@ class AwsConfigMapper {
|
|
|
254
277
|
var _a;
|
|
255
278
|
let result = {};
|
|
256
279
|
const sourceIdentifier = (_a = configRule.Source) === null || _a === void 0 ? void 0 : _a.SourceIdentifier;
|
|
257
|
-
result =
|
|
280
|
+
result = _.set(result, 'nist', []);
|
|
258
281
|
let defaultMatch = [];
|
|
259
282
|
if (sourceIdentifier !== undefined) {
|
|
260
283
|
defaultMatch = AWS_CONFIG_MAPPING.searchNIST([sourceIdentifier]);
|
|
261
284
|
}
|
|
262
285
|
if (Array.isArray(defaultMatch) && defaultMatch.length !== 0) {
|
|
263
|
-
result =
|
|
286
|
+
result = _.set(result, 'nist', _.get(result, 'nist').concat(defaultMatch));
|
|
264
287
|
}
|
|
265
288
|
return result;
|
|
266
289
|
}
|
|
@@ -320,7 +343,7 @@ class AwsConfigMapper {
|
|
|
320
343
|
});
|
|
321
344
|
}
|
|
322
345
|
getImpact(issue) {
|
|
323
|
-
if (
|
|
346
|
+
if (_.get(issue, 'compliance') === 'NOT_APPLICABLE') {
|
|
324
347
|
return 0;
|
|
325
348
|
}
|
|
326
349
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws-config-mapper.js","sourceRoot":"","sources":["../../src/aws-config-mapper.ts"],"names":[],"mappings":";;;;;;AAMA,sDAA0B;AAC1B,kDAA0B;AAC1B,uCAAkC;AAClC,oDAAuB;AACvB,kDAAgE;AAChE,kEAA6D;AAE7D,MAAM,kBAAkB,GACtB,6DAA6D,CAAC;AAChE,MAAM,qBAAqB,GACzB,iEAAiE,CAAC;AACpE,MAAM,IAAI,GAAG,YAAY,CAAC;AAE1B,MAAM,kBAAkB,GAAG,IAAI,mCAAgB,EAAE,CAAC;AAElD,MAAa,eAAe;IAI1B,YACE,OAA8C,EAC9C,qBAAqB,GAAG,IAAI;QAE5B,iBAAG,CAAC,MAAM,CAAC,MAAM,CAAC;YAChB,WAAW,EAAE;gBACX,KAAK,EAAE,IAAI,eAAK,CAAC,KAAK,CAAC;oBACrB,kBAAkB,EAAE,qBAAqB;iBAC1C,CAAC;aACH;SACF,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,GAAG,IAAI,iBAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,EAAU;QACtB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAC7B,IAAI,MAAM,GAAoC;YAC5C,eAAe,EAAE,EAAE;YACnB,SAAS,EAAE,EAAE;SACd,CAAC;QACF,MAAM,WAAW,GAAiB,EAAE,CAAC;QACrC,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,QAAQ,CAAC,WAAW,KAAK,SAAS,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzC;aAAM;YACL,OAAO,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,WAAW,KAAK,SAAS,EAAE;gBACnE,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACpC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;gBACH,IAAI,QAAQ,CAAC,SAAS,EAAE;oBACtB,MAAM,GAAG,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;iBACzD;qBAAM;oBACL,MAAM;iBACP;gBACD,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;aACjD;SACF;QACD,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAClD,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,UAAU,CAAC,WAAuB,EAAE,SAAiB;QAC3D,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE;YACtD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;SAClD;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,MAAuC;QAEvC,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;IAClE,CAAC;IAEO,KAAK,CAAC,UAAU,CACtB,WAAyB;QAEzB,MAAM,iBAAiB,GACrB,MAAM,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;QACjD,MAAM,QAAQ,GAA+B,EAAE,CAAC;QAChD,MAAM,gBAAgB,GAAwC,EAAE,CAAC;QACjE,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAM,MAAM,GAA6B,EAAE,CAAC;YAC5C,IAAI,MAAM,GAAG;gBACX,cAAc,EAAE,UAAU,CAAC,cAAc,IAAI,EAAE;gBAC/C,KAAK,EAAE,GAAG;aACX,CAAC;YACF,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtB,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa;iBACpC,gCAAgC,CAAC,MAAM,CAAC;iBACxC,OAAO,EAAE,CAAC;YACb,IAAI,WAAW,GAAG,QAAQ,CAAC,iBAAiB,IAAI,EAAE,CAAC;YACnD,gBAAgB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;YACtC,OAAO,QAAQ,CAAC,SAAS,KAAK,SAAS,EAAE;gBACvC,MAAM,GAAG,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;gBACxD,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACtB,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa;qBAChC,gCAAgC,CAAC,MAAM,CAAC;qBACxC,OAAO,EAAE,CAAC;gBACb,WAAW,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,CAAC,QAAQ,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;gBACpE,gBAAgB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;aACvC;YACD,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;;gBACjC,MAAM,SAAS,GAA2B;oBACxC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;oBACvC,UAAU,EAAE,CAAA,MAAA,UAAU,CAAC,qBAAqB,0CAAE,WAAW,EAAE,KAAI,EAAE;oBACjE,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;oBACrC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;oBAClC,OAAO,EAAE,IAAI,CAAC,UAAU,CACtB,UAAU,EACV,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAC5B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAC3B;iBACF,CAAC;gBACF,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACvB,MAAM,WAAW,GAAW,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;gBACrD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;oBACvB,QACE,MAAA,MAAA,iBAAiB,CAAC,IAAI,CACpB,CAAC,gBAAgB,EAAE,EAAE,CACnB,gBAAgB,CAAC,cAAc,KAAK,UAAU,CAAC,cAAc,CAChE,0CAAE,UAAU,0CAAE,cAAc,EAC7B;wBACA,KAAK,gBAAgB;4BACnB,OAAO;gCACL;oCACE,QAAQ,EAAE,CAAC;oCACX,SAAS,EAAE,kBAAkB;oCAC7B,YAAY,EAAE,kBAAkB;oCAChC,UAAU,EAAE,WAAW;oCACvB,MAAM,EAAE,mBAAQ,CAAC,mBAAmB,CAAC,OAAO;iCAC7C;6BACF,CAAC;wBACJ,KAAK,mBAAmB;4BACtB,OAAO;gCACL;oCACE,QAAQ,EAAE,CAAC;oCACX,SAAS,EAAE,qBAAqB;oCAChC,YAAY,EAAE,qBAAqB;oCACnC,UAAU,EAAE,WAAW;oCACvB,MAAM,EAAE,mBAAQ,CAAC,mBAAmB,CAAC,OAAO;iCAC7C;6BACF,CAAC;wBACJ;4BACE,OAAO,EAAE,CAAC;qBACb;iBACF;qBAAM;oBACL,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAC9B;YACH,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC,4BAA4B,CACtC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAC3B,MAAM,IAAI,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,CACzD,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,4BAA4B,CACxC,uBAAmD,EACnD,sBAA8C;QAE9C,OAAO,uBAAuB,CAAC,GAAG,CAAC,CAAC,sBAAsB,EAAE,EAAE,CAC5D,sBAAsB,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE;YAC9C,KAAK,MAAM,qBAAqB,IAAI,sBAAsB,EAAE;gBAC1D,IACE,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAChC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC;qBAClC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;qBACnB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;qBAClB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CACtB,KAAK,CAAC,CAAC,EACR;oBACA,OAAO;wBACL,GAAG,gBAAgB;wBACnB,SAAS,EAAE,GAAG,gBAAgB,CAAC,SAAS,oBAAoB,sBAAsB,CAAC,qBAAqB,CAAC,EAAE;qBAC5G,CAAC;iBACH;aACF;YACD,OAAO,gBAAgB,CAAC;QAC1B,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACvC,iBAAsD;;QAGtD,MAAM,WAAW,GAA6B,EAAE,CAAC;QAEjD,MAAM,oBAAoB,GAA2B,EAAE,CAAC;QAExD,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACnC,MAAM,YAAY,GAAW,gBAAC,CAAC,GAAG,CAChC,MAAM,EACN,mEAAmE,CAC/C,CAAC;YACvB,MAAM,UAAU,GAAW,gBAAC,CAAC,GAAG,CAC9B,MAAM,EACN,iEAAiE,CAC7C,CAAC;YACvB,IAAI,CAAC,CAAC,YAAY,IAAI,WAAW,CAAC,EAAE;gBAClC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;aAC1C;iBAAM;gBACL,IACE,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAC/C,OAAO,UAAU,KAAK,QAAQ,EAC9B;oBACA,WAAW,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;iBAC5C;aACF;QACH,CAAC,CAAC,CAAC;QAEH,KAAK,MAAM,YAAY,IAAI,WAAW,EAAE;YACtC,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;YACxE,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE;gBACpC,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACtB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa;qBACvC,uBAAuB,CAAC;oBACvB,YAAY,EAAE,YAAY;oBAC1B,WAAW,EAAE,KAAK;iBACnB,CAAC;qBACD,OAAO,EAAE,CAAC;gBACb,MAAA,SAAS,CAAC,mBAAmB,0CAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;oBAClD,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,YAAY,EAAE;wBAChD,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC;qBACnE;gBACH,CAAC,CAAC,CAAC;aACJ;SACF;QACD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAEO,WAAW,CAAC,MAAwB;QAC1C,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IACE,MAAM,CAAC,0BAA0B,KAAK,SAAS;YAC/C,MAAM,CAAC,0BAA0B,CAAC,yBAAyB,KAAK,SAAS,EACzE;YACA,MAAM,GAAG,IAAI,CAAC,SAAS,CACrB,MAAM,CAAC,0BAA0B,CAAC,yBAAyB,CAC5D;iBACE,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;iBACnB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;iBAClB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;SACvB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,UAAU,CAAC,MAAwB;QACzC,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,IACE,MAAM,CAAC,kBAAkB,KAAK,SAAS;YACvC,MAAM,CAAC,qBAAqB,KAAK,SAAS,EAC1C;YACA,IAAI;gBACF,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE;oBAClC,MAAM,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;oBACzC,IAAI,CAAC;SACR;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,SAAS,CAAC,MAAwB;QACxC,IAAI,MAAM,CAAC,cAAc,KAAK,WAAW,EAAE;YACzC,OAAO,mBAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC;SAC5C;aAAM,IAAI,MAAM,CAAC,cAAc,KAAK,eAAe,EAAE;YACpD,OAAO,mBAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC;SAC5C;aAAM;YACL,OAAO,mBAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC;SAC7C;IACH,CAAC;IAEO,UAAU,CAChB,MAAwB,EACxB,QAAgB,EAChB,MAAoC;QAEpC,IAAI,MAAM,KAAK,mBAAQ,CAAC,mBAAmB,CAAC,MAAM,EAAE;YAClD,OAAO,GAAG,QAAQ,KAChB,MAAM,CAAC,UAAU,IAAI,oCACvB,EAAE,CAAC;SACJ;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,WAAyB;;QAEzB,MAAM,iBAAiB,GAA6B,EAAE,CAAC;QAEvD,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC1D,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE;YACpC,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa;iBACtC,8BAA8B,CAAC;gBAC9B,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC;aAChE,CAAC;iBACD,OAAO,EAAE,CAAC;YACb,IAAI,QAAQ,CAAC,uBAAuB,KAAK,SAAS,EAAE;gBAClD,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;aACpD;iBAAM;gBACL,MAAA,QAAQ,CAAC,uBAAuB,0CAAE,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CACvD,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CACnC,CAAC;aACH;SACF;QACD,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAGO,OAAO,CAAC,UAAsB;;QACpC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,gBAAgB,GAAG,MAAA,UAAU,CAAC,MAAM,0CAAE,gBAAgB,CAAC;QAC7D,MAAM,GAAG,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACnC,IAAI,YAAY,GAAoB,EAAE,CAAC;QACvC,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAClC,YAAY,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;SAClE;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5D,MAAM,GAAG,gBAAC,CAAC,GAAG,CACZ,MAAM,EACN,MAAM,EACL,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAyB,CAAC,MAAM,CAAC,YAAY,CAAC,CACpE,CAAC;SACH;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,SAAS,CAAC,UAAsB;;QACtC,IAAI,MAAM,GAAU,EAAE,CAAC;QACvB,IACE,UAAU,CAAC,eAAe,KAAK,SAAS;YACxC,UAAU,CAAC,eAAe,KAAK,IAAI,EACnC;YACA,MAAM,GAAG,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;iBACnD,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;iBAClB,KAAK,CAAC,GAAG,CAAC,CAAC;SACf;QACD,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,SAAS,CAAC,IAAI,CAAC,QAAQ,UAAU,CAAC,aAAa,IAAI,KAAK,EAAE,CAAC,CAAC;QAC5D,SAAS,CAAC,IAAI,CACZ,sBAAsB,CAAA,MAAA,UAAU,CAAC,MAAM,0CAAE,gBAAgB,KAAI,KAAK,EAAE,CACrE,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;SAC/D;QACD,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAEO,eAAe,CAAC,UAAsB;QAC5C,OAAO;YACL;gBACE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;gBAChC,KAAK,EAAE,OAAO;aACf;SACF,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,GAAW;QAC9B,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACnD,IAAI,OAAO,KAAK,IAAI,EAAE;YACpB,OAAO,eAAe,CAAC;SACxB;aAAM;YACL,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;SACnB;IACH,CAAC;IAEO,KAAK,CAAC,WAAW;QACvB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,KAAiB,EAAE,EAAE;YACnD,MAAM,OAAO,GAAqB;gBAChC,EAAE,EAAE,KAAK,CAAC,YAAY,IAAI,EAAE;gBAC5B,KAAK,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC,MACpD,KAAK,CAAC,cACR,EAAE;qBACC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;qBAClB,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;gBAC/B,IAAI,EAAE,KAAK,CAAC,WAAW,IAAI,IAAI;gBAC/B,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;gBAC7B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;gBACzB,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;gBACzC,IAAI,EAAE,EAAE;gBACR,eAAe,EAAE,EAAC,GAAG,EAAE,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,EAAC;gBACpD,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;aAC7B,CAAC;YACF,KAAK,EAAE,CAAC;YACR,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,SAAS,CAAC,KAAiB;QACjC,IAAI,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,gBAAgB,EAAE;YACnD,OAAO,CAAC,CAAC;SACV;aAAM;YACL,OAAO,GAAG,CAAC;SACZ;IACH,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,MAAM,GAAG,GAAuB;YAC9B,QAAQ,EAAE;gBACR,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,sBAAoB;gBAC7B,SAAS,EAAE,EAAE;aACd;YACD,OAAO,EAAE,sBAAoB;YAC7B,UAAU,EAAE;gBAEV,QAAQ,EAAE,IAAI;aACf;YACD,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,IAAI;oBACV,OAAO,EAAE,EAAE;oBACX,KAAK,EAAE,IAAI;oBACX,UAAU,EAAE,IAAI;oBAChB,OAAO,EAAE,IAAI;oBACb,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,MAAM,IAAI,CAAC,WAAW,EAAE;oBAClC,MAAM,EAAE,EAAE;iBACX;aACF;SACF,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AA1aD,0CA0aC"}
|
|
1
|
+
{"version":3,"file":"aws-config-mapper.js","sourceRoot":"","sources":["../../src/aws-config-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ exports.BaseConverter = exports.impactMapping = exports.parseCsv = exports.parse
|
|
|
30
30
|
const crypto_1 = require("crypto");
|
|
31
31
|
const fast_xml_parser_1 = require("fast-xml-parser");
|
|
32
32
|
const htmlparser = __importStar(require("htmlparser2"));
|
|
33
|
-
const
|
|
33
|
+
const _ = __importStar(require("lodash"));
|
|
34
34
|
const papaparse_1 = __importDefault(require("papaparse"));
|
|
35
35
|
function generateHash(data, algorithm = 'sha256') {
|
|
36
36
|
const hash = (0, crypto_1.createHash)(algorithm);
|
|
@@ -90,7 +90,7 @@ function collapseDuplicates(array, key, collapseResults) {
|
|
|
90
90
|
const newArray = [];
|
|
91
91
|
let counter = 0;
|
|
92
92
|
array.forEach((item) => {
|
|
93
|
-
const propertyValue =
|
|
93
|
+
const propertyValue = _.get(item, key);
|
|
94
94
|
if (typeof propertyValue === 'string') {
|
|
95
95
|
const index = seen.get(propertyValue) || 0;
|
|
96
96
|
if (!seen.has(propertyValue)) {
|
|
@@ -99,15 +99,15 @@ function collapseDuplicates(array, key, collapseResults) {
|
|
|
99
99
|
counter++;
|
|
100
100
|
}
|
|
101
101
|
else {
|
|
102
|
-
const oldResult =
|
|
103
|
-
const descriptions = oldResult.map((element) =>
|
|
102
|
+
const oldResult = _.get(newArray[index], 'results');
|
|
103
|
+
const descriptions = oldResult.map((element) => _.get(element, 'code_desc'));
|
|
104
104
|
if (collapseResults) {
|
|
105
|
-
if (descriptions.indexOf(
|
|
106
|
-
|
|
105
|
+
if (descriptions.indexOf(_.get(item, 'results[0].code_desc')) === -1) {
|
|
106
|
+
_.set(newArray[index], 'results', oldResult.concat(_.get(item, 'results')));
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
else {
|
|
110
|
-
|
|
110
|
+
_.set(newArray[index], 'results', oldResult.concat(_.get(item, 'results')));
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
113
|
}
|
|
@@ -138,39 +138,39 @@ class BaseConverter {
|
|
|
138
138
|
return Object.fromEntries(Object.entries(obj).map(([k, v]) => [k, fn(v)]));
|
|
139
139
|
}
|
|
140
140
|
convertInternal(file, fields) {
|
|
141
|
-
const isShortcircuiting =
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
141
|
+
const isShortcircuiting = _.isObject(fields) &&
|
|
142
|
+
_.has(fields, 'shortcircuit') &&
|
|
143
|
+
_.isBoolean(_.get(fields, 'shortcircuit')) &&
|
|
144
|
+
_.get(fields, 'shortcircuit');
|
|
145
145
|
if (isShortcircuiting) {
|
|
146
|
-
return
|
|
146
|
+
return _.omit(fields, 'shortcircuit');
|
|
147
147
|
}
|
|
148
148
|
const result = this.objectMap(fields, (v) => this.evaluate(file, v));
|
|
149
149
|
return result;
|
|
150
150
|
}
|
|
151
151
|
evaluate(file, v) {
|
|
152
|
-
const hasTransformer =
|
|
152
|
+
const hasTransformer = _.has(v, 'transformer') && _.isFunction(_.get(v, 'transformer'));
|
|
153
153
|
let transformer = (val) => val;
|
|
154
154
|
if (hasTransformer) {
|
|
155
|
-
transformer =
|
|
156
|
-
v =
|
|
155
|
+
transformer = _.get(v, 'transformer');
|
|
156
|
+
v = _.omit(v, 'transformer');
|
|
157
157
|
}
|
|
158
|
-
const haspathTransform =
|
|
158
|
+
const haspathTransform = _.has(v, 'pathTransform') && _.isFunction(_.get(v, 'pathTransform'));
|
|
159
159
|
let pathTransform = (val) => val;
|
|
160
160
|
if (haspathTransform) {
|
|
161
|
-
pathTransform =
|
|
162
|
-
v =
|
|
161
|
+
pathTransform = _.get(v, 'pathTransform');
|
|
162
|
+
v = _.omit(v, 'pathTransform');
|
|
163
163
|
}
|
|
164
|
-
const hasPath =
|
|
164
|
+
const hasPath = _.isObject(v) && _.has(v, 'path');
|
|
165
165
|
let pathV = v;
|
|
166
166
|
if (hasPath) {
|
|
167
|
-
pathV = pathTransform(this.handlePath(file,
|
|
168
|
-
v =
|
|
167
|
+
pathV = pathTransform(this.handlePath(file, _.get(v, 'path')), file);
|
|
168
|
+
v = _.omit(v, 'path');
|
|
169
169
|
}
|
|
170
|
-
if (
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
170
|
+
if (_.isString(pathV) ||
|
|
171
|
+
_.isNumber(pathV) ||
|
|
172
|
+
_.isBoolean(pathV) ||
|
|
173
|
+
_.isNull(pathV)) {
|
|
174
174
|
return transformer(pathV);
|
|
175
175
|
}
|
|
176
176
|
if (Array.isArray(pathV)) {
|
|
@@ -178,7 +178,7 @@ class BaseConverter {
|
|
|
178
178
|
? transformer(pathV)
|
|
179
179
|
: this.handleArray(file, pathV);
|
|
180
180
|
}
|
|
181
|
-
if (
|
|
181
|
+
if (_.keys(v).length > 0 && hasTransformer) {
|
|
182
182
|
return {
|
|
183
183
|
...this.convertInternal(file, v),
|
|
184
184
|
...transformer(hasPath ? pathV : file)
|
|
@@ -201,8 +201,8 @@ class BaseConverter {
|
|
|
201
201
|
if (lookupPath.path === undefined) {
|
|
202
202
|
const arrayTransformer = (_a = lookupPath.arrayTransformer) === null || _a === void 0 ? void 0 : _a.bind(this);
|
|
203
203
|
v = v.map((element) => {
|
|
204
|
-
return
|
|
205
|
-
?
|
|
204
|
+
return _.isObject(element)
|
|
205
|
+
? _.omit(element, ['arrayTransformer'])
|
|
206
206
|
: element;
|
|
207
207
|
});
|
|
208
208
|
let output = [];
|
|
@@ -233,7 +233,7 @@ class BaseConverter {
|
|
|
233
233
|
}
|
|
234
234
|
if (Array.isArray(pathVal)) {
|
|
235
235
|
v = pathVal.map((element) => {
|
|
236
|
-
return
|
|
236
|
+
return _.omit(this.convertInternal(element, lookupPath), [
|
|
237
237
|
'path',
|
|
238
238
|
'transformer',
|
|
239
239
|
'arrayTransformer',
|
|
@@ -273,15 +273,15 @@ class BaseConverter {
|
|
|
273
273
|
if (typeof path === 'string') {
|
|
274
274
|
pathArray = [path];
|
|
275
275
|
}
|
|
276
|
-
const index =
|
|
276
|
+
const index = _.findIndex(pathArray, (p) => this.hasPath(file, p));
|
|
277
277
|
if (index === -1) {
|
|
278
278
|
return '';
|
|
279
279
|
}
|
|
280
280
|
else if (pathArray[index].startsWith('$.')) {
|
|
281
|
-
return
|
|
281
|
+
return _.get(this.data, pathArray[index].slice(2)) || '';
|
|
282
282
|
}
|
|
283
283
|
else {
|
|
284
|
-
return
|
|
284
|
+
return _.get(file, pathArray[index]) || '';
|
|
285
285
|
}
|
|
286
286
|
}
|
|
287
287
|
hasPath(file, path) {
|
|
@@ -292,12 +292,12 @@ class BaseConverter {
|
|
|
292
292
|
else {
|
|
293
293
|
pathArray = path;
|
|
294
294
|
}
|
|
295
|
-
return
|
|
295
|
+
return _.some(pathArray, (p) => {
|
|
296
296
|
if (p.startsWith('$.')) {
|
|
297
|
-
return
|
|
297
|
+
return _.has(this.data, p.slice(2));
|
|
298
298
|
}
|
|
299
299
|
else {
|
|
300
|
-
return
|
|
300
|
+
return _.has(file, p);
|
|
301
301
|
}
|
|
302
302
|
});
|
|
303
303
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-converter.js","sourceRoot":"","sources":["../../src/base-converter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAkC;AAClC,qDAA0C;AAC1C,wDAA0C;AAE1C,
|
|
1
|
+
{"version":3,"file":"base-converter.js","sourceRoot":"","sources":["../../src/base-converter.ts"],"names":[],"mappings":"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"}
|