Produce empty array of CCI tags in JSONIX->CKL mapper if the input JS…

…ONIX is an empty string representing the serialized CCI tags Signed-off-by: Joyce Quach <[email protected]>
mitre · Nov 22, 2024 · 3ada0d5 · 3ada0d5
1 parent ccf28b7
commit 3ada0d5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/libs/hdf-converters/src/ckl-mapper/checklist-jsonix-converter.ts b/libs/hdf-converters/src/ckl-mapper/checklist-jsonix-converter.ts
@@ -264,6 +264,7 @@ export class ChecklistJsonixConverter extends JsonixIntermediateConverter<
     const results = data.filter((attribute: T) => {
       return _.get(attribute, keyName) == tag;
     });
+    // This produces a string that looks like '' or /(w+); (w+)/.
     return results.map((result: T) => _.get(result, dataName)).join('; ');
   }
 

diff --git a/libs/hdf-converters/src/ckl-mapper/checklist-mapper.ts b/libs/hdf-converters/src/ckl-mapper/checklist-mapper.ts
@@ -29,12 +29,21 @@ enum ImpactMapping {
 }
 
 /**
- * Tranformer function that splits a string and return array
+ * Transformer function that splits a string and return array
  * @param input - string of CCI references
  * @returns ref - array of CCI references
  */
 function cciRef(input: string): string[] {
-  return input.split('; ');
+  /* Input string from CKL->jsonix could look like '' or 'CCI-001234; CCI-005678'.
+  The former comes from this tag in the originating CKL:
+  <STIG_DATA>
+    <VULN_ATTRIBUTE>CCI_REF</VULN_ATTRIBUTE>
+    <ATTRIBUTE_DATA></ATTRIBUTE_DATA>
+  </STIG_DATA>
+  */
+  const CCI_REGEX = /CCI-(\d*)/g;
+  const foundCcis = input.match(CCI_REGEX);
+  return foundCcis || [];
 }
 
 /**