@mitre/inspec-objects 0.0.4 → 0.0.5

package/lib/objects/control.js

@@ -28,13 +28,13 @@ class Control {
         let result = "# encoding: UTF-8\n\n";
         result += `control "${this.id}" do\n`;
         if (this.title) {
-            result += `  title "${(0, global_1.wrapAndEscapeQuotes)(this.title, lineLength)}"\n`;
+            result += `  title "${(0, global_1.wrapAndEscapeQuotes)((0, global_1.removeNewlinePlaceholders)(this.title), lineLength)}"\n`;
         }
         else {
             console.error(`${this.id} does not have a title`);
         }
         if (this.desc) {
-            result += `  desc "${(0, global_1.wrapAndEscapeQuotes)(this.desc, lineLength)}"\n`;
+            result += `  desc "${(0, global_1.wrapAndEscapeQuotes)((0, global_1.removeNewlinePlaceholders)(this.desc), lineLength)}"\n`;
         }
         else {
             console.error(`${this.id} does not have a desc`);
@@ -42,7 +42,7 @@ class Control {
         if (this.descs) {
             Object.entries(this.descs).forEach(([key, desc]) => {
                 if (desc) {
-                    result += `  desc "${key}", "${(0, global_1.wrapAndEscapeQuotes)(desc, lineLength)}"\n`;
+                    result += `  desc "${key}", "${(0, global_1.wrapAndEscapeQuotes)((0, global_1.removeNewlinePlaceholders)(desc), lineLength)}"\n`;
                 }
                 else {
                     console.error(`${this.id} does not have a desc for the value ${key}`);
@@ -58,10 +58,10 @@ class Control {
         if (this.refs) {
             this.refs.forEach((ref) => {
                 if (typeof ref === 'string') {
-                    result += `  ref '${(0, global_1.escapeQuotes)(ref)}'\n`;
+                    result += `  ref '${(0, global_1.escapeQuotes)((0, global_1.removeNewlinePlaceholders)(ref))}'\n`;
                 }
                 else {
-                    result += `  ref '${(0, global_1.escapeQuotes)(ref.ref || '')}', url: '${(0, global_1.escapeQuotes)(ref.url || '')}'`;
+                    result += `  ref '${(0, global_1.escapeQuotes)((0, global_1.removeNewlinePlaceholders)(ref.ref || ''))}', url: '${(0, global_1.escapeQuotes)((0, global_1.removeNewlinePlaceholders)(ref.url || ''))}'`;
                 }
             });
         }
@@ -84,7 +84,7 @@ class Control {
                     }
                 }
                 else if (typeof value === "string") {
-                    result += `  tag ${tag}: "${(0, global_1.wrapAndEscapeQuotes)(value, lineLength)}"\n`;
+                    result += `  tag ${tag}: "${(0, global_1.wrapAndEscapeQuotes)((0, global_1.removeNewlinePlaceholders)(value), lineLength)}"\n`;
                 }
             }
         });

package/lib/parsers/xccdf.d.ts

@@ -5,4 +5,4 @@ export declare type GroupContextualizedRule = BenchmarkRule & {
     group: Omit<BenchmarkGroup, 'Rule' | 'Group'>;
 };
 export declare function extractAllRules(groups: BenchmarkGroup[]): GroupContextualizedRule[];
-export declare function processXCCDF(xml: string, removeNewlines?: boolean, ovalDefinitions?: Record<string, OvalDefinitionValue>): Profile;
+export declare function processXCCDF(xml: string, removeNewlines: boolean | undefined, useRuleId: 'group' | 'rule' | 'version', ovalDefinitions?: Record<string, OvalDefinitionValue>): Profile;

package/lib/parsers/xccdf.js

@@ -25,7 +25,7 @@ function extractAllRules(groups) {
     return rules;
 }
 exports.extractAllRules = extractAllRules;
-function processXCCDF(xml, removeNewlines = false, ovalDefinitions) {
+function processXCCDF(xml, removeNewlines = false, useRuleId, ovalDefinitions) {
     const parsedXML = (0, xccdf_1.convertEncodedXmlIntoJson)(xml);
     const rules = extractAllRules(parsedXML.Benchmark[0].Group);
     const profile = new profile_1.default({
@@ -44,6 +44,19 @@ function processXCCDF(xml, removeNewlines = false, ovalDefinitions) {
         }
         const control = new control_1.default();
         control.id = rule['@_id'];
+        switch (useRuleId) {
+            case 'group':
+                control.id = rule.group['@_id'];
+                break;
+            case 'rule':
+                control.id = rule['@_id'];
+                break;
+            case 'version':
+                control.id = rule.version;
+                break;
+            default:
+                throw new Error('useRuleId must be one of "group", "rule", or "version"');
+        }
         if (removeNewlines) {
             const title = (0, xccdf_1.removeXMLSpecialCharacters)(rule['@_severity'] ? rule.title : `[[[MISSING SEVERITY FROM STIG]]] ${rule.title}`);
             control.title = title.replace(/\n/g, '{{{{newlineHERE}}}}');