simp-beaker-helpers 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a1a9c3f3df01d3c9a497cb8eb9d0172405fdc6c
-  data.tar.gz: b9466a65c5077ccacc5777c6ae45779450496fa2
+  metadata.gz: 93c78d82485d85c17c4cada7add74c40af92708e
+  data.tar.gz: afda67f5043ec29f2b9818babf53f84ecd8be7e5
 SHA512:
-  metadata.gz: 3c860415c95d94cc9cade8a86d4c44bedd99c8290f048cba7abb398ee3ab07aae9d7aec03b161ad9bfb509e322cbeee721533abdb8e8658fb75f026201adcfed
-  data.tar.gz: 0a4253533c535ac4959ba68a317e8695a165a116d72f2a3c1c33abc42d4cd4d322408b76c261d983ea4c8a46b943d3e62d0aab1160abed36baa16f3b5be1555b
+  metadata.gz: b08c5c3a63797b3c2d5ad3e113fe19df75421e0cb1df029eab61a345c6c4bd9db1d93c64f5c45a1f5d1d21c61bd950728ea54a9b5e8ce9f5a3302c76d07f90bc
+  data.tar.gz: 7aad872f5c8ca108725c5f2a4231a06146b80df65e1e92fea2891bf80e0b0fcdae26191e545989e4f024b07bf5edce31fddd0b229694e7b93a5f1952e077bd2c

data/lib/simp/beaker_helpers/inspec.rb

@@ -94,7 +94,7 @@ module Simp::BeakerHelpers
     #
     def process_inspec_results
       require 'highline'
-      
+
       HighLine.colorize_strings
 
       stats = {

data/lib/simp/beaker_helpers/ssg.rb

@@ -21,15 +21,17 @@ module Simp::BeakerHelpers
         '6' => {
           'required_packages' => EL_PACKAGES,
           'ssg' => {
-            'target'     => 'rhel6',
-            'datastream' => 'ssg-rhel6-ds.xml'
+            'profile_target' => 'rhel6',
+            'build_target'   => 'rhel6',
+            'datastream'     => 'ssg-rhel6-ds.xml'
           }
         },
         '7' => {
           'required_packages' => EL_PACKAGES,
           'ssg' => {
-            'target'     => 'rhel7',
-            'datastream' => 'ssg-rhel7-ds.xml'
+            'profile_target' => 'rhel7',
+            'build_target'   => 'rhel7',
+            'datastream'     => 'ssg-rhel7-ds.xml'
           }
         }
       },
@@ -37,20 +39,24 @@ module Simp::BeakerHelpers
         '6' => {
           'required_packages' => EL_PACKAGES,
           'ssg' => {
-            'target'     => 'rhel6',
-            'datastream' => 'ssg-rhel6-ds.xml'
+            'profile_target' => 'rhel6',
+            'build_target'   => 'rhel6',
+            'datastream'     => 'ssg-rhel6-ds.xml'
           }
         },
         '7' => {
           'required_packages' => EL_PACKAGES,
           'ssg' => {
-            'target'     => 'centos7',
-            'datastream' => 'ssg-centos7-ds.xml'
+            'profile_target' => 'rhel7',
+            'build_target'   => 'centos7',
+            'datastream'     => 'ssg-centos7-ds.xml'
           }
         }
       }
     }
 
+    attr_accessor :scap_working_dir
+
     # Create a new SSG helper for the specified host
     #
     # @param sut
@@ -62,6 +68,10 @@ module Simp::BeakerHelpers
       @os = fact_on(@sut, 'operatingsystem')
       @os_rel = fact_on(@sut, 'operatingsystemmajrelease')
 
+      sut.mkdir_p('scap_working_dir')
+
+      @scap_working_dir = on(sut, 'cd scap_working_dir && pwd').stdout.strip
+
       unless OS_INFO[@os]
         fail("Error: The '#{@os}' Operating System is not supported")
       end
@@ -78,11 +88,12 @@ module Simp::BeakerHelpers
 
       @result_file = "#{@sut.hostname}-ssg-#{Time.now.to_i}"
 
+
       get_ssg_datastream
     end
 
-    def target
-      OS_INFO[@os][@os_rel]['ssg']['target']
+    def profile_target
+      OS_INFO[@os][@os_rel]['ssg']['profile_target']
     end
 
     def remediate(profile)
@@ -90,7 +101,7 @@ module Simp::BeakerHelpers
     end
 
     def evaluate(profile, remediate=false)
-      cmd = 'cd scap-security-guide && oscap xccdf eval'
+      cmd = "cd #{@scap_working_dir}; oscap xccdf eval"
 
       if remediate
         cmd += ' --remediate'
@@ -104,7 +115,7 @@ module Simp::BeakerHelpers
       on(@sut, cmd, :accept_all_exit_codes => true)
 
       ['xml', 'html'].each do |ext|
-        path = "scap-security-guide/#{@result_file}.#{ext}"
+        path = "#{@scap_working_dir}/#{@result_file}.#{ext}"
         scp_from(@sut, path, @output_dir)
 
         fail("Could not retrieve #{path} from #{@sut}") unless File.exist?(File.join(@output_dir, "#{@result_file}.#{ext}"))
@@ -121,12 +132,12 @@ module Simp::BeakerHelpers
       ssg_release ||= Dir.glob('spec/fixtures/ssg_releases/*.bz2').last
 
       if ssg_release
-        scp_to(@sut, ssg_release)
+        scp_to(@sut, ssg_release, @scap_working_dir)
 
-        on(@sut, %(mkdir -p scap-security-guide && tar -xj -C scap-security-guide --strip-components 1 -f #{ssg_release} && cp scap-security-guide/*ds.xml ~))
+        on(@sut, %(mkdir -p scap-security-guide && tar -xj -C scap-security-guide --strip-components 1 -f #{ssg_release} && cp scap-security-guide/*ds.xml #{@scap_working_dir}))
       else
         on(@sut, %(git clone #{GIT_REPO}))
-        on(@sut, %(cd scap-security-guide/build; cmake ../; make -j4 #{OS_INFO[@os][@os_rel]['ssg']['target']}-content && cp *ds.xml ~))
+        on(@sut, %(cd scap-security-guide/build; cmake ../; make -j4 #{OS_INFO[@os][@os_rel]['ssg']['build_target']}-content && cp *ds.xml #{@scap_working_dir}))
       end
     end
   end

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.7.4'
+  VERSION = '1.7.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker