@mitre/hdf-converters 2.6.57 → 2.6.59

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.
Files changed (7) hide show
  1. package/lib/package.json +2 -2
  2. package/lib/src/netsparker-mapper.d.ts +5 -2
  3. package/lib/src/netsparker-mapper.js +45 -19
  4. package/lib/src/netsparker-mapper.js.map +1 -1
  5. package/lib/src/xccdf-results-mapper.js +230 -170
  6. package/lib/src/xccdf-results-mapper.js.map +1 -1
  7. package/package.json +2 -2
package/lib/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mitre/hdf-converters",
3
- "version": "2.6.57",
3
+ "version": "2.6.59",
4
4
  "license": "Apache-2.0",
5
5
  "description": "Converter util library used to transform various scan results into HDF format",
6
6
  "files": [
@@ -39,7 +39,7 @@
39
39
  "fast-xml-parser": "^4.2.0",
40
40
  "html-entities": "^2.3.2",
41
41
  "htmlparser2": "^6.1.0",
42
- "inspecjs": "^2.6.47",
42
+ "inspecjs": "^2.6.58",
43
43
  "lodash": "^4.17.21",
44
44
  "moment": "^2.29.1",
45
45
  "ms": "^2.1.3",
package/lib/src/netsparker-mapper.d.ts CHANGED
@@ -1,6 +1,9 @@
1
1
  import { ExecJSON } from 'inspecjs';
2
2
  import { BaseConverter, ILookupPath, MappedTransform } from './base-converter';
3
3
  export declare class NetsparkerMapper extends BaseConverter {
4
- defineMappings(toolname: string): MappedTransform<ExecJSON.Execution, ILookupPath>;
5
- constructor(netsparkerXml: string);
4
+ withRaw: boolean;
5
+ defineMappings(toolname: string): MappedTransform<ExecJSON.Execution & {
6
+ passthrough: unknown;
7
+ }, ILookupPath>;
8
+ constructor(netsparkerXml: string, withRaw?: boolean);
6
9
  }
package/lib/src/netsparker-mapper.js CHANGED
@@ -126,6 +126,13 @@ function formatMessage(response) {
126
126
  return text.join('\n');
127
127
  }
128
128
  class NetsparkerMapper extends base_converter_1.BaseConverter {
129
+ constructor(netsparkerXml, withRaw = false) {
130
+ super((0, base_converter_1.parseXml)(netsparkerXml));
131
+ this.withRaw = withRaw;
132
+ this.setMappings(this.defineMappings(Object.keys(this.data).some((k) => k.includes('netsparker'))
133
+ ? 'netsparker'
134
+ : 'invicti'));
135
+ }
129
136
  defineMappings(toolname) {
130
137
  const capitalizedToolname = toolname.replace(/^./, (firstLetter) => firstLetter.toUpperCase());
131
138
  return {
@@ -139,7 +146,6 @@ class NetsparkerMapper extends base_converter_1.BaseConverter {
139
146
  profiles: [
140
147
  {
141
148
  name: `${capitalizedToolname} Enterprise Scan`,
142
- version: '',
143
149
  title: {
144
150
  path: `${toolname}-enterprise.target`,
145
151
  transformer: (input) => {
@@ -155,13 +161,6 @@ class NetsparkerMapper extends base_converter_1.BaseConverter {
155
161
  {
156
162
  path: `${toolname}-enterprise.vulnerabilities.vulnerability`,
157
163
  key: 'id',
158
- id: { path: 'LookupId' },
159
- title: { path: 'name' },
160
- desc: { transformer: formatControlDesc },
161
- impact: {
162
- path: 'severity',
163
- transformer: (0, base_converter_1.impactMapping)(IMPACT_MAPPING)
164
- },
165
164
  tags: {
166
165
  cci: {
167
166
  path: 'classification',
@@ -169,6 +168,11 @@ class NetsparkerMapper extends base_converter_1.BaseConverter {
169
168
  },
170
169
  nist: { path: 'classification', transformer: nistTag }
171
170
  },
171
+ refs: [],
172
+ source_location: {},
173
+ title: { path: 'name' },
174
+ id: { path: 'LookupId' },
175
+ desc: { transformer: formatControlDesc },
172
176
  descriptions: [
173
177
  {
174
178
  data: { transformer: formatCheck },
@@ -179,9 +183,13 @@ class NetsparkerMapper extends base_converter_1.BaseConverter {
179
183
  label: 'fix'
180
184
  }
181
185
  ],
182
- refs: [],
183
- source_location: {},
184
- code: '',
186
+ impact: {
187
+ path: 'severity',
188
+ transformer: (0, base_converter_1.impactMapping)(IMPACT_MAPPING)
189
+ },
190
+ code: {
191
+ transformer: (vulnerability) => JSON.stringify(vulnerability, null, 2)
192
+ },
185
193
  results: [
186
194
  {
187
195
  status: inspecjs_1.ExecJSON.ControlResultStatus.Failed,
@@ -190,7 +198,6 @@ class NetsparkerMapper extends base_converter_1.BaseConverter {
190
198
  transformer: formatCodeDesc
191
199
  },
192
200
  message: { path: 'http-response', transformer: formatMessage },
193
- run_time: 0,
194
201
  start_time: {
195
202
  path: `$.${toolname}-enterprise.target.initiated`
196
203
  }
@@ -200,15 +207,34 @@ class NetsparkerMapper extends base_converter_1.BaseConverter {
200
207
  ],
201
208
  sha256: ''
202
209
  }
203
- ]
210
+ ],
211
+ passthrough: {
212
+ transformer: (data) => {
213
+ const auxData = lodash_1.default.get(data, 'netsparker-enterprise');
214
+ const genData = lodash_1.default.get(auxData, 'generated');
215
+ const targetData = lodash_1.default.omit(lodash_1.default.get(auxData, 'target'), [
216
+ 'scan-id',
217
+ 'url',
218
+ 'initiated'
219
+ ]);
220
+ return {
221
+ auxiliary_data: [
222
+ {
223
+ name: 'Netsparker',
224
+ data: {
225
+ 'netsparker-enterprise': {
226
+ generated: genData,
227
+ target: targetData
228
+ }
229
+ }
230
+ }
231
+ ],
232
+ ...(this.withRaw && { raw: data })
233
+ };
234
+ }
235
+ }
204
236
  };
205
237
  }
206
- constructor(netsparkerXml) {
207
- super((0, base_converter_1.parseXml)(netsparkerXml));
208
- this.setMappings(this.defineMappings(Object.keys(this.data).some((k) => k.includes('netsparker'))
209
- ? 'netsparker'
210
- : 'invicti'));
211
- }
212
238
  }
213
239
  exports.NetsparkerMapper = NetsparkerMapper;
214
240
  //# sourceMappingURL=netsparker-mapper.js.map
package/lib/src/netsparker-mapper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"netsparker-mapper.js","sourceRoot":"","sources":["../../src/netsparker-mapper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"netsparker-mapper.js","sourceRoot":"","sources":["../../src/netsparker-mapper.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAkC;AAClC,oDAAuB;AACvB,kDAAgE;AAChE,qDAO0B;AAC1B,8DAAyD;AACzD,kEAA6D;AAC7D,2CAGwB;AAExB,MAAM,cAAc,GAAwB,IAAI,GAAG,CAAC;IAClD,CAAC,UAAU,EAAE,GAAG,CAAC;IACjB,CAAC,MAAM,EAAE,GAAG,CAAC;IACb,CAAC,QAAQ,EAAE,GAAG,CAAC;IACf,CAAC,KAAK,EAAE,GAAG,CAAC;IACZ,CAAC,eAAe,EAAE,GAAG,CAAC;IACtB,CAAC,aAAa,EAAE,GAAG,CAAC;CACrB,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,IAAI,+BAAc,EAAE,CAAC;AAC9C,MAAM,kBAAkB,GAAG,IAAI,mCAAgB,EAAE,CAAC;AAElD,SAAS,OAAO,CAAC,cAAuC;IACtD,IAAI,MAAM,GAAG,gBAAC,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAC1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAC1B,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;KACnB;IACD,IAAI,QAAQ,GAAG,gBAAC,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAC5B,QAAQ,GAAG,CAAC,QAAQ,CAAC,CAAC;KACvB;IACD,MAAM,GAAG,GAAG,gBAAgB,CAAC,UAAU,CAAC,MAAkB,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,QAAoB,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,MAAM,CAAC;KACf;SAAM;QACL,OAAO,+CAAsC,CAAC;KAC/C;AACH,CAAC;AACD,SAAS,iBAAiB,CAAC,aAAsB;IAC/C,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,WAAW,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IACxD,IAAI,WAAW,EAAE;QACf,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;KACxB;IACD,MAAM,kBAAkB,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC;IACvE,IAAI,kBAAkB,EAAE;QACtB,IAAI,CAAC,IAAI,CAAC,wBAAwB,kBAAkB,EAAE,CAAC,CAAC;KACzD;IACD,MAAM,gBAAgB,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAC;IACnE,IAAI,gBAAgB,EAAE;QACpB,IAAI,CAAC,IAAI,CACP,sBAAsB,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAC5D,KAAK,EACL,IAAI,CACL,EAAE,CACJ,CAAC;KACH;IACD,MAAM,cAAc,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAC9D,IAAI,cAAc,EAAE;QAClB,IAAI,CAAC,IAAI,CACP,mBAAmB,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CACzE,CAAC;KACH;IACD,MAAM,MAAM,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAI,MAAM,EAAE;QACV,IAAI,CAAC,IAAI,CAAC,WAAW,MAAM,EAAE,CAAC,CAAC;KAChC;IACD,MAAM,aAAa,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAC5D,IAAI,aAAa,EAAE;QACjB,IAAI,CAAC,IAAI,CAAC,kBAAkB,aAAa,EAAE,CAAC,CAAC;KAC9C;IACD,MAAM,YAAY,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAC1D,IAAI,YAAY,EAAE;QAChB,IAAI,CAAC,IAAI,CAAC,iBAAiB,YAAY,EAAE,CAAC,CAAC;KAC5C;IACD,MAAM,SAAS,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;IACpD,IAAI,SAAS,EAAE;QACb,IAAI,CAAC,IAAI,CAAC,cAAc,SAAS,EAAE,CAAC,CAAC;KACtC;IACD,MAAM,IAAI,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAC1C,IAAI,IAAI,EAAE;QACR,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;KAC5B;IACD,MAAM,SAAS,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;IACpD,IAAI,SAAS,EAAE;QACb,IAAI,CAAC,IAAI,CAAC,cAAc,SAAS,EAAE,CAAC,CAAC;KACtC;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC;AACD,SAAS,WAAW,CAAC,aAAsB;IACzC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,kBAAkB,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC;IACvE,IAAI,kBAAkB,EAAE;QACtB,IAAI,CAAC,IAAI,CAAC,wBAAwB,kBAAkB,EAAE,CAAC,CAAC;KACzD;IACD,MAAM,cAAc,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;IAChE,IAAI,cAAc,EAAE;QAClB,IAAI,CAAC,IAAI,CAAC,qBAAqB,cAAc,EAAE,CAAC,CAAC;KAClD;IACD,OAAO,IAAA,0BAAS,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AACtC,CAAC;AACD,SAAS,SAAS,CAAC,aAAsB;IACvC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,eAAe,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;IACjE,IAAI,eAAe,EAAE;QACnB,IAAI,CAAC,IAAI,CAAC,qBAAqB,eAAe,EAAE,CAAC,CAAC;KACnD;IACD,MAAM,iBAAiB,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,oBAAoB,CAAC,CAAC;IACrE,IAAI,iBAAiB,EAAE;QACrB,IAAI,CAAC,IAAI,CAAC,uBAAuB,iBAAiB,EAAE,CAAC,CAAC;KACvD;IACD,MAAM,gBAAgB,GAAG,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAC;IACnE,IAAI,gBAAgB,EAAE;QACpB,IAAI,CAAC,IAAI,CAAC,sBAAsB,gBAAgB,EAAE,CAAC,CAAC;KACrD;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC;AACD,SAAS,cAAc,CAAC,OAAgB;IACtC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,CAAC,IAAI,CAAC,kBAAkB,gBAAC,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IACzD,IAAI,CAAC,IAAI,CAAC,YAAY,gBAAC,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;IAClD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AACD,SAAS,aAAa,CAAC,QAAiB;IACtC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,CAAC,IAAI,CAAC,mBAAmB,gBAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IAC3D,IAAI,CAAC,IAAI,CAAC,cAAc,gBAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,IAAI,CAAC,kBAAkB,gBAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IAC9D,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AACD,MAAa,gBAAiB,SAAQ,8BAAa;IAsHjD,YAAY,aAAqB,EAAE,OAAO,GAAG,KAAK;QAChD,KAAK,CAAC,IAAA,yBAAQ,EAAC,aAAa,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,CACd,IAAI,CAAC,cAAc,CACjB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAC1D,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,SAAS,CACd,CACF,CAAC;IACJ,CAAC;IA7HD,cAAc,CACZ,QAAgB;QAEhB,MAAM,mBAAmB,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CACjE,WAAW,CAAC,WAAW,EAAE,CAC1B,CAAC;QACF,OAAO;YACL,QAAQ,EAAE;gBACR,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,sBAAoB;gBAC7B,SAAS,EAAE,EAAC,IAAI,EAAE,GAAG,QAAQ,wBAAwB,EAAC;aACvD;YACD,OAAO,EAAE,sBAAoB;YAC7B,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,GAAG,mBAAmB,kBAAkB;oBAC9C,KAAK,EAAE;wBACL,IAAI,EAAE,GAAG,QAAQ,oBAAoB;wBACrC,WAAW,EAAE,CAAC,KAAc,EAAU,EAAE;4BACtC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAC/C,WAAW,CAAC,WAAW,EAAE,CAC1B,wBAAwB,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,SAAS,gBAAC,CAAC,GAAG,CAC5D,KAAK,EACL,KAAK,CACN,EAAE,CAAC;wBACN,CAAC;qBACF;oBACD,OAAO,EAAE,GAAG,mBAAmB,kBAAkB;oBACjD,QAAQ,EAAE,EAAE;oBACZ,UAAU,EAAE,EAAE;oBACd,MAAM,EAAE,EAAE;oBACV,MAAM,EAAE,QAAQ;oBAChB,QAAQ,EAAE;wBACR;4BACE,IAAI,EAAE,GAAG,QAAQ,2CAA2C;4BAC5D,GAAG,EAAE,IAAI;4BACT,IAAI,EAAE;gCACJ,GAAG,EAAE;oCACH,IAAI,EAAE,gBAAgB;oCACtB,WAAW,EAAE,CAAC,IAA6B,EAAE,EAAE,CAC7C,IAAA,2BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;iCACpC;gCACD,IAAI,EAAE,EAAC,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,OAAO,EAAC;6BACrD;4BACD,IAAI,EAAE,EAAE;4BACR,eAAe,EAAE,EAAE;4BACnB,KAAK,EAAE,EAAC,IAAI,EAAE,MAAM,EAAC;4BACrB,EAAE,EAAE,EAAC,IAAI,EAAE,UAAU,EAAC;4BACtB,IAAI,EAAE,EAAC,WAAW,EAAE,iBAAiB,EAAC;4BACtC,YAAY,EAAE;gCACZ;oCACE,IAAI,EAAE,EAAC,WAAW,EAAE,WAAW,EAAC;oCAChC,KAAK,EAAE,OAAO;iCACf;gCACD;oCACE,IAAI,EAAE,EAAC,WAAW,EAAE,SAAS,EAAC;oCAC9B,KAAK,EAAE,KAAK;iCACb;6BACF;4BACD,MAAM,EAAE;gCACN,IAAI,EAAE,UAAU;gCAChB,WAAW,EAAE,IAAA,8BAAa,EAAC,cAAc,CAAC;6BAC3C;4BACD,IAAI,EAAE;gCACJ,WAAW,EAAE,CAAC,aAAsC,EAAU,EAAE,CAC9D,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;6BACzC;4BACD,OAAO,EAAE;gCACP;oCACE,MAAM,EAAE,mBAAQ,CAAC,mBAAmB,CAAC,MAAM;oCAC3C,SAAS,EAAE;wCACT,IAAI,EAAE,cAAc;wCACpB,WAAW,EAAE,cAAc;qCAC5B;oCACD,OAAO,EAAE,EAAC,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAC;oCAC5D,UAAU,EAAE;wCACV,IAAI,EAAE,KAAK,QAAQ,8BAA8B;qCAClD;iCACF;6BACF;yBACF;qBACF;oBACD,MAAM,EAAE,EAAE;iBACX;aACF;YACD,WAAW,EAAE;gBACX,WAAW,EAAE,CACX,IAA6B,EACJ,EAAE;oBAC3B,MAAM,OAAO,GAAG,gBAAC,CAAC,GAAG,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;oBACrD,MAAM,OAAO,GAAG,gBAAC,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;oBAC5C,MAAM,UAAU,GAAG,gBAAC,CAAC,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE;wBAClD,SAAS;wBACT,KAAK;wBACL,WAAW;qBACZ,CAAC,CAAC;oBACH,OAAO;wBACL,cAAc,EAAE;4BACd;gCACE,IAAI,EAAE,YAAY;gCAClB,IAAI,EAAE;oCACJ,uBAAuB,EAAE;wCACvB,SAAS,EAAE,OAAO;wCAClB,MAAM,EAAE,UAAU;qCACnB;iCACF;6BACF;yBACF;wBACD,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAC,GAAG,EAAE,IAAI,EAAC,CAAC;qBACjC,CAAC;gBACJ,CAAC;aACF;SACF,CAAC;IACJ,CAAC;CAYF;AAjID,4CAiIC"}
package/lib/src/xccdf-results-mapper.js CHANGED
@@ -17,110 +17,126 @@ const IMPACT_MAPPING = new Map([
17
17
  ['low', 0.3]
18
18
  ]);
19
19
  const CCI_NIST_MAPPING = new CciNistMapping_1.CciNistMapping();
20
- const RULE_RESULT_PATHS = ['rule-result'];
21
- let idTracker = '';
22
- let valueIdTracker = undefined;
23
- function getRuleResultItem(testResult, pathRuleResultPossibilities, pathIdRefPossibilities = ['idref'], pathItemPossibilities = undefined) {
24
- for (const pathRuleResult of pathRuleResultPossibilities) {
25
- const ruleResult = lodash_1.default.get(testResult, pathRuleResult);
26
- if (ruleResult === undefined) {
27
- continue;
28
- }
29
- const match = ruleResult.find((element) => lodash_1.default.some(pathIdRefPossibilities.map((pathIDRef) => lodash_1.default.get(element, pathIDRef) === idTracker), Boolean));
30
- if (pathItemPossibilities === undefined) {
31
- return match;
32
- }
33
- for (const pathItem of pathItemPossibilities) {
34
- const item = lodash_1.default.get(match, pathItem);
35
- if (item !== undefined) {
36
- return item;
37
- }
38
- }
20
+ function asArray(arg) {
21
+ if (Array.isArray(arg)) {
22
+ return arg;
39
23
  }
40
- return undefined;
41
- }
42
- function getStatus(testResult) {
43
- const status = getRuleResultItem(testResult, RULE_RESULT_PATHS, ['idref'], ['result']);
44
- if (typeof status === 'string' && status === 'pass') {
45
- return inspecjs_1.ExecJSON.ControlResultStatus.Passed;
24
+ else if (arg === undefined || arg === null) {
25
+ return [];
46
26
  }
47
27
  else {
48
- return inspecjs_1.ExecJSON.ControlResultStatus.Failed;
28
+ return [arg];
49
29
  }
50
30
  }
51
- function getStartTime(testResult) {
52
- const time = getRuleResultItem(testResult, RULE_RESULT_PATHS, ['idref'], ['time']);
53
- if (typeof time === 'string') {
54
- return time;
55
- }
56
- else {
57
- return '';
58
- }
31
+ function getRuleResult(ruleId, benchmark) {
32
+ const ruleResults = asArray(lodash_1.default.get(benchmark, 'TestResult.rule-result'));
33
+ return ruleResults.find((element) => lodash_1.default.get(element, 'idref') === ruleId);
59
34
  }
60
- function convertEncodedXmlIntoJson(encodedXml) {
61
- return (0, base_converter_1.parseXml)(encodedXml);
35
+ function getStatus(testResultStatus) {
36
+ switch (testResultStatus) {
37
+ case 'pass':
38
+ return inspecjs_1.ExecJSON.ControlResultStatus.Passed;
39
+ case 'fail':
40
+ return inspecjs_1.ExecJSON.ControlResultStatus.Failed;
41
+ case 'error':
42
+ return inspecjs_1.ExecJSON.ControlResultStatus.Error;
43
+ case 'unknown':
44
+ return inspecjs_1.ExecJSON.ControlResultStatus.Error;
45
+ case 'notapplicable':
46
+ return inspecjs_1.ExecJSON.ControlResultStatus.Skipped;
47
+ case 'notchecked':
48
+ return inspecjs_1.ExecJSON.ControlResultStatus.Skipped;
49
+ case 'notselected':
50
+ return inspecjs_1.ExecJSON.ControlResultStatus.Skipped;
51
+ case 'informational':
52
+ return inspecjs_1.ExecJSON.ControlResultStatus.Skipped;
53
+ case 'fixed':
54
+ return inspecjs_1.ExecJSON.ControlResultStatus.Passed;
55
+ default:
56
+ return inspecjs_1.ExecJSON.ControlResultStatus.Error;
57
+ }
62
58
  }
63
- function extractProfile(profile, pathProfileItemPossibilities) {
64
- const profileInfo = {
65
- id: '',
66
- description: '',
67
- title: ''
68
- };
69
- for (const profileKey of Object.keys(pathProfileItemPossibilities)) {
70
- for (const pathProfileItem of pathProfileItemPossibilities[profileKey]) {
71
- const item = lodash_1.default.get(profile, pathProfileItem);
72
- if (item) {
73
- if (profileKey === 'description') {
74
- profileInfo[profileKey] =
75
- convertEncodedXmlIntoJson(item);
76
- }
77
- else {
78
- profileInfo[profileKey] = item;
79
- }
80
- break;
81
- }
59
+ function getValues(rule, group, benchmark) {
60
+ const checks = asArray(lodash_1.default.get(rule, 'check'));
61
+ if (!checks) {
62
+ return [];
63
+ }
64
+ const ruleValueIds = [];
65
+ for (const check of checks) {
66
+ const valueId = lodash_1.default.get(check, 'check-export.value-id');
67
+ if (valueId) {
68
+ ruleValueIds.push(valueId);
69
+ }
70
+ }
71
+ const matchingValues = [];
72
+ for (const values of [lodash_1.default.get(group, 'Value'), lodash_1.default.get(benchmark, 'Value')]) {
73
+ if (!values) {
74
+ continue;
82
75
  }
76
+ matchingValues.push(...asArray(values).filter((value) => ruleValueIds.includes(lodash_1.default.get(value, 'id'))));
83
77
  }
84
- return profileInfo;
78
+ return matchingValues;
85
79
  }
86
- function getProfiles(profiles, pathSelectPossibilities, pathProfileItemPossibilities) {
87
- const profileInfos = [];
80
+ function getProfiles(ids, benchmark) {
81
+ const matchingProfiles = [];
82
+ const profiles = asArray(lodash_1.default.get(benchmark, 'Profile'));
88
83
  for (const profile of profiles) {
89
- for (const pathSelect of pathSelectPossibilities) {
90
- const select = lodash_1.default.get(profile, pathSelect);
91
- if (select === undefined) {
92
- continue;
93
- }
94
- const selected = lodash_1.default.some(select, (element) => idTracker.replace('rule_SV', 'group_V').replace(/r\d+_rule/, '') ===
95
- lodash_1.default.get(element, 'idref') && lodash_1.default.get(element, 'selected') === 'true');
96
- if (selected) {
97
- profileInfos.push(extractProfile(profile, pathProfileItemPossibilities));
98
- }
84
+ const selects = asArray(lodash_1.default.get(profile, 'select'));
85
+ if (selects.find((select) => ids.includes(lodash_1.default.get(select, 'idref')) &&
86
+ lodash_1.default.get(select, 'selected') === 'true')) {
87
+ matchingProfiles.push(profile);
99
88
  }
100
89
  }
101
- return profileInfos;
90
+ return matchingProfiles;
102
91
  }
103
92
  function extractCci(input) {
104
- let inputArray;
105
- if (Array.isArray(input)) {
106
- inputArray = input;
107
- }
108
- else {
109
- inputArray = [input];
110
- }
93
+ const inputArray = asArray(input);
111
94
  const CCI_REGEX = /CCI-(\d*)/;
112
95
  const output = [];
113
- inputArray.forEach((element) => {
96
+ for (const element of inputArray) {
114
97
  const text = lodash_1.default.get(element, 'text');
115
- if (text.match(CCI_REGEX)) {
98
+ if (!!text && CCI_REGEX.exec(text)) {
116
99
  output.push(text);
117
100
  }
118
- });
101
+ }
119
102
  return output;
120
103
  }
121
104
  function nistTag(input) {
122
- const identifiers = extractCci(input);
123
- return CCI_NIST_MAPPING.nistFilter(identifiers, global_1.DEFAULT_STATIC_CODE_ANALYSIS_NIST_TAGS, false);
105
+ return lodash_1.default.uniq(CCI_NIST_MAPPING.nistFilter(extractCci(input), global_1.DEFAULT_STATIC_CODE_ANALYSIS_NIST_TAGS, false).concat(asArray(input)
106
+ .filter((x) => !!x)
107
+ .map((x) => x.text)
108
+ .map(inspecjs_1.parse_nist)
109
+ .filter((x) => !!x)
110
+ .filter(inspecjs_1.is_control)
111
+ .map((x) => x.canonize())));
112
+ }
113
+ function getRulesInGroup(allRules, benchmark, group) {
114
+ const subGroups = asArray(lodash_1.default.get(group, 'Group'));
115
+ if (subGroups) {
116
+ for (const subGroup of subGroups) {
117
+ getRulesInGroup(allRules, benchmark, subGroup);
118
+ }
119
+ }
120
+ const rules = asArray(lodash_1.default.get(group, 'Rule'));
121
+ if (rules) {
122
+ for (const rule of rules) {
123
+ allRules.push(lodash_1.default.merge({}, rule, {
124
+ group: lodash_1.default.omit(group, ['Rule', 'Group']),
125
+ ruleResult: getRuleResult(lodash_1.default.get(rule, 'id'), benchmark),
126
+ profiles: getProfiles([lodash_1.default.get(rule, 'id'), lodash_1.default.get(group, 'id')], benchmark),
127
+ values: getValues(rule, group, benchmark)
128
+ }));
129
+ }
130
+ }
131
+ }
132
+ function getRulesInBenchmark(input) {
133
+ const benchmark = input;
134
+ const groups = asArray(lodash_1.default.get(benchmark, 'Group'));
135
+ const allRules = [];
136
+ for (const group of groups) {
137
+ getRulesInGroup(allRules, benchmark, group);
138
+ }
139
+ return allRules;
124
140
  }
125
141
  class XCCDFResultsMapper extends base_converter_1.BaseConverter {
126
142
  constructor(scapXml, withRaw = false) {
@@ -150,7 +166,7 @@ class XCCDFResultsMapper extends base_converter_1.BaseConverter {
150
166
  path: 'Benchmark',
151
167
  transformer: (input) => {
152
168
  const descriptionPaths = [
153
- ['description.text', 'description'],
169
+ ['description.text'],
154
170
  ['front-matter'],
155
171
  ['metadata'],
156
172
  ['model'],
@@ -205,133 +221,177 @@ class XCCDFResultsMapper extends base_converter_1.BaseConverter {
205
221
  status: 'loaded',
206
222
  controls: [
207
223
  {
208
- path: 'Benchmark.Group',
224
+ path: 'Benchmark',
225
+ pathTransform: getRulesInBenchmark,
209
226
  key: 'id',
210
227
  tags: {
211
228
  cci: {
212
- path: 'Rule.ident',
229
+ path: ['ident', 'reference'],
213
230
  transformer: extractCci
214
231
  },
215
232
  nist: {
216
- path: 'Rule.ident',
233
+ path: ['ident', 'reference'],
217
234
  transformer: nistTag
218
235
  },
219
- severity: { path: 'Rule.severity' },
236
+ severity: { path: 'severity' },
220
237
  description: {
221
- path: ['Rule.description.text', 'Rule.description'],
222
- transformer: (description) => JSON.stringify(lodash_1.default.pickBy(convertEncodedXmlIntoJson(description), lodash_1.default.identity))
238
+ path: ['description.text', 'description'],
239
+ transformer: (description) => lodash_1.default.get((0, base_converter_1.parseXml)(description), 'VulnDiscussion', description)
223
240
  },
224
- group_id: { path: 'id' },
225
- group_title: { path: ['title.text', 'title'] },
241
+ group_id: { path: 'group.id' },
242
+ group_title: { path: ['group.title.text', 'group.title'] },
226
243
  group_description: {
227
- path: ['description.text', 'description'],
228
- transformer: (description) => JSON.stringify(lodash_1.default.pickBy(convertEncodedXmlIntoJson(description), lodash_1.default.identity))
244
+ path: ['group.description.text', 'group.description'],
245
+ transformer: (description) => lodash_1.default.get((0, base_converter_1.parseXml)(description), 'GroupDescription', description)
229
246
  },
230
- rule_id: { path: 'Rule.id' },
231
- check: { path: 'Rule.check' },
232
- fix_id: { path: 'Rule.fix.id' },
247
+ rule_id: { path: 'id' },
248
+ check: {
249
+ path: 'check',
250
+ transformer: (data) => JSON.stringify(data, null, 2)
251
+ },
252
+ fix_id: { path: 'fix.id' },
233
253
  fixtext_fixref: {
234
- path: 'Rule.fixtext.fixref'
254
+ path: ['fixtext.fixref.text', 'fixtext.fixref'],
255
+ transformer: (text) => text || undefined
235
256
  },
236
- ident: { path: 'Rule.ident' },
237
- reference: { path: 'Rule.reference' },
238
- selected: { path: 'Rule.selected' },
239
- version: { path: 'Rule.version.text' },
240
- weight: { path: 'Rule.weight' },
241
- profiles: {
242
- path: '$.Benchmark.Profile',
243
- transformer: (profiles) => {
244
- const pathsSelect = ['select'];
245
- const paths = {
246
- id: ['id'],
247
- description: ['description.text', 'description'],
248
- title: ['title.text', 'title']
249
- };
250
- return getProfiles(profiles, pathsSelect, paths);
251
- }
257
+ ident: {
258
+ path: 'ident',
259
+ transformer: (text) => text || undefined
252
260
  },
261
+ reference: {
262
+ path: 'reference',
263
+ transformer: (data) => ({
264
+ references: data
265
+ })
266
+ },
267
+ selected: { path: 'selected' },
268
+ weight: { path: 'weight' },
269
+ profiles: [
270
+ {
271
+ path: ['profiles'],
272
+ id: { path: ['id'] },
273
+ description: {
274
+ path: ['description.text', 'description'],
275
+ transformer: (description) => lodash_1.default.get((0, base_converter_1.parseXml)(description), 'ProfileDescription', description)
276
+ },
277
+ title: { path: ['title.text', 'title'] }
278
+ }
279
+ ],
253
280
  rule_result: {
254
- path: '$.Benchmark.TestResult',
255
- transformer: (testResult) => getRuleResultItem(testResult, RULE_RESULT_PATHS)
281
+ path: ['ruleResult']
256
282
  },
257
283
  value: {
258
- path: '$.Benchmark.Value',
259
- transformer: (values) => {
260
- return lodash_1.default.find(values, (value) => {
261
- const id = lodash_1.default.get(value, 'id');
262
- return id && id === valueIdTracker;
263
- });
264
- }
265
- }
284
+ path: ['values'],
285
+ transformer: (values) => asArray(values).map((value) => ({
286
+ title: lodash_1.default.get(value, 'title'),
287
+ description: lodash_1.default.get(value, 'description.text') ||
288
+ lodash_1.default.get(value, 'description'),
289
+ warning: lodash_1.default.get(value, 'warning.text') || lodash_1.default.get(value, 'warning'),
290
+ value: lodash_1.default.get(value, 'value'),
291
+ Id: lodash_1.default.get(value, 'Id'),
292
+ id: lodash_1.default.get(value, 'id'),
293
+ type: lodash_1.default.get(value, 'type'),
294
+ interactive: lodash_1.default.get(value, 'interactive')
295
+ }))
296
+ },
297
+ transformer: (data) => ({
298
+ ...(0, global_1.conditionallyProvideAttribute)('version', lodash_1.default.get(data, 'version.text'), lodash_1.default.has(data, 'version.text'))
299
+ })
266
300
  },
267
- refs: [],
268
- source_location: {},
269
- title: { path: ['Rule.title.text', 'Rule.title'] },
270
- id: {
271
- path: 'Rule',
272
- transformer: (input) => {
273
- const valueIdPaths = ['check.check-export.value-id'];
274
- let setValueIdTracker = false;
275
- for (const path of valueIdPaths) {
276
- const valueId = lodash_1.default.get(input, path);
277
- if (valueId !== undefined) {
278
- valueIdTracker = valueId;
279
- setValueIdTracker = true;
280
- }
281
- }
282
- if (!setValueIdTracker) {
283
- valueIdTracker = undefined;
284
- }
285
- const id = lodash_1.default.get(input, 'id');
286
- if (typeof id === 'string') {
287
- idTracker = id;
288
- return id.split('_S')[1].split('r')[0];
289
- }
290
- else {
291
- return '';
301
+ refs: [
302
+ {
303
+ path: 'reference',
304
+ transformer: (data) => ({
305
+ ...(0, global_1.conditionallyProvideAttribute)('url', lodash_1.default.get(data, 'href'), lodash_1.default.has(data, 'href')),
306
+ ref: [
307
+ {
308
+ ...(0, global_1.conditionallyProvideAttribute)('text', lodash_1.default.get(data, 'text'), lodash_1.default.has(data, 'text')),
309
+ ...(0, global_1.conditionallyProvideAttribute)('publisher', lodash_1.default.get(data, 'publisher'), lodash_1.default.has(data, 'publisher')),
310
+ ...(0, global_1.conditionallyProvideAttribute)('identifier', lodash_1.default.get(data, 'identifier'), lodash_1.default.has(data, 'identifier')),
311
+ ...(0, global_1.conditionallyProvideAttribute)('type', lodash_1.default.get(data, 'type'), lodash_1.default.has(data, 'type'))
312
+ }
313
+ ]
314
+ }),
315
+ ref: {
316
+ path: 'text',
317
+ transformer: (text) => text || undefined
318
+ },
319
+ url: {
320
+ path: 'href',
321
+ transformer: (text) => text || undefined
292
322
  }
293
323
  }
294
- },
324
+ ],
325
+ source_location: {},
326
+ title: { path: ['title.text', 'title'] },
327
+ id: { path: ['id'] },
295
328
  desc: {
296
- path: ['Rule.description.text', 'Rule.description'],
297
- transformer: (description) => {
298
- const descTextJson = convertEncodedXmlIntoJson(description);
299
- return lodash_1.default.get(descTextJson, 'VulnDiscussion', '');
300
- }
329
+ path: ['description.text', 'description'],
330
+ transformer: (description) => lodash_1.default.get((0, base_converter_1.parseXml)(description), 'ProfileDescription', description)
301
331
  },
302
332
  descriptions: [
303
333
  {
304
- data: {
305
- path: 'Rule.check.check-content-ref.name',
306
- transformer: base_converter_1.parseHtml
307
- },
308
- label: 'check'
334
+ path: ['check.check-content-ref.name'],
335
+ transformer: (data) => ({
336
+ data: asArray(data).join('\n'),
337
+ label: 'check'
338
+ })
309
339
  },
310
340
  {
311
- data: {
312
- path: 'Rule.fixtext.text',
313
- transformer: base_converter_1.parseHtml
314
- },
315
- label: 'fix'
341
+ path: ['fixtext.text', 'fix.text'],
342
+ transformer: (data) => ({
343
+ data: asArray(data).map(base_converter_1.parseHtml).join('\n'),
344
+ label: 'fix'
345
+ })
346
+ },
347
+ {
348
+ path: ['rationale.text'],
349
+ transformer: (data) => ({
350
+ data: asArray(data).map(base_converter_1.parseHtml).join('\n'),
351
+ label: 'rationale'
352
+ })
353
+ },
354
+ {
355
+ path: ['warning.text'],
356
+ transformer: (data) => ({
357
+ data: asArray(data).map(base_converter_1.parseHtml).join('\n'),
358
+ label: 'warning'
359
+ })
316
360
  }
317
361
  ],
318
362
  impact: {
319
- path: 'Rule.severity',
320
- transformer: (0, base_converter_1.impactMapping)(IMPACT_MAPPING)
363
+ transformer: (vulnerability) => {
364
+ const ruleResult = lodash_1.default.get(vulnerability, 'ruleResult');
365
+ if (ruleResult) {
366
+ const result = lodash_1.default.get(ruleResult, 'result');
367
+ if (result === 'notapplicable' ||
368
+ result === 'informational') {
369
+ return 0;
370
+ }
371
+ }
372
+ return (0, base_converter_1.impactMapping)(IMPACT_MAPPING)(lodash_1.default.get(vulnerability, 'severity'));
373
+ }
321
374
  },
322
375
  code: {
323
- transformer: (vulnerability) => JSON.stringify(vulnerability, null, 2)
376
+ transformer: (vulnerability) => JSON.stringify(lodash_1.default.omit(vulnerability, [
377
+ 'group',
378
+ 'ruleResult',
379
+ 'profiles',
380
+ 'values'
381
+ ]), null, 2)
324
382
  },
325
383
  results: [
326
384
  {
327
385
  status: {
328
- path: '$.Benchmark.TestResult',
386
+ path: ['ruleResult.result'],
329
387
  transformer: getStatus
330
388
  },
331
- code_desc: '',
389
+ code_desc: {
390
+ path: ['description.text', 'description'],
391
+ transformer: (description) => lodash_1.default.get((0, base_converter_1.parseXml)(description), 'VulnDiscussion', description)
392
+ },
332
393
  start_time: {
333
- path: '$.Benchmark.TestResult',
334
- transformer: getStartTime
394
+ path: ['ruleResult.time']
335
395
  }
336
396
  }
337
397
  ]
package/lib/src/xccdf-results-mapper.js.map CHANGED
@@ -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.57",
3
+ "version": "2.6.59",
4
4
  "license": "Apache-2.0",
5
5
  "description": "Converter util library used to transform various scan results into HDF format",
6
6
  "files": [
@@ -39,7 +39,7 @@
39
39
  "fast-xml-parser": "^4.2.0",
40
40
  "html-entities": "^2.3.2",
41
41
  "htmlparser2": "^6.1.0",
42
- "inspecjs": "^2.6.47",
42
+ "inspecjs": "^2.6.58",
43
43
  "lodash": "^4.17.21",
44
44
  "moment": "^2.29.1",
45
45
  "ms": "^2.1.3",