@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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reverse-xccdf-mapper.js","sourceRoot":"","sources":["../../../../src/converters-from-hdf/xccdf/reverse-xccdf-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reverse-xccdf-mapper.js","sourceRoot":"","sources":["../../../../src/converters-from-hdf/xccdf/reverse-xccdf-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
4
24
|
};
|
|
5
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
26
|
exports.ConveyorResults = exports.ConveyorMapper = void 0;
|
|
7
27
|
const inspecjs_1 = require("inspecjs");
|
|
8
|
-
const
|
|
28
|
+
const _ = __importStar(require("lodash"));
|
|
9
29
|
const package_json_1 = require("../package.json");
|
|
10
30
|
const base_converter_1 = require("./base-converter");
|
|
11
31
|
const global_1 = require("./utils/global");
|
|
@@ -23,20 +43,20 @@ function determineStatus(score) {
|
|
|
23
43
|
return inspecjs_1.ExecJSON.ControlResultStatus.Failed;
|
|
24
44
|
}
|
|
25
45
|
function groupByScanner(processed) {
|
|
26
|
-
const groups =
|
|
27
|
-
return
|
|
46
|
+
const groups = _.groupBy(processed, (result) => {
|
|
47
|
+
return _.get(result, 'response.service_name');
|
|
28
48
|
});
|
|
29
49
|
return groups;
|
|
30
50
|
}
|
|
31
51
|
function collateShaAndFilenames(currLevel) {
|
|
32
52
|
const shaFilePairs = [];
|
|
33
53
|
for (const [sha, file] of Object.entries(currLevel)) {
|
|
34
|
-
if (
|
|
35
|
-
const name =
|
|
54
|
+
if (_.has(file, 'name')) {
|
|
55
|
+
const name = _.get(file, 'name[0]') || '';
|
|
36
56
|
shaFilePairs.push([sha, name]);
|
|
37
57
|
}
|
|
38
|
-
if (
|
|
39
|
-
const nextLevel =
|
|
58
|
+
if (_.has(file, 'children')) {
|
|
59
|
+
const nextLevel = _.get(file, 'children') || {};
|
|
40
60
|
for (const nextLevelPairs of collateShaAndFilenames(nextLevel)) {
|
|
41
61
|
shaFilePairs.push(nextLevelPairs);
|
|
42
62
|
}
|
|
@@ -45,11 +65,11 @@ function collateShaAndFilenames(currLevel) {
|
|
|
45
65
|
return shaFilePairs;
|
|
46
66
|
}
|
|
47
67
|
function mapSha2Filename(results) {
|
|
48
|
-
const toplevel =
|
|
68
|
+
const toplevel = _.get(results, 'api_response.file_tree');
|
|
49
69
|
const shaMappings = {};
|
|
50
70
|
const shaFilePairs = collateShaAndFilenames(toplevel);
|
|
51
71
|
for (const [sha, filename] of shaFilePairs) {
|
|
52
|
-
|
|
72
|
+
_.set(shaMappings, sha || '', filename || '');
|
|
53
73
|
}
|
|
54
74
|
return shaMappings;
|
|
55
75
|
}
|
|
@@ -57,21 +77,21 @@ function createDescription(data, score, date, scannerName, endTime) {
|
|
|
57
77
|
const desc = () => {
|
|
58
78
|
if (scannerName === scannerType.Moldy ||
|
|
59
79
|
scannerName === scannerType.Stigma) {
|
|
60
|
-
return `title_text:${
|
|
61
|
-
body:${
|
|
62
|
-
body_format:${
|
|
63
|
-
classificaton:${
|
|
64
|
-
depth:${
|
|
65
|
-
heuristic_heur_id:${
|
|
66
|
-
heuristic_score:${
|
|
67
|
-
heuristic_name:${
|
|
80
|
+
return `title_text:${_.get(data, 'title_text')}
|
|
81
|
+
body:${_.get(data, 'body')}
|
|
82
|
+
body_format:${_.get(data, 'body_format')}
|
|
83
|
+
classificaton:${_.get(data, 'classification')}
|
|
84
|
+
depth:${_.get(data, 'depth')}
|
|
85
|
+
heuristic_heur_id:${_.get(data, 'heuristic.heur_id')}
|
|
86
|
+
heuristic_score:${_.get(data, 'heuristic.score')}
|
|
87
|
+
heuristic_name:${_.get(data, 'heuristic.name')}`;
|
|
68
88
|
}
|
|
69
89
|
else if (scannerName === scannerType.CodeQuality) {
|
|
70
|
-
return `body:${
|
|
71
|
-
body_format:${
|
|
72
|
-
classificaton:${
|
|
73
|
-
depth:${
|
|
74
|
-
title_text:${
|
|
90
|
+
return `body:${_.get(data, 'body')}
|
|
91
|
+
body_format:${_.get(data, 'body_format')}
|
|
92
|
+
classificaton:${_.get(data, 'classification')}
|
|
93
|
+
depth:${_.get(data, 'depth')}
|
|
94
|
+
title_text:${_.get(data, 'title_text')}`;
|
|
75
95
|
}
|
|
76
96
|
else {
|
|
77
97
|
return JSON.stringify(data);
|
|
@@ -85,13 +105,13 @@ function createDescription(data, score, date, scannerName, endTime) {
|
|
|
85
105
|
};
|
|
86
106
|
}
|
|
87
107
|
function preprocessObject(parsed, mappings) {
|
|
88
|
-
const results =
|
|
108
|
+
const results = _.get(parsed, 'api_response.results');
|
|
89
109
|
const newSections = [];
|
|
90
110
|
for (const result of Object.values(results)) {
|
|
91
|
-
const sha =
|
|
92
|
-
|
|
93
|
-
const descriptions =
|
|
94
|
-
|
|
111
|
+
const sha = _.get(result, 'sha256', '');
|
|
112
|
+
_.set(result, 'filename', _.get(mappings, sha));
|
|
113
|
+
const descriptions = _.map(_.get(result, 'result.sections'), (section) => createDescription(section, _.get(result, 'result.score'), _.get(result, 'response.milestones.service_started'), _.get(result, 'response.service_name'), _.get(result, 'response.milestones.service_completed')));
|
|
114
|
+
_.set(result, 'result.sections', descriptions);
|
|
95
115
|
newSections.push(result);
|
|
96
116
|
}
|
|
97
117
|
return newSections;
|
|
@@ -136,7 +156,7 @@ function controlMappingConveyor() {
|
|
|
136
156
|
}
|
|
137
157
|
class ConveyorMapper extends base_converter_1.BaseConverter {
|
|
138
158
|
constructor(remappedConveyorResults, data, scannerName) {
|
|
139
|
-
|
|
159
|
+
_.set(data, 'api_response.results', remappedConveyorResults);
|
|
140
160
|
super(data);
|
|
141
161
|
this.mappings = {
|
|
142
162
|
passthrough: { path: 'api_response' },
|
|
@@ -174,10 +194,10 @@ class ConveyorResults {
|
|
|
174
194
|
const parsed = JSON.parse(conveyorJson);
|
|
175
195
|
const mappings = mapSha2Filename(parsed);
|
|
176
196
|
const processed = preprocessObject(parsed, mappings);
|
|
177
|
-
this.data =
|
|
197
|
+
this.data = _.set(parsed, 'api_response.results', groupByScanner(processed));
|
|
178
198
|
}
|
|
179
199
|
toHdf() {
|
|
180
|
-
const scannerRecordInput = Object.entries(
|
|
200
|
+
const scannerRecordInput = Object.entries(_.get(this.data, 'api_response.results')).map(([scannerName, scannerData]) => [
|
|
181
201
|
scannerName,
|
|
182
202
|
new ConveyorMapper(scannerData, this.data, scannerName).toHdf()
|
|
183
203
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conveyor-mapper.js","sourceRoot":"","sources":["../../src/conveyor-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"conveyor-mapper.js","sourceRoot":"","sources":["../../src/conveyor-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
4
24
|
};
|
|
5
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
26
|
exports.DBProtectMapper = void 0;
|
|
7
27
|
const inspecjs_1 = require("inspecjs");
|
|
8
|
-
const
|
|
28
|
+
const _ = __importStar(require("lodash"));
|
|
9
29
|
const package_json_1 = require("../package.json");
|
|
10
30
|
const base_converter_1 = require("./base-converter");
|
|
11
31
|
const global_1 = require("./utils/global");
|
|
@@ -16,16 +36,16 @@ const IMPACT_MAPPING = new Map([
|
|
|
16
36
|
['informational', 0]
|
|
17
37
|
]);
|
|
18
38
|
function compileFindings(input) {
|
|
19
|
-
const keys =
|
|
20
|
-
const findings =
|
|
39
|
+
const keys = _.get(input, 'dataset.metadata.item');
|
|
40
|
+
const findings = _.get(input, 'dataset.data.row');
|
|
21
41
|
let output = [];
|
|
22
42
|
if (Array.isArray(keys) && Array.isArray(findings)) {
|
|
23
43
|
const keyNames = keys.map((element) => {
|
|
24
|
-
return
|
|
44
|
+
return _.get(element, 'name');
|
|
25
45
|
});
|
|
26
46
|
output = findings.map((element) => {
|
|
27
47
|
return Object.fromEntries(keyNames.map(function (name, i) {
|
|
28
|
-
return [name,
|
|
48
|
+
return [name, _.get(element, `value[${i}]`)];
|
|
29
49
|
}));
|
|
30
50
|
});
|
|
31
51
|
}
|
|
@@ -33,17 +53,17 @@ function compileFindings(input) {
|
|
|
33
53
|
}
|
|
34
54
|
function formatSummary(entry) {
|
|
35
55
|
const text = [];
|
|
36
|
-
text.push(`Organization : ${
|
|
37
|
-
text.push(`Asset : ${
|
|
38
|
-
text.push(`Asset Type : ${
|
|
39
|
-
text.push(`IP Address, Port, Instance : ${
|
|
40
|
-
text.push(`IP Address, Port, Instance : ${
|
|
56
|
+
text.push(`Organization : ${_.get(entry, 'Organization')}`);
|
|
57
|
+
text.push(`Asset : ${_.get(entry, 'Check Asset')}`);
|
|
58
|
+
text.push(`Asset Type : ${_.get(entry, 'Asset Type')}`);
|
|
59
|
+
text.push(`IP Address, Port, Instance : ${_.get(entry, 'Asset Type')}`);
|
|
60
|
+
text.push(`IP Address, Port, Instance : ${_.get(entry, 'IP Address, Port, Instance')} `);
|
|
41
61
|
return text.join('\n');
|
|
42
62
|
}
|
|
43
63
|
function formatDesc(entry) {
|
|
44
64
|
const text = [];
|
|
45
|
-
text.push(`Task : ${
|
|
46
|
-
text.push(`Check Category : ${
|
|
65
|
+
text.push(`Task : ${_.get(entry, 'Task')}`);
|
|
66
|
+
text.push(`Check Category : ${_.get(entry, 'Check Category')}`);
|
|
47
67
|
return text.join('; ');
|
|
48
68
|
}
|
|
49
69
|
function getStatus(input) {
|
|
@@ -70,8 +90,8 @@ function getBacktrace(input) {
|
|
|
70
90
|
function handleBacktrace(input) {
|
|
71
91
|
if (Array.isArray(input)) {
|
|
72
92
|
input = input.map((element) => {
|
|
73
|
-
if (
|
|
74
|
-
return
|
|
93
|
+
if (_.get(element, 'backtrace')[0] === '') {
|
|
94
|
+
return _.omit(element, 'backtrace');
|
|
75
95
|
}
|
|
76
96
|
else {
|
|
77
97
|
return element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbprotect-mapper.js","sourceRoot":"","sources":["../../src/dbprotect-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dbprotect-mapper.js","sourceRoot":"","sources":["../../src/dbprotect-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
4
24
|
};
|
|
5
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
26
|
exports.FortifyMapper = void 0;
|
|
7
27
|
const inspecjs_1 = require("inspecjs");
|
|
8
|
-
const
|
|
28
|
+
const _ = __importStar(require("lodash"));
|
|
9
29
|
const package_json_1 = require("../package.json");
|
|
10
30
|
const base_converter_1 = require("./base-converter");
|
|
11
31
|
const global_1 = require("./utils/global");
|
|
@@ -14,39 +34,39 @@ const DEFAULT_NIST_TAG = [];
|
|
|
14
34
|
function impactMapping(input, id) {
|
|
15
35
|
if (Array.isArray(input)) {
|
|
16
36
|
const matches = input.find((element) => {
|
|
17
|
-
return
|
|
37
|
+
return _.get(element, 'ClassInfo.ClassID') === id;
|
|
18
38
|
});
|
|
19
|
-
return parseFloat(
|
|
39
|
+
return parseFloat(_.get(matches, 'ClassInfo.DefaultSeverity')) / 5;
|
|
20
40
|
}
|
|
21
41
|
else {
|
|
22
|
-
return parseFloat(
|
|
42
|
+
return parseFloat(_.get(input, 'ClassInfo.DefaultSeverity')) / 5;
|
|
23
43
|
}
|
|
24
44
|
}
|
|
25
45
|
function nistTag(rule) {
|
|
26
|
-
let references =
|
|
46
|
+
let references = _.get(rule, 'References.Reference');
|
|
27
47
|
if (!Array.isArray(references)) {
|
|
28
48
|
references = [references];
|
|
29
49
|
}
|
|
30
50
|
if (Array.isArray(references)) {
|
|
31
51
|
const tag = references.find((element) => {
|
|
32
|
-
return
|
|
52
|
+
return _.get(element, 'Author') === NIST_REFERENCE_NAME;
|
|
33
53
|
});
|
|
34
54
|
if (tag === null || tag === undefined) {
|
|
35
55
|
return DEFAULT_NIST_TAG;
|
|
36
56
|
}
|
|
37
57
|
else {
|
|
38
|
-
return
|
|
58
|
+
return _.get(tag, 'Title').match(/[a-zA-Z][a-zA-Z]-\d{1,2}/);
|
|
39
59
|
}
|
|
40
60
|
}
|
|
41
61
|
return [];
|
|
42
62
|
}
|
|
43
63
|
function processEntry(input) {
|
|
44
64
|
const output = [];
|
|
45
|
-
output.push(`${
|
|
46
|
-
output.push(`\nPath: ${
|
|
47
|
-
output.push(`StartLine: ${
|
|
48
|
-
output.push(`EndLine: ${
|
|
49
|
-
output.push(`Code:\n${
|
|
65
|
+
output.push(`${_.get(input, 'id')}<=SNIPPET`);
|
|
66
|
+
output.push(`\nPath: ${_.get(input, 'File')}\n`);
|
|
67
|
+
output.push(`StartLine: ${_.get(input, 'StartLine')}, `);
|
|
68
|
+
output.push(`EndLine: ${_.get(input, 'EndLine')}\n`);
|
|
69
|
+
output.push(`Code:\n${_.get(input, 'Text').trim()}`);
|
|
50
70
|
return output.join('');
|
|
51
71
|
}
|
|
52
72
|
function makeArray(input) {
|
|
@@ -60,24 +80,24 @@ function makeArray(input) {
|
|
|
60
80
|
function filterVuln(input, file) {
|
|
61
81
|
input.forEach((element) => {
|
|
62
82
|
if (element instanceof Object) {
|
|
63
|
-
|
|
64
|
-
const codedesc =
|
|
83
|
+
_.set(element, 'results', _.get(element, 'results').filter((result) => {
|
|
84
|
+
const codedesc = _.get(result, 'code_desc').split('<=SNIPPET');
|
|
65
85
|
const snippetid = codedesc[0];
|
|
66
|
-
const classid =
|
|
67
|
-
|
|
86
|
+
const classid = _.get(element, 'id');
|
|
87
|
+
_.set(result, 'code_desc', codedesc[1]);
|
|
68
88
|
let isMatch = false;
|
|
69
|
-
const matches =
|
|
70
|
-
return
|
|
89
|
+
const matches = _.get(file, 'FVDL.Vulnerabilities.Vulnerability').filter((subElement) => {
|
|
90
|
+
return _.get(subElement, 'ClassInfo.ClassID') === classid;
|
|
71
91
|
});
|
|
72
92
|
matches.forEach((match) => {
|
|
73
|
-
const traces = makeArray(
|
|
93
|
+
const traces = makeArray(_.get(match, 'AnalysisInfo.Unified.Trace'));
|
|
74
94
|
traces.forEach((trace) => {
|
|
75
|
-
const entries = makeArray(
|
|
95
|
+
const entries = makeArray(_.get(trace, 'Primary.Entry'));
|
|
76
96
|
const filteredEntries = entries.filter((entry) => {
|
|
77
|
-
return
|
|
97
|
+
return _.has(entry, 'Node.SourceLocation.snippet');
|
|
78
98
|
});
|
|
79
99
|
filteredEntries.forEach((entry) => {
|
|
80
|
-
if (
|
|
100
|
+
if (_.get(entry, 'Node.SourceLocation.snippet') === snippetid) {
|
|
81
101
|
isMatch = true;
|
|
82
102
|
}
|
|
83
103
|
});
|
|
@@ -85,7 +105,7 @@ function filterVuln(input, file) {
|
|
|
85
105
|
});
|
|
86
106
|
return isMatch;
|
|
87
107
|
}));
|
|
88
|
-
|
|
108
|
+
_.set(element, 'impact', impactMapping(_.get(element, 'impact'), _.get(element, 'id')));
|
|
89
109
|
}
|
|
90
110
|
return element;
|
|
91
111
|
});
|
|
@@ -148,7 +168,7 @@ class FortifyMapper extends base_converter_1.BaseConverter {
|
|
|
148
168
|
start_time: {
|
|
149
169
|
path: '$.FVDL.CreatedTS',
|
|
150
170
|
transformer: (input) => {
|
|
151
|
-
return `${
|
|
171
|
+
return `${_.get(input, 'date')} ${_.get(input, 'time')}`;
|
|
152
172
|
}
|
|
153
173
|
}
|
|
154
174
|
}
|
|
@@ -160,9 +180,9 @@ class FortifyMapper extends base_converter_1.BaseConverter {
|
|
|
160
180
|
],
|
|
161
181
|
passthrough: {
|
|
162
182
|
transformer: (data) => {
|
|
163
|
-
let auxData =
|
|
164
|
-
if (
|
|
165
|
-
auxData =
|
|
183
|
+
let auxData = _.get(data, 'FVDL');
|
|
184
|
+
if (_.isObject(auxData)) {
|
|
185
|
+
auxData = _.omit(auxData, [
|
|
166
186
|
'CreatedTS',
|
|
167
187
|
'UUID',
|
|
168
188
|
'Description',
|
|
@@ -181,7 +201,7 @@ class FortifyMapper extends base_converter_1.BaseConverter {
|
|
|
181
201
|
}
|
|
182
202
|
}
|
|
183
203
|
};
|
|
184
|
-
this.startTime = `${
|
|
204
|
+
this.startTime = `${_.get(this.data, 'FVDL.CreatedTS.date')} ${_.get(this.data, 'FVDL.CreatedTS.time')}`;
|
|
185
205
|
this.withRaw = withRaw;
|
|
186
206
|
}
|
|
187
207
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fortify-mapper.js","sourceRoot":"","sources":["../../src/fortify-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fortify-mapper.js","sourceRoot":"","sources":["../../src/fortify-mapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAkC;AAClC,0CAA4B;AAC5B,kDAAgE;AAChE,qDAM0B;AAC1B,2CAAkD;AAElD,MAAM,mBAAmB,GACvB,gEAAgE,CAAC;AACnE,MAAM,gBAAgB,GAAa,EAAE,CAAC;AAEtC,SAAS,aAAa,CAAC,KAA8B,EAAE,EAAU;IAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACrC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,CAAC,KAAK,EAAE,CAAC;QACpD,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC,GAAG,CAAC,CAAC;KACpE;SAAM;QACL,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,2BAA2B,CAAW,CAAC,GAAG,CAAC,CAAC;KAC5E;AACH,CAAC;AAED,SAAS,OAAO,CAAC,IAA6B;IAC5C,IAAI,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IACrD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC9B,UAAU,GAAG,CAAC,UAAU,CAAC,CAAC;KAC3B;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC7B,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,OAAgC,EAAE,EAAE;YAC/D,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,mBAAmB,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,EAAE;YACrC,OAAO,gBAAgB,CAAC;SACzB;aAAM;YACL,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC9D;KACF;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,CAAC,IAAI,CAAC,UAAW,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAuB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAE5E,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACzB,CAAC;AACD,SAAS,SAAS,CAAC,KAAc;IAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,KAAkB,CAAC;KAC3B;SAAM;QACL,OAAO,CAAC,KAAK,CAAC,CAAC;KAChB;AACH,CAAC;AACD,SAAS,UAAU,CAAC,KAAgB,EAAE,IAAa;IACjD,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACxB,IAAI,OAAO,YAAY,MAAM,EAAE;YAC7B,CAAC,CAAC,GAAG,CACH,OAAO,EACP,SAAS,EACR,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAS,CAAC,MAAM,CACvC,CAAC,MAA8B,EAAE,EAAE;gBACjC,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBAC/D,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAC9B,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACrC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBAExC,IAAI,OAAO,GAAG,KAAK,CAAC;gBACpB,MAAM,OAAO,GACX,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,oCAAoC,CACjD,CAAC,MAAM,CAAC,CAAC,UAAmC,EAAE,EAAE;oBAC/C,OAAO,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,mBAAmB,CAAC,KAAK,OAAO,CAAC;gBAC5D,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,OAAO,CAAC,CAAC,KAA8B,EAAE,EAAE;oBACjD,MAAM,MAAM,GAAc,SAAS,CACjC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,4BAA4B,CAAC,CAC3C,CAAC;oBACF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAc,EAAE,EAAE;wBAChC,MAAM,OAAO,GAAc,SAAS,CAClC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,eAAe,CAAC,CAC9B,CAAC;wBACF,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAc,EAAE,EAAE;4BACxD,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC;wBACrD,CAAC,CAAC,CAAC;wBACH,eAAe,CAAC,OAAO,CAAC,CAAC,KAAc,EAAE,EAAE;4BACzC,IACE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,6BAA6B,CAAC,KAAK,SAAS,EACzD;gCACA,OAAO,GAAG,IAAI,CAAC;6BAChB;wBACH,CAAC,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC;YACjB,CAAC,CACF,CACF,CAAC;YACF,CAAC,CAAC,GAAG,CACH,OAAO,EACP,QAAQ,EACR,aAAa,CACX,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAuC,EAC9D,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAsB,CAC1C,CACF,CAAC;SACH;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IACH,OAAO,KAA2B,CAAC;AACrC,CAAC;AAED,MAAa,aAAc,SAAQ,8BAAa;IA6F9C,YAAY,IAAY,EAAE,OAAO,GAAG,KAAK;QACvC,KAAK,CACH,IAAA,yBAAQ,EAAC,IAAI,EAAE;YACb,SAAS,EAAE,CAAC,2BAA2B,EAAE,8BAA8B,CAAC;SACzE,CAAC,CACH,CAAC;QA9FJ,aAAQ,GAGJ;YACF,QAAQ,EAAE;gBACR,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,sBAAoB;aAC9B;YACD,OAAO,EAAE,sBAAoB;YAC7B,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,8BAA8B;oBACpC,OAAO,EAAE,EAAC,IAAI,EAAE,+BAA+B,EAAC;oBAChD,KAAK,EAAE,8BAA8B;oBACrC,OAAO,EAAE;wBACP,IAAI,EAAE,WAAW;wBACjB,WAAW,EAAE,CAAC,IAAa,EAAU,EAAE;4BACrC,OAAO,yCAAyC,IAAI,EAAE,CAAC;wBACzD,CAAC;qBACF;oBACD,QAAQ,EAAE,EAAE;oBACZ,UAAU,EAAE,EAAE;oBACd,MAAM,EAAE,EAAE;oBACV,MAAM,EAAE,QAAQ;oBAChB,QAAQ,EAAE;wBACR;4BACE,gBAAgB,EAAE,UAAU;4BAC5B,IAAI,EAAE,kBAAkB;4BACxB,GAAG,EAAE,IAAI;4BACT,IAAI,EAAE;gCACJ,IAAI,EAAE,EAAC,WAAW,EAAE,OAAO,EAAC;gCAC5B,GAAG,EAAE;oCACH,WAAW,EAAE,CAAC,IAA6B,EAAE,EAAE,CAC7C,IAAA,2BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;iCACpC;6BACF;4BACD,IAAI,EAAE,EAAE;4BACR,eAAe,EAAE,EAAE;4BACnB,KAAK,EAAE,EAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,0BAAS,EAAC;4BACjD,EAAE,EAAE,EAAC,IAAI,EAAE,SAAS,EAAC;4BACrB,IAAI,EAAE,EAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,0BAAS,EAAC;4BACnD,MAAM,EAAE,EAAC,IAAI,EAAE,sCAAsC,EAAC;4BACtD,IAAI,EAAE;gCACJ,WAAW,EAAE,CAAC,aAAsC,EAAU,EAAE;oCAC9D,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;gCAChD,CAAC;6BACF;4BACD,OAAO,EAAE;gCACP;oCACE,IAAI,EAAE,yBAAyB;oCAC/B,MAAM,EAAE,mBAAQ,CAAC,mBAAmB,CAAC,MAAM;oCAC3C,SAAS,EAAE,EAAC,WAAW,EAAE,YAAY,EAAC;oCACtC,UAAU,EAAE;wCACV,IAAI,EAAE,kBAAkB;wCACxB,WAAW,EAAE,CAAC,KAAc,EAAU,EAAE;4CACtC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC;wCAC3D,CAAC;qCACF;iCACF;6BACF;yBACF;qBACF;oBACD,MAAM,EAAE,EAAE;iBACX;aACF;YACD,WAAW,EAAE;gBACX,WAAW,EAAE,CAAC,IAA6B,EAA2B,EAAE;oBACtE,IAAI,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oBAClC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBACvB,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE;4BACxB,WAAW;4BACX,MAAM;4BACN,aAAa;4BACb,UAAU;yBACX,CAAC,CAAC;qBACJ;oBACD,OAAO;wBACL,cAAc,EAAE;4BACd;gCACE,IAAI,EAAE,SAAS;gCACf,IAAI,EAAE,EAAC,IAAI,EAAE,OAAO,EAAC;6BACtB;yBACF;wBACD,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAC,GAAG,EAAE,IAAI,EAAC,CAAC;qBACjC,CAAC;gBACJ,CAAC;aACF;SACF,CAAC;QAOA,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC,GAAG,CAClE,IAAI,CAAC,IAAI,EACT,qBAAqB,CACtB,EAAE,CAAC;QACJ,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AAzGD,sCAyGC"}
|
package/lib/src/gosec-mapper.js
CHANGED
|
@@ -1,22 +1,42 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
4
24
|
};
|
|
5
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
26
|
exports.GoSecMapper = void 0;
|
|
7
27
|
const inspecjs_1 = require("inspecjs");
|
|
8
|
-
const
|
|
28
|
+
const _ = __importStar(require("lodash"));
|
|
9
29
|
const package_json_1 = require("../package.json");
|
|
10
30
|
const base_converter_1 = require("./base-converter");
|
|
11
31
|
const CweNistMapping_1 = require("./mappings/CweNistMapping");
|
|
12
32
|
const CWE_NIST_MAPPING = new CweNistMapping_1.CweNistMapping();
|
|
13
33
|
const DEFAULT_NIST_TAG = ['SI-2', 'RA-5'];
|
|
14
34
|
function nistTag(input) {
|
|
15
|
-
const cwe = [`${
|
|
35
|
+
const cwe = [`${_.get(input, 'id')}`];
|
|
16
36
|
return CWE_NIST_MAPPING.nistFilter(cwe, DEFAULT_NIST_TAG);
|
|
17
37
|
}
|
|
18
38
|
function formatMessage(input) {
|
|
19
|
-
return `${
|
|
39
|
+
return `${_.get(input, 'file')}, line:${_.get(input, 'line')}, column:${_.get(input, 'column')}`;
|
|
20
40
|
}
|
|
21
41
|
class GoSecMapper extends base_converter_1.BaseConverter {
|
|
22
42
|
constructor(gosecJson, withRaw = false) {
|
|
@@ -29,7 +49,7 @@ class GoSecMapper extends base_converter_1.BaseConverter {
|
|
|
29
49
|
{
|
|
30
50
|
name: 'Gosec',
|
|
31
51
|
data: {
|
|
32
|
-
'Golang errors':
|
|
52
|
+
'Golang errors': _.get(data, 'Golang errors')
|
|
33
53
|
}
|
|
34
54
|
}
|
|
35
55
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gosec-mapper.js","sourceRoot":"","sources":["../../src/gosec-mapper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gosec-mapper.js","sourceRoot":"","sources":["../../src/gosec-mapper.ts"],"names":[],"mappings":"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"}
|