bugfixes

Signed-off-by: wdower <[email protected]>

controls/SV-238199.rb

@@ -57,7 +57,7 @@
 
   if xorg_status == 0
     describe command('gsettings get org.gnome.desktop.screensaver lock-enabled') do
-      its('stdout') { should cmp 'true' }
+      its('stdout') { should cmp true }
     end
   else
     describe command('which Xorg').exit_status do

controls/SV-238204.rb

@@ -68,7 +68,13 @@
   tag nist: ['AC-3']
   tag 'host', 'container'
 
-  describe grub_conf('/boot/grub/grub.cfg') do
-    its('password') { should match '^password_pbkdf2' }
+  grubfile = file('/boot/grub/grub.cfg').content.lines
+
+  grubfile_passes = grubfile.any? { |line| line.match?(/^password_pbkdf2\s+root/) }
+
+  describe "Grub" do
+    it "should use an encrypted password for root" do
+      expect(grubfile_passes).to be_true, "No password set for root in grub config"
+    end
   end
 end

controls/SV-238362.rb

@@ -42,6 +42,11 @@
     describe 'Control not applicable to a container' do
       skip 'Control not applicable to a container'
     end
+  elsif input('pki_disabled')
+    impact 0.0
+    describe 'This system is not using PKI for authentication so the controls is Not Applicable.' do
+      skip 'This system is not using PKI for authentication so the controls is Not Applicable.'
+    end
   else
     config_file = input('sssd_conf_path')
     config_file_exists = file(config_file).exist?

inspec.yml

@@ -20,19 +20,13 @@ inputs:
   - name: banner_text
     description: Standard Mandatory DoD Notice and Consent Banner
     type: String
-    value: 'You are accessing a U.S. Government (USG) Information System (IS) that is provided for USG-authorized use only.
-
-    By using this IS (which includes any device attached to this IS), you consent to the following conditions:
-
-    -The USG routinely intercepts and monitors communications on this IS for purposes including, but not limited to, penetration testing, COMSEC monitoring, network operations and defense, personnel misconduct (PM), law enforcement (LE), and counterintelligence (CI) investigations.
-
-    -At any time, the USG may inspect and seize data stored on this IS.
-
-    -Communications using, or data stored on, this IS are not private, are subject to routine monitoring, interception, and search, and may be disclosed or used for any USG-authorized purpose.
-
-    -This IS includes security measures (e.g., authentication and access controls) to protect USG interests--not for your personal benefit or privacy.
-
-    -Notwithstanding the above, using this IS does not constitute consent to PM, LE or CI investigative searching or monitoring of the content of privileged communications, or work product, related to personal representation or services by attorneys, psychotherapists, or clergy, and their assistants. Such communications and work product are private and confidential. See User Agreement for details.'
+    value: "You are accessing a U.S. Government (USG) Information System (IS) that is provided for USG-authorized use only. \
+    By using this IS (which includes any device attached to this IS), you consent to the following conditions: \
+    -The USG routinely intercepts and monitors communications on this IS for purposes including, but not limited to, penetration testing, COMSEC monitoring, network operations and defense, personnel misconduct (PM), law enforcement (LE), and counterintelligence (CI) investigations. \
+    -At any time, the USG may inspect and seize data stored on this IS. \
+    -Communications using, or data stored on, this IS are not private, are subject to routine monitoring, interception, and search, and may be disclosed or used for any USG-authorized purpose. \
+    -This IS includes security measures (e.g., authentication and access controls) to protect USG interests--not for your personal benefit or privacy. \
+    -Notwithstanding the above, using this IS does not constitute consent to PM, LE or CI investigative searching or monitoring of the content of privileged communications, or work product, related to personal representation or services by attorneys, psychotherapists, or clergy, and their assistants. Such communications and work product are private and confidential. See User Agreement for details."
 
   - name: sudo_accounts
     description: Array of users who need access to security functions are part of the sudo group.
@@ -163,4 +157,4 @@ inputs:
   - name: pki_disabled
     description: Is PKI authentication used for this system
     type: boolean
-    value: false
+    value: false