inspec_tools 2.0.2.pre8 → 2.0.2.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c0c4c149888d3a7b8c1c4455e4110ca665cac3ed59544120a2cc0447a031544
-  data.tar.gz: dac8d2543995b1aaceb383b1a9239c1280cfd74b2effb99796f558a0e9ef2812
+  metadata.gz: b75aa0b436aae36965200a1ca02ca855c07783b51b554110643eca1b8570a7ee
+  data.tar.gz: bba056d0df721fc0d1c3346193b62eb80c41e61d35e8a11dc1410bf017cf0433
 SHA512:
-  metadata.gz: 020fd1249cbe919996fbc7037cb6d5d55bad2a99ee6f8eed7044afc3452804cc264940c471c110b003b59e24c31039c194e6553b7114c9be2b353d41682a01f8
-  data.tar.gz: 44911ab26c33046670a35a2a5919afb0c4a1b8de38838dd04dfc65720df9020018f566cfb1e027fe014209b72d18cd2800aa3d6fc2cfd9af84758bae39bbc73f
+  metadata.gz: 00cdbaa21811eea1ba654c59f893e59d2d342cad3a0d2ed9007c1029f39e48d649c24b5a45a22eb88218604692ef37a1c3022a0a58c3bd8efe7a8f2f21d1e53f
+  data.tar.gz: 9d4586896d1f87031abe6a3d6c855d88357a2d16cb2af8dda7be6098d20935cd68f9c2f160b909e39d80f1143af9aa507c548c5cfed204cc6ede27477ffc0cc2

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.2.pre7...HEAD)
+[Full Changelog](https://github.com/mitre/inspec_tools/compare/v2.0.2.pre8...HEAD)
+
+**Implemented enhancements:**
+
+- Ensure the output of our converters formats with a standard of 2-space  [\#140](https://github.com/mitre/inspec_tools/issues/140)
+- Ensure we do not create code that uses " where ' are the correct style [\#138](https://github.com/mitre/inspec_tools/issues/138)
+
+**Fixed bugs:**
+
+- Summary always returns 0 for profile errors [\#164](https://github.com/mitre/inspec_tools/issues/164)
+- Multiple fields missing from CKL generated with inspec2ckl [\#150](https://github.com/mitre/inspec_tools/issues/150)
+- update inspec2ckl to support both tag and sub-descriptions in output [\#148](https://github.com/mitre/inspec_tools/issues/148)
+
+**Merged pull requests:**
+
+- Apply fixes from CodeFactor [\#172](https://github.com/mitre/inspec_tools/pull/172) ([aaronlippold](https://github.com/aaronlippold))
+- Add parameter to InspecUtils\#control\_status to specify when used for summary. [\#170](https://github.com/mitre/inspec_tools/pull/170) ([Bialogs](https://github.com/Bialogs))
+- Generate Ruby with Single Quoted Strings [\#169](https://github.com/mitre/inspec_tools/pull/169) ([Bialogs](https://github.com/Bialogs))
+- Update CKL parse method to dig into sub descriptions [\#168](https://github.com/mitre/inspec_tools/pull/168) ([Bialogs](https://github.com/Bialogs))
+
+## [v2.0.2.pre8](https://github.com/mitre/inspec_tools/tree/v2.0.2.pre8) (2020-04-30)
+
+[Full Changelog](https://github.com/mitre/inspec_tools/compare/v2.0.2.pre7...v2.0.2.pre8)
 
 **Fixed bugs:**
 
@@ -275,6 +297,7 @@
 **Merged pull requests:**
 
 - Remove warnings \(\#minor\) [\#101](https://github.com/mitre/inspec_tools/pull/101) ([Bialogs](https://github.com/Bialogs))
+- Update github workflows [\#99](https://github.com/mitre/inspec_tools/pull/99) ([Bialogs](https://github.com/Bialogs))
 
 ## [v1.6.21](https://github.com/mitre/inspec_tools/tree/v1.6.21) (2020-03-20)
 
@@ -300,10 +323,6 @@
 
 [Full Changelog](https://github.com/mitre/inspec_tools/compare/v1.6.18...v1.6.19)
 
-**Merged pull requests:**
-
-- Update github workflows [\#99](https://github.com/mitre/inspec_tools/pull/99) ([Bialogs](https://github.com/Bialogs))
-
 ## [v1.6.18](https://github.com/mitre/inspec_tools/tree/v1.6.18) (2020-03-16)
 
 [Full Changelog](https://github.com/mitre/inspec_tools/compare/v1.6.17...v1.6.18)
@@ -490,6 +509,7 @@
 **Merged pull requests:**
 
 - 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))
 
 ## [v1.4.1](https://github.com/mitre/inspec_tools/tree/v1.4.1) (2019-06-20)
 
@@ -501,7 +521,6 @@
 
 **Merged pull requests:**
 
-- Add in 'inspec' and 'fileutils' require statements [\#65](https://github.com/mitre/inspec_tools/pull/65) ([samcornwell](https://github.com/samcornwell))
 - Apply fixes from CodeFactor [\#61](https://github.com/mitre/inspec_tools/pull/61) ([aaronlippold](https://github.com/aaronlippold))
 
 ## [v1.3.6](https://github.com/mitre/inspec_tools/tree/v1.3.6) (2019-05-02)

data/README.md

@@ -143,7 +143,7 @@ USAGE: inspec_tools summary [OPTIONS] -j <inspec-json> -o <summary-csv>
 FLAGS:
 	-j --inspec-json <inspec-json>   : path to InSpec results JSON
 	-o --output <output-json> 		   : path to summary JSON
-  -c --cli, --no-cli               : print summary to STDOUT
+  -c --cli, --no-cli               : print formatted summary to STDOUT
   -V --verbose, --no-verbose       : print verbose an debug output
   -f --json-full, --no-json-full   : print the summary STDOUT as JSON
   -k --json-counts, --no-json_cou  : print the reslut status to STDOUT as JSON

data/lib/data/attributes.yml

@@ -1,24 +1,23 @@
 ---
 benchmark.title: PostgreSQL 9.x Security Technical Implementation Guide
 benchmark.id: PostgreSQL_9-x_STIG
-benchmark.description:
-  "This Security Technical Implementation Guide is published
+benchmark.description: 'This Security Technical Implementation Guide is published
   as a tool to improve the security of Department of Defense (DoD) information systems.
   The requirements are derived from the National Institute of Standards and Technology
   (NIST) 800-53 and related documents. Comments or proposed revisions to this document
-  should be sent via email to the following address: disa.stig_spt@mail.mil."
-benchmark.version: "1"
+  should be sent via email to the following address: disa.stig_spt@mail.mil.'
+benchmark.version: '1'
 benchmark.status: accepted
-benchmark.status.date: "2017-01-20"
+benchmark.status.date: '2017-01-20'
 benchmark.notice.id: terms-of-use
-benchmark.plaintext: "Release: 1 Benchmark Date: 20 Jan 2017"
+benchmark.plaintext: 'Release: 1 Benchmark Date: 20 Jan 2017'
 benchmark.plaintext.id: release-info
-reference.href: https://public.cyber.mil/
+reference.href: http://iase.disa.mil
 reference.dc.publisher: DISA
 reference.dc.source: STIG.DOD.MIL
 reference.dc.title: DPMS Target PostgreSQL 9.x
 reference.dc.subject: PostgreSQL 9.x
 reference.dc.type: DPMS Target
-reference.dc.identifier: "3087"
+reference.dc.identifier: '3087'
 content_ref.name: M
 content_ref.href: DPMS_XCCDF_Benchmark_PostgreSQL_9-x_STIG.xml

data/lib/inspec_tools/inspec.rb

@@ -151,7 +151,7 @@ module InspecTools
       stig_data_list += handle_cci_ref(control)
       stig_data_list << handle_stigref
 
-      vuln.stig_data = stig_data_list.reject!(&:nil?)
+      vuln.stig_data = stig_data_list.reject(&:nil?)
       vuln.status = Utils::InspecUtil.control_status(control)
       vuln.comments = "\nAutomated compliance tests brought to you by the MITRE corporation and the InSpec project.\n\nInspec Profile: #{control[:profile_name]}\nProfile shasum: #{control[:profile_shasum]}"
       vuln.finding_details = Utils::InspecUtil.control_finding_details(control, vuln.status)

data/lib/inspec_tools/summary.rb

@@ -26,7 +26,7 @@ module InspecTools
       @summary = {}
       @data.keys.each do |control_id|
         current_control = @data[control_id]
-        current_control[:compliance_status] = Utils::InspecUtil.control_status(current_control)
+        current_control[:compliance_status] = Utils::InspecUtil.control_status(current_control, true)
         current_control[:finding_details] = Utils::InspecUtil.control_finding_details(current_control, current_control[:compliance_status])
       end
       compute_summary

data/lib/utilities/inspec_util.rb

@@ -88,9 +88,11 @@ module Utils
         profile['controls'].each do |control|
           c_id = control['id'].to_sym
           data[c_id] = {}
+
           data[c_id][:vuln_num]       = control['id'] unless control['id'].nil?
           data[c_id][:rule_title]     = control['title'] unless control['title'].nil?
           data[c_id][:vuln_discuss]   = control['desc'] unless control['desc'].nil?
+
           unless control['tags'].nil?
             data[c_id][:severity]       = control['tags']['severity'] unless control['tags']['severity'].nil?
             data[c_id][:gid]            = control['tags']['gid'] unless control['tags']['gid'].nil?
@@ -99,15 +101,20 @@ module Utils
             data[c_id][:rule_ver]       = control['tags']['stig_id'] unless control['tags']['stig_id'].nil?
             data[c_id][:cci_ref]        = control['tags']['cci'] unless control['tags']['cci'].nil?
             data[c_id][:nist]           = control['tags']['nist'].join(' ') unless control['tags']['nist'].nil?
-            data[c_id][:check_content]  = control['tags']['check'] unless control['tags']['check'].nil?
-            data[c_id][:fix_text]       = control['tags']['fix'] unless control['tags']['fix'].nil?
           end
+
+          if control['descriptions'].respond_to?(:find)
+            data[c_id][:check_content]  = control['descriptions'].find { |c| c['label'] == 'fix' }&.dig('data')
+            data[c_id][:fix_text]       = control['descriptions'].find { |c| c['label'] == 'check' }&.dig('data')
+          end
+
           data[c_id][:impact]         = control['impact'].to_s unless control['impact'].nil?
           data[c_id][:profile_name]   = profile['name'].to_s unless profile['name'].nil?
           data[c_id][:profile_shasum] = profile['sha256'].to_s unless profile['sha256'].nil?
 
           data[c_id][:status] = []
           data[c_id][:message] = []
+
           if control.key?('results')
             control['results'].each do |result|
               if !result['backtrace'].nil?
@@ -120,6 +127,7 @@ module Utils
               data[c_id][:message].push("PROFILE_ERROR -- Test: #{result['code_desc']}\nMessage: #{result['backtrace']}\n") if result['status'] == 'error'
             end
           end
+
           if data[c_id][:impact].to_f.zero?
             data[c_id][:message].unshift("NOT_APPLICABLE -- Description: #{control['desc']}\n\n")
           end
@@ -143,7 +151,7 @@ module Utils
       end
     end
 
-    def self.control_status(control)
+    def self.control_status(control, for_summary = false)
       status_list = control[:status].uniq
       if control[:impact].to_f.zero?
         'Not_Applicable'
@@ -151,6 +159,8 @@ module Utils
         'Open'
       elsif status_list.include?('passed')
         'NotAFinding'
+      elsif status_list.include?('error') && for_summary
+        'Profile_Error'
       else
         # profile skipped or profile error
         'Not_Reviewed'
@@ -374,7 +384,7 @@ module Utils
             file_name = control.id.to_s
             myfile = File.new("#{directory}/controls/#{file_name}.rb", 'w')
             myfile.puts "# encoding: UTF-8\n\n"
-            myfile.puts wrap(control.to_ruby, WIDTH) + "\n"
+            myfile.puts wrap(control.to_ruby.gsub('"', "\'"), WIDTH) + "\n"
             myfile.close
           end
         else
@@ -390,7 +400,7 @@ module Utils
         if output_format == 'ruby'
           controls.each do |control|
             myfile.puts "# encoding: UTF-8\n\n"
-            myfile.puts wrap(control.to_ruby, WIDTH) + "\n"
+            myfile.puts wrap(control.to_ruby.gsub('"', "\'"), WIDTH) + "\n"
           end
         else
           controls.each do |control|

metadata

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