simp-beaker-helpers 1.23.3 → 1.23.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88ab91d8bd2eef77e691c0d864999426ba1321f866decc3a867075535fe23c7b
-  data.tar.gz: 1bf21a9614c1b814ebf80059e60b00c80defd6cc4733bbd421ce6a2620d9e744
+  metadata.gz: 4a8f3a3f4dc773c215796e464031e1ab00ed025c9a3346fd4573d12a1a072fd9
+  data.tar.gz: 1d55ad88ebae56afe2e807ad1a27d3e6ee5828499ef2f3655770b71f8660d579
 SHA512:
-  metadata.gz: 3ebba34024934a95b6e2b343bbdc0bb56859a686d20c9a7053d3ffdeedd528260379a7ba82a5b5dd1914d661f46eb1e64b48aef4ee84e88e5181754a5fc151b9
-  data.tar.gz: 5a69d66af5c521f0ec19c52dc1501ab5731f54155b9b23ff64b6d145dff18f05e8bfbb154410c2b2e3282da6c639f05a61b4d42f515d55b36166094d8dfecac3
+  metadata.gz: 10d292eb75b4bcd9d2bfc2bc5223367ea2706db88cdc29d016b37db9864530d6a923e56339d1f37a5b4e9b9cf1edeb34c179d73d5a56361416145a363c02890e
+  data.tar.gz: f877ae87cf79c64786aeaf800cb1d8b839ad251c80664e128b498a7e555d9661a7034e677d1682bcbc91fb8ce00ba504f5ed22035ad6ed877df45d0c8851b241

data/.gitlab-ci.yml

@@ -360,6 +360,12 @@ puppet7_collections:
   script:
     - bundle exec rake beaker:suites[puppet_collections]
 
+oel_ssg:
+  <<: *pup_6_x
+  <<: *acceptance_base
+  script:
+    - bundle exec rake beaker:suites[ssg,oel]
+
 windows:
   <<: *pup_6_x
   <<: *acceptance_base

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 1.23.4 / 2021-07-07
+* Fixed:
+  * Ensure that the openscap-scanner package is installed during SSG runs
+* Added:
+  * A function to fetch the available SSG profiles on a target system
+* Changed:
+  * Added OEL nodeset
+
 ### 1.23.3 / 2021-06-30
 * Fixed:
   * Removed the Streams kernel update for EL 8.3 since it now causes issues

data/lib/simp/beaker_helpers/ssg.rb

@@ -19,10 +19,11 @@ module Simp::BeakerHelpers
       GIT_BRANCH = ENV['BEAKER_ssg_branch']
     end
 
-    EL_PACKAGES = [
+    EL7_PACKAGES = [
       'PyYAML',
       'cmake',
       'git',
+      'openscap-scanner',
       'openscap-python',
       'openscap-utils',
       'python-jinja2',
@@ -35,6 +36,7 @@ module Simp::BeakerHelpers
       'make',
       'openscap-python3',
       'openscap-utils',
+      'openscap-scanner',
       'python3',
       'python3-jinja2',
       'python3-lxml',
@@ -45,7 +47,7 @@ module Simp::BeakerHelpers
     OS_INFO = {
       'RedHat' => {
         '6' => {
-          'required_packages' => EL_PACKAGES,
+          'required_packages' => EL7_PACKAGES,
           'ssg' => {
             'profile_target' => 'rhel6',
             'build_target'   => 'rhel6',
@@ -53,7 +55,7 @@ module Simp::BeakerHelpers
           }
         },
         '7' => {
-          'required_packages' => EL_PACKAGES,
+          'required_packages' => EL7_PACKAGES,
           'ssg' => {
             'profile_target' => 'rhel7',
             'build_target'   => 'rhel7',
@@ -71,7 +73,7 @@ module Simp::BeakerHelpers
       },
       'CentOS' => {
         '6' => {
-          'required_packages' => EL_PACKAGES,
+          'required_packages' => EL7_PACKAGES,
           'ssg' => {
             'profile_target' => 'rhel6',
             'build_target'   => 'centos6',
@@ -79,7 +81,7 @@ module Simp::BeakerHelpers
           }
         },
         '7' => {
-          'required_packages' => EL_PACKAGES,
+          'required_packages' => EL7_PACKAGES,
           'ssg' => {
             'profile_target' => 'centos7',
             'build_target'   => 'centos7',
@@ -107,12 +109,13 @@ module Simp::BeakerHelpers
       },
       'OracleLinux' => {
         '7' => {
-          'required_packages' => EL_PACKAGES,
+          'required_packages' => EL7_PACKAGES,
           'ssg' => {
             'profile_target' => 'ol7',
             'build_target'   => 'ol7',
             'datastream'     => 'ssg-ol7-ds.xml'
           },
+        },
         '8' => {
           'required_packages' => EL8_PACKAGES,
           'ssg' => {
@@ -121,7 +124,6 @@ module Simp::BeakerHelpers
             'datastream'     => 'ssg-ol8-ds.xml'
           }
         }
-        }
       }
     }
 
@@ -135,8 +137,8 @@ module Simp::BeakerHelpers
     def initialize(sut)
       @sut = sut
 
-      @os = fact_on(@sut, 'operatingsystem')
-      @os_rel = fact_on(@sut, 'operatingsystemmajrelease')
+      @os = pfact_on(@sut, 'os.name')
+      @os_rel = pfact_on(@sut, 'os.release.major')
 
       sut.mkdir_p('scap_working_dir')
 
@@ -158,7 +160,6 @@ module Simp::BeakerHelpers
 
       @result_file = "#{@sut.hostname}-ssg-#{Time.now.to_i}"
 
-
       get_ssg_datastream
     end
 
@@ -166,6 +167,15 @@ module Simp::BeakerHelpers
       OS_INFO[@os][@os_rel]['ssg']['profile_target']
     end
 
+    def get_profiles
+      cmd = "cd #{@scap_working_dir}; oscap info --profiles"
+      on(@sut, "#{cmd} #{OS_INFO[@os][@os_rel]['ssg']['datastream']}")
+        .stdout
+        .strip
+        .lines
+        .map{|x| x.split(':').first}
+    end
+
     def remediate(profile)
       evaluate(profile, true)
     end
@@ -177,7 +187,7 @@ module Simp::BeakerHelpers
         cmd += ' --remediate'
       end
 
-      cmd += %( --fetch-remote-resources --profile #{profile} --results #{@result_file}.xml --report #{@result_file}.html #{OS_INFO[@os][@os_rel]['ssg']['datastream']})
+      cmd += %( --profile #{profile} --results #{@result_file}.xml --report #{@result_file}.html #{OS_INFO[@os][@os_rel]['ssg']['datastream']})
 
       # We accept all exit codes here because there have occasionally been
       # failures in the SSG content and we're not testing that.

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.23.3'
+  VERSION = '1.23.4'
 end

data/spec/acceptance/nodesets/default.yml

@@ -33,6 +33,7 @@ CONFIG:
   log_level: verbose
   type: aio
   vagrant_memsize: 256
+  vagrant_cpus: 2
 <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
   puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
 <% end -%>

data/spec/acceptance/nodesets/oel.yml

@@ -0,0 +1,42 @@
+<%
+  if ENV['BEAKER_HYPERVISOR']
+    hypervisor = ENV['BEAKER_HYPERVISOR']
+  else
+    hypervisor = 'vagrant'
+  end
+-%>
+HOSTS:
+  oel7:
+    roles:
+      - el7
+      - master
+    platform: el-7-x86_64
+    box: generic/oracle7
+    hypervisor: <%= hypervisor %>
+
+  oel8:
+    roles:
+      - el8
+    platform: el-8-x86_64
+    box: generic/oracle8
+    hypervisor: <%= hypervisor %>
+
+CONFIG:
+  log_level: verbose
+  type: aio
+  vagrant_memsize: 512
+  vagrant_cpus: 2
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% end -%>
+  ssh:
+    keepalive: true
+    keepalive_interval: 10
+    host_key:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n#{' '*6}- ") %>
+    kex:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n#{' '*6}- ") %>
+    encryption:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
+    hmac:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>

data/spec/acceptance/suites/ssg/00_default_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper_acceptance'
 
-test_name 'SSG STIG Validation'
+test_name 'SSG Functionality Validation'
 
-describe 'run the SSG against the STIG profile' do
+describe 'run the SSG against an SCAP profile' do
 
   hosts.each do |host|
     context "on #{host}" do
@@ -14,8 +14,15 @@ describe 'run the SSG against the STIG profile' do
       end
 
       it 'should run the SSG' do
-        profile = 'xccdf_org.ssgproject.content_profile_stig'
+        profiles = @ssg.get_profiles
 
+        profile = profiles.find{|x| x =~ /_stig/} ||
+          profiles.find{|x| x =~ /_cui/} ||
+          profiles.find{|x| x =~ /_ospp/} ||
+          profiles.find{|x| x =~ /_standard/} ||
+          profiles.last
+
+        expect(profile).not_to be_nil
         @ssg.evaluate(profile)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.23.3
+  version: 1.23.4
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -221,6 +221,7 @@ files:
 - simp-beaker-helpers.gemspec
 - spec/acceptance/nodesets/default.yml
 - spec/acceptance/nodesets/docker.yml
+- spec/acceptance/nodesets/oel.yml
 - spec/acceptance/nodesets/ubuntu.yml
 - spec/acceptance/suites/default/check_puppet_version_spec.rb
 - spec/acceptance/suites/default/enable_fips_spec.rb