Merge pull request #427 from konstruktoid/bats

update bats tests

tests/aide.bats

@@ -1,6 +1,6 @@
 #!/usr/bin/env bats
 
 @test "Verify aide scheduled check is present" {
-  run bash -c "stat /etc/cron.daily/aide || systemctl is-enabled aidecheck.timer"
+  run bash -c "stat /etc/cron.daily/aide || systemctl is-enabled aidecheck.timer"
   [ "$status" -eq 0 ]
 }

tests/journalctl.bats

@@ -23,6 +23,6 @@ load test_helper
 }
 
 @test "Verify FileCreateMode in $RSYSLOGCONF" {
-  run bash -c "grep '^\$FileCreateMode 0600$' $RSYSLOGCONF"
+  run bash -c "grep -E '^\$FileCreateMode 06(0|4)0$' $RSYSLOGCONF"
   [ "$status" -eq 0 ]
 }

tests/logindefs.bats

@@ -28,7 +28,7 @@ load test_helper
 }
 
 @test "Verify ENCRYPT_METHOD in $LOGINDEFS" {
-  run bash -c "grep '^ENCRYPT_METHOD SHA512$' $LOGINDEFS"
+  run bash -c "grep -E '^ENCRYPT_METHOD (SHA512|YESCRYPT)$' $LOGINDEFS"
   [ "$status" -eq 0 ]
 }
 

tests/password.bats

@@ -8,7 +8,7 @@ load test_helper
 }
 
 @test "Verify minclass in /etc/security/pwquality.conf" {
-  run bash -c "grep '^minclass = 3$' /etc/security/pwquality.conf"
+  run bash -c "grep -E '^minclass = (3|4)$' /etc/security/pwquality.conf"
   [ "$status" -eq 0 ]
 }
 
@@ -33,7 +33,7 @@ load test_helper
 }
 
 @test "Verify remember in $COMMONPASSWD" {
-  run bash -c "grep '^password.*required.*pam_pwhistory.so.*[[:space:]]remember=5$' $COMMONPASSWD"
+  run bash -c "grep -E '^password(.*required.*pam_pwhistory.so|.*pam_unix.so).*[[:space:]]remember=5$' $COMMONPASSWD"
   [ "$status" -eq 0 ]
 }
 

tests/postfix.bats

@@ -3,7 +3,7 @@
 load test_helper
 
 @test "Verify postfix smtpd_banner" {
-  run bash -c "postconf | grep '^smtpd_banner = \$myhostname ESMTP$'"
+  run bash -c "postconf | grep -E '^smtpd_banner.*\$myhostname( | - )ESMTP$'"
   [ "$status" -eq 0 ]
 }
 

tests/sshd.bats

@@ -88,7 +88,7 @@ load test_helper
 }
 
 @test "Verify OpenSSH sftp" {
-  run sshdConfig '^Subsystem sftp internal-sftp$'
+  run sshdConfig '^Subsystem sftp (internal-sftp|internal-sftp -f LOCAL6 -l INFO)$'
   [ "$status" -eq 0 ]
 }
 

tests/sysctl.bats

@@ -53,7 +53,7 @@ load test_helper
 }
 
 @test "Verify kernel.perf_event_paranoid in /etc/sysctl.* /usr/lib/sysctl.*" {
-  run bash -c "grep -R '^kernel.perf_event_paranoid.*2$' /etc/sysctl.* /usr/lib/sysctl.*"
+  run bash -c "grep -ER '^kernel.perf_event_paranoid.*(2|3)$' /etc/sysctl.* /usr/lib/sysctl.*"
   [ "$status" -eq 0 ]
 }
 
@@ -322,7 +322,7 @@ load test_helper
 }
 
 @test "Verify sysctl runtime kernel.perf_event_paranoid" {
-  run sysctlRuntime '^kernel.perf_event_paranoid.*2$'
+  run sysctlRuntime '^kernel.perf_event_paranoid.*(2|3)$'
   [ "$status" -eq 0 ]
 }
 

tests/test_helper.bash

@@ -68,7 +68,7 @@ sshdConfig() {
 }
 
 sysctlRuntime() {
-  sysctl --all | grep -i "$1"
+  sysctl --all | grep -iE "$1"
 }
 
 moduliSize() {