simp-beaker-helpers 1.18.2 → 1.18.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03e7502836d3999beb48af49d409f757204fa6dc29e2037e035514e397e2dab0
-  data.tar.gz: b96ed98c778d593741e1310a27860d68a91fb5b97a106c36974cb4fa4ebbfa2e
+  metadata.gz: 7c9e3aa05ef72a88b5b47a58fd135b79f0e18f1c8904e54d20b8795f168e163a
+  data.tar.gz: 44ebf1aa2489a831fa8b9477888a0122d3a44a0a92f175c4a5cd7ce5093eeede
 SHA512:
-  metadata.gz: afc42807301347fbac121680a6b63b00f2863eddd6ada9a0028e60dc82cba4b2082c627ecb468600c14a8891f350672789f000ecd2167d13d2aacee974bc3ae1
-  data.tar.gz: 69ac18cd076b980408b42b9983e59a7d96a229278daf776f31488fd20ef4d82f797ae21540845a9d451b8b81f9f239826f1684bf81b0391e18f5371579111029
+  metadata.gz: a3ccf798229dbc16ed9aceac1b9e21992b35ca23ede613343037bcb0143ab5f9785dcfe797a98d8764f83c5c85bd6e84116f2c5efd842d885905b9c2da4baac7
+  data.tar.gz: 26a69f5aa235c6074788d7103cedde8abba88df6216eb8b347456d64e488047b68aa3754d2a86f8f9b7533977d5037e37939f3a471277377ca9ca537cee789af

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+### 1.18.7 / 2020-07-07
+* Fix host reference bug when switching to FIPS mode
+* Ensure that net-ssh 6+ can access older FIPS systems
+
+### 1.18.6 / 2020-06-24
+* Fix Vagrant snapshot issues
+
+### 1.18.5 / 2020-06-24
+* Allow Vagrant to connect to EL8+ hosts in FIPS mode
+* Add EL8 support to the SSG scans
+
+### 1.18.4 / 2020-03-31
+* Fix capturing error messages when inspec fails to generate results
+
+### 1.18.3 / 2020-02-24
+* Fix the Windows library loading location.
+  * No longer attempt to load windows libraries by default unless the system is
+    actually Windows
+
+### 1.18.2 / 2020-02-24
+
+* The previous location for loading the Windows libraries would not work in a
+  `:before` block. This moves it into its own module space.
+* Bump to the working version of beaker and beaker-puppet
+
 ### 1.18.1 / 2020-02-12
 * Fix gemspec dependencies
 * Fix the windows library loading location

data/lib/simp/beaker_helpers.rb

@@ -11,7 +11,6 @@ module Simp::BeakerHelpers
   require 'simp/beaker_helpers/snapshot'
   require 'simp/beaker_helpers/ssg'
   require 'simp/beaker_helpers/version'
-  require 'simp/beaker_helpers/windows'
 
   # Stealing this from the Ruby 2.5 Dir::Tmpname workaround from Rails
   def self.tmpname
@@ -19,26 +18,8 @@ module Simp::BeakerHelpers
     "simp-beaker-helpers-#{t}-#{$$}-#{rand(0x100000000).to_s(36)}.tmp"
   end
 
-  def load_windows_requirements
-    if is_windows
-      begin
-        require 'beaker-windows'
-      rescue LoadError
-        logger.error(%{You must include 'beaker-windows' in your Gemfile for windows support on #{host}})
-        exit 1
-      end
-
-      include BeakerWindows::Path
-      include BeakerWindows::Powershell
-      include BeakerWindows::Registry
-      include BeakerWindows::WindowsFeature
-    end
-
-    return is_windows
-  end
-
   def is_windows?(sut)
-    is_windows = fact_on(sut, 'osfamily').casecmp?('windows')
+    sut[:platform] =~ /windows/i
   end
 
   # We can't cache this because it may change during a run
@@ -299,7 +280,7 @@ module Simp::BeakerHelpers
     parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
 
     block_on(suts, :run_in_parallel => parallel) do |sut|
-      if sut[:platform] =~ /windows/
+      if is_windows?(sut)
         puts "  -- SKIPPING #{sut} because it is windows"
         next
       end
@@ -316,7 +297,7 @@ module Simp::BeakerHelpers
       # TODO Use simp-ssh Puppet module appropriately (i.e., in a fashion
       #      that doesn't break vagrant access and is appropriate for
       #      typical module tests.)
-      fips_ssh_ciphers = [ 'aes256-cbc','aes192-cbc','aes128-cbc']
+      fips_ssh_ciphers = [ 'aes256-ctr','aes192-ctr','aes128-ctr']
       on(sut, %(sed -i '/Ciphers /d' /etc/ssh/sshd_config))
       on(sut, %(echo 'Ciphers #{fips_ssh_ciphers.join(',')}' >> /etc/ssh/sshd_config))
 
@@ -346,6 +327,16 @@ module Simp::BeakerHelpers
 
       # Enable FIPS and then reboot to finish.
       on(sut, %(puppet apply --verbose #{fips_enable_modulepath} -e "class { 'fips': enabled => true }"))
+
+      # Work around Vagrant and cipher restrictions in EL8+
+      #
+      # Hopefully, Vagrant will update the used ciphers at some point but who
+      # knows when that will be
+      opensshserver_config = '/etc/crypto-policies/back-ends/opensshserver.config'
+      if file_exists_on(sut, opensshserver_config)
+        on(sut, "sed --follow-symlinks -i 's/PubkeyAcceptedKeyTypes=/PubkeyAcceptedKeyTypes=ssh-rsa,/' #{opensshserver_config}")
+      end
+
       sut.reboot
     end
   end
@@ -625,7 +616,10 @@ module Simp::BeakerHelpers
   def fix_errata_on( suts = hosts )
     parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
     block_on(suts, :run_in_parallel => parallel) do |sut|
-      if sut[:platform] =~ /windows/
+      if is_windows?(sut)
+        # Load the Windows requirements
+        require 'simp/beaker_helpers/windows'
+
         # Install the necessary windows certificate for testing
         #
         # https://petersouter.xyz/testing-windows-with-beaker-without-cygwin/

data/lib/simp/beaker_helpers/inspec.rb

@@ -116,7 +116,7 @@ module Simp::BeakerHelpers
         FileUtils.remove_entry_secure tmpdir
       end
 
-      unless @results
+      if @results.nil? || @results.empty?
         File.open(@result_file + '.err', 'w') do |fh|
           fh.puts(result.stderr.strip)
         end

data/lib/simp/beaker_helpers/snapshot.rb

@@ -1,5 +1,5 @@
 module Simp::BeakerHelpers
-  # Helpers for working with the SCAP Security Guide
+  # Helpers for managing Vagrant snapshots
   class Snapshot
     # The name of the base snapshot that is created if no snapshots currently exist
     BASE_NAME = '_simp_beaker_base'
@@ -18,9 +18,7 @@ module Simp::BeakerHelpers
 
         if vdir
           Dir.chdir(vdir) do
-            unless exist?(host, BASE_NAME)
-              save(host, BASE_NAME)
-            end
+            save(host, BASE_NAME) unless exist?(host, BASE_NAME)
 
             snap = "#{host.name}_#{snapshot_name}"
 
@@ -67,7 +65,7 @@ module Simp::BeakerHelpers
         Dir.chdir(vdir) do
           output = %x(vagrant snapshot list #{host.name}).lines
           output.map! do |x|
-            x.split(/^#{host.name}_/).last.strip
+            x.split(/^#{host.name}_/).last.split(':').first.delete('==>').strip
           end
         end
       end

data/lib/simp/beaker_helpers/ssg.rb

@@ -29,6 +29,17 @@ module Simp::BeakerHelpers
       'python-jinja2'
     ]
 
+    EL8_PACKAGES = [
+      'python3',
+      'python3-pyyaml',
+      'cmake',
+      'git',
+      'openscap-python3',
+      'openscap-utils',
+      'python3-lxml',
+      'python3-jinja2'
+    ]
+
     OS_INFO = {
       'RedHat' => {
         '6' => {
@@ -46,6 +57,14 @@ module Simp::BeakerHelpers
             'build_target'   => 'rhel7',
             'datastream'     => 'ssg-rhel7-ds.xml'
           }
+        },
+        '8' => {
+          'required_packages' => EL8_PACKAGES,
+          'ssg' => {
+            'profile_target' => 'rhel8',
+            'build_target'   => 'rhel8',
+            'datastream'     => 'ssg-rhel8-ds.xml'
+          }
         }
       },
       'CentOS' => {
@@ -64,6 +83,14 @@ module Simp::BeakerHelpers
             'build_target'   => 'centos7',
             'datastream'     => 'ssg-centos7-ds.xml'
           }
+        },
+        '8' => {
+          'required_packages' => EL8_PACKAGES,
+          'ssg' => {
+            'profile_target' => 'rhel8',
+            'build_target'   => 'centos8',
+            'datastream'     => 'ssg-centos8-ds.xml'
+          }
         }
       },
       'OracleLinux' => {
@@ -73,8 +100,16 @@ module Simp::BeakerHelpers
             'profile_target' => 'ol7',
             'build_target'   => 'ol7',
             'datastream'     => 'ssg-ol7-ds.xml'
+          },
+        '8' => {
+          'required_packages' => EL8_PACKAGES,
+          'ssg' => {
+            'profile_target' => 'ol8',
+            'build_target'   => 'ol8',
+            'datastream'     => 'ssg-ol8-ds.xml'
           }
         }
+        }
       }
     }
 

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.18.2'
+  VERSION = '1.18.7'
 end

data/spec/acceptance/suites/snapshot/00_snapshot_test_spec.rb

@@ -57,7 +57,7 @@ hosts.each do |host|
       end
 
       it 'can list the snapshots' do
-        expect(Simp::BeakerHelpers::Snapshot.list(host)).to eq ['test', 'test2']
+        expect(Simp::BeakerHelpers::Snapshot.list(host)).to eq ["#{host}", 'test', 'test2']
       end
 
       it 'can query for a specific snapshot' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.18.2
+  version: 1.18.7
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-23 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker