inspec_tools 2.3.7 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9633cda4bf3fedc9702dd91ba4ed6b40b68ec8e054eb87ad6ca32d32dfc11e5
-  data.tar.gz: 22f5ab86d76ccbc7f7fc0a684371b791c26f9771e369be54c359121d8c28f4d3
+  metadata.gz: b6f754f4816775d8bb360ed2ce768b1f4a443f647a440a1fe04a371388af6fe0
+  data.tar.gz: d31e79fb1477ab0b9fed85df8847f59f487d1ca5dc0bfc369e201dd2e0b87ba8
 SHA512:
-  metadata.gz: 0e50a5db32e542cd5a66b8bab09a8613c9b8b6ea62513d073a3eb71717397d5c54cf3ccea2c48dd3c0dbc21dbb5d0f9c550744bb8ed6f27f37335a88b0184ea8
-  data.tar.gz: af786d30584f7bf79108b44d9cb653e7673c2716ea7ce72f24fa1c494b4dfc7801f032aeca8829c23f5a1ed9ca8be542b5bf7f4d72fa315400a0b0d1349a3c64
+  metadata.gz: 5f4fe6b5f733d4654d179e0bbe651276afa3ccfff6527e6088f50c13da23324b1be9c6b695cad464895f13e53b442dd674d546c826b31632def647b73d50d26e
+  data.tar.gz: bee2b9f2a53efa941413308ea6eaeb340493c8d581b07a4d348094ba1278c4177fd3de7ee6575226896d41d0156bf6eaf0934a5f0eb597956c1b4c5ff2c07c67

data/lib/happy_mapper_tools/stig_attributes.rb

@@ -158,12 +158,13 @@ module HappyMapperTools
 
         def apply(value)
           value = value.gsub('&', 'and')
-          DescriptionDetails.parse "<Details>#{value}</Details>"
+          value = value.gsub('"<"', 'less than (converted less than)')
+          DescriptionDetails.parse("<Details>#{value}</Details>")
         rescue Nokogiri::XML::SyntaxError => e
-          if e.to_s.include?('StartTag')
-            report_invalid_start_tag(value, e)
+          if report_disallowed_tags(value) # if there was a bad tag
+            exit(1)
           else
-            report_disallowed_tags(value)
+            report_error(value, e)
           end
         end
 
@@ -173,7 +174,7 @@ module HappyMapperTools
 
         private
 
-        def report_invalid_start_tag(value, error)
+        def report_error(value, error)
           puts error.to_s.colorize(:red)
           column = error.column - '<Details>'.length - 2
           puts "Error around #{value[column-10..column+10].colorize(:light_yellow)}"
@@ -184,39 +185,38 @@ module HappyMapperTools
           allowed_tags = %w{VulnDiscussion FalsePositives FalseNegatives Documentable
                             Mitigations SeverityOverrideGuidance PotentialImpacts
                             PotentialImpacts ThirdPartyTools MitigationControl
-                            Responsibility IAControl SecurityOverrideGuidance}
+                            Responsibility IAControl IAControls SecurityOverrideGuidance}
 
           tags_found = value.scan(%r{(?<=<)([^\/]*?)((?= \/>)|(?=>))}).to_a
 
           tags_found = tags_found.uniq.flatten.reject!(&:empty?)
           offending_tags = tags_found - allowed_tags
 
-          if offending_tags.count > 1
-            puts "\n\nThe non-standard tags: #{offending_tags.to_s.colorize(:red)}" \
+          unless offending_tags.count.zero?
+            puts "\n\nThe non-standard tag(s): #{offending_tags.to_s.colorize(:red)}" \
                  ' were found in: ' + "\n\n#{value}"
-          else
-            puts "\n\nThe non-standard tag: #{offending_tags.to_s.colorize(:red)}" \
-                 ' was found in: ' + "\n\n#{value}"
+            puts "\n\nPlease:\n "
+            option_one = '(1) ' + '(best)'.colorize(:green) + ' Use the ' +
+                         '`-r --replace-tags array` '.colorize(:light_yellow) +
+                         '(case sensitive) option to replace the offending tags ' \
+                         'during processing of the XCCDF ' \
+                         'file to use the ' +
+                         "`$#{offending_tags[0]}` ".colorize(:light_green) +
+                         'syntax in your InSpec profile.'
+            option_two = '(2) Update your XCCDF file to *not use* non-standard XCCDF ' \
+                        'elements within ' +
+                         '`&lt;`,`&gt;`, `<` '.colorize(:red) +
+                         'or '.colorize(:default) +
+                         '`>` '.colorize(:red) +
+                         'as "placeholders", and use something that doesn\'t confuse ' \
+                         'the XML parser, such as : ' +
+                         "`$#{offending_tags[0]}`".colorize(:light_green)
+            puts option_one
+            puts "\n"
+            puts option_two
+            return true
           end
-          puts "\n\nPlease:\n "
-          option_one = '(1) ' + '(best)'.colorize(:green) + ' Use the ' +
-                       '`-r --replace-tags array` '.colorize(:light_yellow) +
-                       '(case sensitive) option to replace the offending tags ' \
-                       'during processing of the XCCDF ' \
-                       'file to use the ' +
-                       "`$#{offending_tags[0]}` ".colorize(:light_green) +
-                       'syntax in your InSpec profile.'
-          option_two = '(2) Update your XCCDF file to *not use* non-standard XCCDF ' \
-                       'elements within ' +
-                       '`&lt;`,`&gt;`, `<` '.colorize(:red) +
-                       'or '.colorize(:default) +
-                       '`>` '.colorize(:red) +
-                       'as "placeholders", and use something that doesn\'t confuse ' \
-                       'the XML parser, such as : ' +
-                       "`$#{offending_tags[0]}`".colorize(:light_green)
-          puts option_one
-          puts "\n"
-          puts option_two
+          false
         end
       end
       HappyMapper::SupportedTypes.register DescriptionDetailsType

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inspec_tools
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
 platform: ruby
 authors:
 - Robert Thew
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize