inspec_tools 2.0.2.pre5 → 2.0.2.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f2c0eda1119a5560af3597e53f774190658d082a0e7e9828a9c186e77fe1e87
-  data.tar.gz: 94d5810cddc50f292dff9014ef0aca1bdf651862aaf3e772b96435136bda38a3
+  metadata.gz: 87b6bbd0df65db41870f46c0b67579f6678cbddcbc430e84239809f495b3438f
+  data.tar.gz: 0f89d4f3cb90827083762b1ef0ee65c5321f1ee2bee03f84588f303854111cd3
 SHA512:
-  metadata.gz: 3c649a11fbf1e44ab2f9012479254757f5f8c9183aa7e93042427fbfca659d3ff77058c8a9f5edded598c5b6ec77144fd142dc7a860cda04442bf15019414e83
-  data.tar.gz: a95c81c8662de7fab071f26e751b03100bfb8d8535e6225a73d5913d66487542d59a120d598e89c044d4b32e4efb81664fceb723efdf0c420d15e6dbcb57f1d2
+  metadata.gz: 7bfe5ba90ce7a93dde6fdf48f9c0789592814ea568b3c191748882dc2630df4e52fcffebea71472615425b7f89fd4df5dd570c141ea70f6111474ffc27b86eea
+  data.tar.gz: 990e101238e1f5b9f66fd7af898386acc3e624d67e9c672189c1b1040efbe3b1774af4dab222a79596ee44872211d75cd9ea8d7101c67a15d00a69e9e750c882

data/CHANGELOG.md

@@ -2,7 +2,29 @@
 
 ## [Unreleased](https://github.com/mitre/inspec_tools/tree/HEAD)
 
-[Full Changelog](https://github.com/mitre/inspec_tools/compare/v2.0.1.pre4...HEAD)
+[Full Changelog](https://github.com/mitre/inspec_tools/compare/v2.0.2.pre5...HEAD)
+
+**Implemented enhancements:**
+
+- Remove tag with NIST revision [\#139](https://github.com/mitre/inspec_tools/issues/139)
+
+**Fixed bugs:**
+
+- CCE- data seems to be coming into the CCI references in some XCCDF files [\#151](https://github.com/mitre/inspec_tools/issues/151)
+- small fix to resolve issues with CCE data in the XCCDF [\#156](https://github.com/mitre/inspec_tools/pull/156) ([aaronlippold](https://github.com/aaronlippold))
+
+**Closed issues:**
+
+- update inspec2ckl schema to the newest CKL Schema in the stig viewer 2.10 [\#149](https://github.com/mitre/inspec_tools/issues/149)
+- Categorize all errors the same [\#145](https://github.com/mitre/inspec_tools/issues/145)
+
+**Merged pull requests:**
+
+- Apply fixes from CodeFactor [\#153](https://github.com/mitre/inspec_tools/pull/153) ([aaronlippold](https://github.com/aaronlippold))
+
+## [v2.0.2.pre5](https://github.com/mitre/inspec_tools/tree/v2.0.2.pre5) (2020-04-15)
+
+[Full Changelog](https://github.com/mitre/inspec_tools/compare/v2.0.1.pre4...v2.0.2.pre5)
 
 **Implemented enhancements:**
 
@@ -430,6 +452,7 @@
 
 - Updated rake version [\#69](https://github.com/mitre/inspec_tools/pull/69) ([robthew](https://github.com/robthew))
 - Add in 'inspec' and 'fileutils' require statements [\#65](https://github.com/mitre/inspec_tools/pull/65) ([samcornwell](https://github.com/samcornwell))
+- Metadata docs and tools [\#55](https://github.com/mitre/inspec_tools/pull/55) ([samcornwell](https://github.com/samcornwell))
 
 ## [v1.4.1](https://github.com/mitre/inspec_tools/tree/v1.4.1) (2019-06-20)
 
@@ -472,7 +495,6 @@
 
 **Merged pull requests:**
 
-- Metadata docs and tools [\#55](https://github.com/mitre/inspec_tools/pull/55) ([samcornwell](https://github.com/samcornwell))
 - Fix bugs introduced by \#51 \(STIGViewer PR\) [\#52](https://github.com/mitre/inspec_tools/pull/52) ([samcornwell](https://github.com/samcornwell))
 - Enhancements to meet working with STIGViewer as well as tracking some custom metadata when converting from xccdf2inspec and inspec2ckl [\#51](https://github.com/mitre/inspec_tools/pull/51) ([kevin-j-smith](https://github.com/kevin-j-smith))
 - Add modules summary, compliance [\#45](https://github.com/mitre/inspec_tools/pull/45) ([rx294](https://github.com/rx294))

data/lib/happy_mapper_tools/cci_attributes.rb

@@ -3,7 +3,7 @@
 require 'happymapper'
 require 'nokogiri'
 
-# rubocop: disable Naming/ClassAndModuleCamelCase
+# rubocop:disable Naming/ClassAndModuleCamelCase
 
 module HappyMapperTools
   module CCIAttributes
@@ -18,13 +18,6 @@ module HappyMapperTools
       attribute :index, String, tag: 'index'
     end
 
-    class References
-      include HappyMapper
-      tag 'references'
-
-      has_many :references, Reference, tag: 'reference'
-    end
-
     class CCI_Item
       include HappyMapper
       tag 'cci_item'
@@ -35,14 +28,7 @@ module HappyMapperTools
       element :contributor, String, tag: 'contributor'
       element :definition, String, tag: 'definition'
       element :type, String, tag: 'type'
-      has_one :references, References, tag: 'references'
-    end
-
-    class CCI_Items
-      include HappyMapper
-      tag 'cci_items'
-
-      has_many :cci_item, CCI_Item, tag: 'cci_item'
+      has_many :references, Reference, xpath: 'xmlns:references'
     end
 
     class Metadata
@@ -60,17 +46,21 @@ module HappyMapperTools
       attribute :xsi, String, tag: 'xsi', namespace: 'xmlns'
       attribute :schemaLocation, String, tag: 'schemaLocation', namespace: 'xmlns'
       has_one :metadata, Metadata, tag: 'metadata'
-      has_many :cci_items, CCI_Items, tag: 'cci_items'
+      has_many :cci_items, CCI_Item, xpath: 'xmlns:cci_items'
 
       def fetch_nists(ccis)
         ccis = [ccis] unless ccis.is_a?(Array)
-        nists = []
-        nist_ver = cci_items[0].cci_item[0].references.references.max_by(&:version).version
-        ccis.each do |cci|
-          nists << cci_items[0].cci_item.select { |item| item.id == cci }.first.references.references.max_by(&:version).index
+
+        # some of the XCCDF files were having CCE- tags show up which
+        # we don't support, not sure if this is a typo on their part or
+        # we need to see about supporting CCE tags but ... for now
+        filtered_ccis = ccis.select { |f| /CCI-/.match(f) }
+        filtered_ccis.map do |cci|
+          cci_items.find { |item| item.id == cci }.references.max_by(&:version).index
         end
-        nists << ('Rev_' + nist_ver)
       end
     end
   end
 end
+
+# rubocop:enable Naming/ClassAndModuleCamelCase

data/lib/inspec_tools/inspec.rb

@@ -84,7 +84,7 @@ module InspecTools
       inspec_json['controls'].each do |json_control|
         control = []
         headers.each do |key, _|
-          control.push(json_control[key] || json_control['tags'][key] || (json_control['results']&.collect { |result| result[key] }&.join(",\n")) || nil)
+          control.push(json_control[key] || json_control['tags'][key] || json_control['results']&.collect { |result| result[key] }&.join(",\n") || nil)
         end
         data.push(control)
       end

data/lib/inspec_tools_plugin.rb

@@ -1,4 +1,4 @@
- # frozen_string_literal: true
+# frozen_string_literal: true
 
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)

data/lib/utilities/inspec_util.rb

@@ -24,11 +24,11 @@ module Utils
     DATA_NOT_FOUND_MESSAGE = 'N/A'.freeze
     WIDTH = 80
     IMPACT_SCORES = {
-      "none" => 0.0,
-      "low" => 0.1,
-      "medium" => 0.4,
-      "high" => 0.7,
-      "critical" => 0.9,
+      'none' => 0.0,
+      'low' => 0.1,
+      'medium' => 0.4,
+      'high' => 0.7,
+      'critical' => 0.9
     }.freeze
 
     def self.parse_data_for_xccdf(json)
@@ -197,7 +197,7 @@ module Utils
 
     private_class_method def self.float_to_impact(severity)
       raise SeverityInputError, "'#{severity}' is not a valid severity value. It should be a Float between 0.0 and " \
-                                  '1.0 or one of the approved keywords.' unless severity.between?(0,1)
+                                  '1.0 or one of the approved keywords.' unless severity.between?(0, 1)
 
       if severity <= 0.01
         0.0 # Informative
@@ -233,7 +233,7 @@ module Utils
       return if impact.nil?
 
       value = impact.to_f
-      unless value.between?(0,1)
+      unless value.between?(0, 1)
         raise ImpactInputError, "'#{value}' is not a valid impact score. Valid impact scores: [0.0 - 1.0]."
       end
 
@@ -277,9 +277,9 @@ module Utils
         control.title  = json_control['title']
         control.impact = get_impact(json_control['impact'])
 
-        #json_control['tags'].each do |tag|
+        # json_control['tags'].each do |tag|
         #  control.add_tag(Inspec::Object::Tag.new(tag.key, tag.value)
-        #end
+        # end
 
         control.add_tag(::Inspec::Object::Tag.new('severity', json_control['tags']['severity']))
         control.add_tag(::Inspec::Object::Tag.new('gtitle', json_control['tags']['gtitle']))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inspec_tools
 version: !ruby/object:Gem::Version
-  version: 2.0.2.pre5
+  version: 2.0.2.pre6
 platform: ruby
 authors:
 - Robert Thew
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize