inspec_tools 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84cf060364796b3cfd7e3c758498a76379c743452b0ce119e19160b803e81ad8
-  data.tar.gz: dc01762be82174930cb3ba6b59ab02ec1541218ac2567c408f8338d1d6e83e60
+  metadata.gz: 6188a2ff394f6f733d23d032d4919e1f9e5e08267bbce30a2a4725631d5a5a13
+  data.tar.gz: 4b3b5fc70d53d4784ef84f881493ca361d998a254c96323e4e1e65c48e7e5630
 SHA512:
-  metadata.gz: a37d714accd3ea9a04d48f60864a5a1701c15f8a8b88072829c933e1f68be6a61af99b2c1d0c9d59ff830c0754adb165bc34c8925f53a2a90168bee783d8f4c5
-  data.tar.gz: feb725f4dd11cf0db94fa9dd7dbbd8108984f4308d5b266da380fa242da8191ea80fdea495c9a4af722630334a823a65da1c075a7a0756d4c35e6fc422a1d3df
+  metadata.gz: e537d4749c34eaac49e4c80355250949f02d0db6020596d4c73e1f2995e384742cefc5d72a12fb7c2a159ceca406dbc723aa5d8e36ea8272967e9bd37f49da08
+  data.tar.gz: 5a26c4b893a8646ae1e4ae62cd380b0603f0a45b1a88a7234af5a9a8d52a2cc71561d8d0ee784a8bedbbcda7abc26d88b58f999761649bcd29c0adfc464fec78

data/lib/happy_mapper_tools/benchmark.rb

@@ -65,6 +65,14 @@ module HappyMapperTools
       tag 'ident'
       attribute :system, String, tag: 'system'
       content :ident, String
+      def initialize(ident_str)
+        @ident = ident_str
+	if ident_str =~ /^(CCI-[0-9]{6})$/
+          @system = 'http://cyber.mil/cci'
+	else
+          @system = 'http://cyber.mil/legacy'
+	end
+      end
     end
 
     # Class Fixtext maps from the 'fixtext' from Benchmark XML file using HappyMapper

data/lib/utilities/inspec_util.rb

@@ -99,12 +99,12 @@ module Utils
       status_list = control[:status].uniq
       if control[:impact].to_f.zero?
         'Not_Applicable'
+      elsif (status_list.include?('error') || status_list.empty?) && for_summary
+        'Profile_Error'
       elsif status_list.include?('failed')
         'Open'
       elsif status_list.include?('passed')
         'NotAFinding'
-      elsif status_list.include?('error') && for_summary
-        'Profile_Error'
       else
         # profile skipped or profile error
         'Not_Reviewed'

data/lib/utilities/xccdf/from_inspec.rb

@@ -34,6 +34,7 @@ module Utils
         c_data[c_id]['rweight']        = control['tags']['rweight'] if control['tags']['rweight'] # Optional attribute where N/A is not schema compliant
         c_data[c_id]['stig_id']        = control['tags']['stig_id'] || DATA_NOT_FOUND_MESSAGE
         c_data[c_id]['cci']            = control['tags']['cci'] if control['tags']['cci'] # Optional attribute
+        c_data[c_id]['legacy']         = control['tags']['legacy'] if control['tags']['legacy'] # Optional attribute
         c_data[c_id]['nist']           = control['tags']['nist'] || ['unmapped']
         c_data[c_id]['check']          = control['tags']['check'] || DATA_NOT_FOUND_MESSAGE
         c_data[c_id]['checkref']       = control['tags']['checkref'] || DATA_NOT_FOUND_MESSAGE

data/lib/utilities/xccdf/to_xccdf.rb

@@ -74,6 +74,7 @@ module Utils
         end
 
         group.rule.ident = build_rule_idents(control['cci']) if control['cci']
+        group.rule.ident += build_rule_idents(control['legacy']) if control['legacy']
 
         group.rule.fixtext = HappyMapperTools::Benchmark::Fixtext.new
         group.rule.fixtext.fixref = control['fix_id']
@@ -126,10 +127,7 @@ module Utils
 
       # Each rule identifier is a different element
       idents.map do |identifier|
-        ident = HappyMapperTools::Benchmark::Ident.new
-        ident.system = 'https://public.cyber.mil/stigs/cci/'
-        ident.ident = identifier
-        ident
+        ident = HappyMapperTools::Benchmark::Ident.new identifier
       end
     end
 
@@ -227,6 +225,7 @@ module Utils
       rule_result.instance = result['code_desc']
 
       rule_result.ident = build_rule_idents(control['cci']) if control['cci']
+      rule_result.ident += build_rule_idents(control['legacy']) if control['legacy']
 
       # Fix information is only necessary when there are failed tests
       rule_result.fix = build_rule_fix(control['fix_id']) if control['fix_id'] && result_status == 'fail'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inspec_tools
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Robert Thew
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -358,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Converter utils for Inspec