Merge pull request #13220 from comps/master

Clean up unit tests a bit (shebang, metadata consistency)

Author: Mab879

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/tests/auditctl_syscalls_multiple_per_arg.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 
 {{{ setup_auditctl_environment() }}}
 

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/tests/auditctl_syscalls_one_per_arg.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 
 {{{ setup_auditctl_environment() }}}
 

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/tests/auditctl_syscalls_one_per_line.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 
 {{{ setup_auditctl_environment() }}}
 

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/tests/augenrules_syscalls_multiple_per_arg.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 
 rm -f /etc/audit/rules.d/*
 

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/tests/augenrules_syscalls_one_per_arg.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 
 rm -f /etc/audit/rules.d/*
 

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification/tests/augenrules_syscalls_one_per_line.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 
 rm -f /etc/audit/rules.d/*
 

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_creat/tests/o_creat_rules.pass.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
 # packages = audit
 
-# remediation = none
-
 cp $SHARED/audit_open_o_creat.rules /etc/audit/rules.d/

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_o_trunc_write/tests/o_trunc_rules.pass.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
 # packages = audit
 
-# remediation = none
-
 cp $SHARED/audit_open_o_trunc_write.rules /etc/audit/rules.d/

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_rule_order/tests/ordered_by_arch.pass.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 # packages = audit
 
-# remediation = none
-
 grep -h 'arch=b32.*EACCES' $SHARED/audit_open_o_creat.rules $SHARED/audit_open_o_trunc_write.rules $SHARED/audit_open.rules > /etc/audit/rules.d/ordered_by_arch_error.rules
 grep -h 'arch=b32.*EPERM' $SHARED/audit_open_o_creat.rules $SHARED/audit_open_o_trunc_write.rules $SHARED/audit_open.rules >> /etc/audit/rules.d/ordered_by_arch_error.rules
 grep -h 'arch=b64.*EACCES' $SHARED/audit_open_o_creat.rules $SHARED/audit_open_o_trunc_write.rules $SHARED/audit_open.rules >> /etc/audit/rules.d/ordered_by_arch_error.rules

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_open_rule_order/tests/ordered_by_filter.pass.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
 # packages = audit
 
-# remediation = none
-
 cat $SHARED/audit_open_o_creat.rules $SHARED/audit_open_o_trunc_write.rules $SHARED/audit_open.rules > /etc/audit/rules.d/ordered_by_filter.rules

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_creat/tests/o_creat_last.pass.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 # packages = audit
 
-# remediation = none
-
 sed 's/_by_handle_at/at/' $SHARED/audit_openat_o_creat.rules > /etc/audit/rules.d/openat_o_creat.rules
 sed -i 's/openat,/open_by_handle_at,/' /etc/audit/rules.d/openat_o_creat.rules

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_creat/tests/o_creat_rules.pass.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
 # packages = audit
 
-# remediation = none
-
 cp $SHARED/audit_openat_o_creat.rules /etc/audit/rules.d/

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_o_trunc_write/tests/o_trunc.pass.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
 # packages = audit
 
-# remediation = none
-
 cp $SHARED/audit_openat_o_trunc_write.rules /etc/audit/rules.d/

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_rule_order/tests/ordered_arch.pass.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 # packages = audit
 
-# remediation = none
-
 grep -h 'arch=b32.*EACCES' $SHARED/audit_openat_o_creat.rules $SHARED/audit_openat_o_trunc_write.rules $SHARED/audit_open.rules > /etc/audit/rules.d/ordered_by_arch_error.rules
 grep -h 'arch=b32.*EPERM' $SHARED/audit_openat_o_creat.rules $SHARED/audit_openat_o_trunc_write.rules $SHARED/audit_open.rules >> /etc/audit/rules.d/ordered_by_arch_error.rules
 grep -h 'arch=b64.*EACCES' $SHARED/audit_openat_o_creat.rules $SHARED/audit_openat_o_trunc_write.rules $SHARED/audit_open.rules >> /etc/audit/rules.d/ordered_by_arch_error.rules

linux_os/guide/auditing/auditd_configure_rules/audit_file_modification/audit_rules_unsuccessful_file_modification_openat_rule_order/tests/ordered_filter.pass.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
 # packages = audit
 
-# remediation = none
-
 cat $SHARED/audit_openat_o_creat.rules $SHARED/audit_openat_o_trunc_write.rules $SHARED/audit_open.rules > /etc/audit/rules.d/ordered_by_filter.rules

linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events/tests/default.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 # variables = var_accounts_passwords_pam_faillock_dir=/var/log/faillock
 
 echo "-w /var/log/faillock -p wa -k logins" >> /etc/audit/rules.d/logins.rules

linux_os/guide/auditing/auditd_configure_rules/audit_login_events/audit_rules_login_events/tests/rules_without_keys.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 # variables = var_accounts_passwords_pam_faillock_dir=/var/log/faillock
 
 echo "-w /var/log/faillock -p wa" >> /etc/audit/rules.d/logins.rules

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands/tests/generate_privileged_commands_rule.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 # platform = Oracle Linux 7
 
 echo "-a always,exit -F path=/usr/bin/sudo -F auid>={{{ uid_min }}} -F auid!=4294967295 -k privileged" >> /etc/audit/audit.rules

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/tests/auditctl_modprobe_correct.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 # platform = Oracle Linux 7
 
 echo "-a always,exit -F path=/usr/bin/sudo -F auid>={{{ uid_min }}} -F auid!=unset -k privileged" >> /etc/audit/audit.rules

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/tests/auditctl_modprobe_correct_without_key.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 # platform = Fedora,Oracle Linux 7
 
 echo "-a always,exit -F path=/usr/bin/sudo -F auid>={{{ uid_min }}} -F auid!=4294967295 -k privileged" >> /etc/audit/rules.d/privileged.rules

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/tests/auditctl_modprobe_remove_all_rules.fail.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 # platform = Fedora,Oracle Linux 7
 
 echo "-a always,exit -F path=/usr/bin/sudo -F auid>={{{ uid_min }}} -F auid!=unset -k privileged" >> /etc/audit/rules.d/privileged.rules

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/tests/auditctl_modprobe_wrong_rule.fail.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit
-# remediation = bash
 # platform = Fedora,Oracle Linux 7
 
 echo "-a always,exit -F path=/usr/bin/sudo -F auid>={{{ uid_min }}} -F auid!=4294967295 -k own_key" >> /etc/audit/rules.d/privileged.rules

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/tests/augenrules_modprobe_correct.pass.sh

@@ -1,4 +1,4 @@
-
+#!/bin/bash
 # packages = audit
 echo "-w /etc/sudoers -p wa -k actions" >> /etc/audit/rules.d/actions.rules
 echo "-w /etc/sudoers.d/ -p wa -k actions" >> /etc/audit/rules.d/actions.rules

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/tests/augenrules_modprobe_correct_without_key.pass.sh

@@ -1,4 +1,4 @@
-
+#!/bin/bash
 # packages = audit
 echo "-w /etc/sudoers -p wa" >> /etc/audit/rules.d/actions.rules
 echo "-w /etc/sudoers.d/ -p wa" >> /etc/audit/rules.d/actions.rules

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/tests/augenrules_modprobe_remove_all_rules.fail.sh

@@ -1,4 +1,4 @@
-
+#!/bin/bash
 # packages = audit
 rm -f /etc/audit/rules.d/*
 > /etc/audit/audit.rules

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_modprobe/tests/augenrules_modprobe_wrong_rule.fail.sh

@@ -1,4 +1,4 @@
-
+#!/bin/bash
 # packages = audit
 echo "-w /etc/sudoers -p wa -k actions" >> /etc/audit/rules.d/actions.rules
 echo "-w /etc/sudoers.d -p wa -k actions" >> /etc/audit/rules.d/actions.rules

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/tests/rhel7_auditctl_4294967295_configured.pass.sh

@@ -1,6 +1,5 @@
-# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
 #!/bin/bash
-
+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
 # packages = audit
 
 sed -i "/^\s*log_file.*/d" /etc/audit/auditd.conf

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/tests/rhel7_auditctl_unset_configured.pass.sh

@@ -1,6 +1,5 @@
-# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
 #!/bin/bash
-
+# platform = multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
 # packages = audit
 
 sed -i "/^\s*log_file.*/d" /etc/audit/auditd.conf

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/tests/rhel7_augenrules_4294967295_configured.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # platform = Oracle Linux 7
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/tests/rhel7_augenrules_unset_configured.pass.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 # packages = audit
 # platform = Oracle Linux 8,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9,multi_platform_fedora
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_sudo/tests/rhel7_rules_with_own_key.pass.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 # packages = audit
-#
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix2_chkpwd/tests/no_rules.fail.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 # packages = audit
-#
 # profiles = xccdf_org.ssgproject.content_profile_cis
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix2_chkpwd/tests/only_chkpwd_rule.fail.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 # packages = audit
-#
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_chkpwd/tests/no_rules.fail.sh

@@ -2,7 +2,6 @@
 # packages = audit
 # platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
 # profiles = xccdf_org.ssgproject.content_profile_ospp
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/audit_privileged_commands/audit_rules_privileged_commands_unix_chkpwd/tests/only_chkpwd_rule.fail.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 # packages = audit
-#
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/tests/correct.pass.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 # packages = audit
-#
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/tests/correct_without_key.pass.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 # packages = audit
-#
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/tests/empty.fail.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 # packages = audit
-#
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/audit_rules_sysadmin_actions/tests/missing_slash.fail.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 # packages = audit
 # profiles = xccdf_org.ssgproject.content_profile_stig
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/correct_value_default_file.pass.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 # packages = audit
 # profiles = xccdf_org.ssgproject.content_profile_stig
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/auditd_configure_rules/file_ownership_var_log_audit_stig/tests/wrong_value_default_file.fail.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 # packages = audit
-#
-# remediation = bash
 
 . $SHARED/auditd_utils.sh
 prepare_auditd_test_enviroment

linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audisp_syslog_plugin_activated.pass.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # packages = audit,crontabs
-# remediation = none
 
 mkdir -p /etc/cron.weekly/
 touch /etc/cron.weekly/audit-offload

linux_os/guide/auditing/configure_auditd_data_retention/auditd_audispd_syslog_plugin_activated/tests/audit_syslog_plugin_activated.pass.sh

@@ -1,3 +1,3 @@
-
+#!/bin/bash
 # packages = audit
 rm -f /etc/audit/rules.d/10-base-config.rules

linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_action_mail_acct/tests/action_mail_acct_root.pass.sh

@@ -1,4 +1,4 @@
-
+#!/bin/bash
 # packages = audit
 cp $SHARED/audit/10-base-config.rules /etc/audit/rules.d/
 echo "some additional text" >> /etc/audit/rules.d/10-base-config.rules

linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/tests/admin_space_left_action_halt_cis.pass.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # platform = multi_platform_all
 
 echo "/exports/data   0.0.0.0/0(rw,sync)" > /etc/exports

linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_admin_space_left_action/tests/admin_space_left_action_single.pass.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # platform = multi_platform_all
 
 echo "/exports/data   0.0.0.0/0(rw,sync,sec=sys)" > /etc/exports

linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_flush/tests/flush_incremental_async.pass.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # platform = multi_platform_all
 
 echo "/exports/data   0.0.0.0/0(rw,sync,sec=krb5)" > /etc/exports

linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/tests/max_log_file_greater_than_minimum_value.pass.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # platform = multi_platform_all
 
 echo "/exports/data   0.0.0.0/0(rw,sync,sec=krb5:krb5i:krb5p)" > /etc/exports

linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_max_log_file/tests/max_log_file_minimum_value.pass.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 # packages = chrony
 # platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux
-# remediation = none
 
 sed -i "^pool.*" {{{ chrony_conf_path }}}
 echo "server 0.pool.ntp.org" > {{{ chrony_conf_path }}}

linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/tests/num_logs_greater_than_minimum.pass.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-# remediation = none
 
 {{{ bash_package_install("chrony") }}}
 {{{ bash_package_install("systemd-timesyncd") }}}

linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_num_logs/tests/num_logs_minimum_value.pass.sh

@@ -1,3 +1,3 @@
-#! /bin/bash
+#!/bin/bash
 
 echo "passwd files nis" > /etc/nsswitch.conf

linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/tests/space_left_greater_than_minimum.pass.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 
 # we use something because if passwd or groups is used, it breaks the system
 echo "something nis" > /etc/nsswitch.conf

linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left/tests/space_left_minimum_value.pass.sh

@@ -1,3 +1,3 @@
-#! /bin/bash
+#!/bin/bash
 
 echo "passwd files" > /etc/nsswitch.conf

linux_os/guide/auditing/configure_auditd_data_retention/auditd_data_retention_space_left_action/tests/space_left_action_email.pass.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-# remediation = none
 # platform = multi_platform_all
 
 sed -i '/Include \/etc\/crypto-policies\/back-ends\/opensshserver.config/d' /etc/ssh/sshd_config /etc/ssh/sshd_config.d/*.conf

linux_os/guide/auditing/configure_auditd_data_retention/auditd_offload_logs/tests/correct.pass.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-# remediation = none
 # platform = multi_platform_all
 
 sed -i '/Include \/etc\/crypto-policies\/back-ends\/opensshserver.config/d' /etc/ssh/sshd_config /etc/ssh/sshd_config.d/*.conf

linux_os/guide/auditing/policy_rules/audit_basic_configuration/tests/file_missing.fail.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-# remediation = None
 
 find /etc/ssh/sshd_config* -type f -print0 | xargs -0 sed -i '/^(Allow|Deny)(Users|Groups).*/d'
 echo "AllowGroups testgroup1 testgroup2 testgroup3" >> /etc/ssh/sshd_config

linux_os/guide/auditing/policy_rules/audit_basic_configuration/tests/file_not_identical.fail.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-# remediation = None
 
 find /etc/ssh/sshd_config* -type f -print0 | xargs -0 sed -i '/^(Allow|Deny)(Users|Groups).*/d'
 echo "AllowUsers testuser1 testuser2 testuser3" >> /etc/ssh/sshd_config