diff --git a/bin/hardening/8.1.1.1_audit_log_storage.sh b/bin/hardening/4.1.1.1_audit_log_storage.sh similarity index 96% rename from bin/hardening/8.1.1.1_audit_log_storage.sh rename to bin/hardening/4.1.1.1_audit_log_storage.sh index 947c0eb..072a833 100755 --- a/bin/hardening/8.1.1.1_audit_log_storage.sh +++ b/bin/hardening/4.1.1.1_audit_log_storage.sh @@ -5,7 +5,7 @@ # # -# 8.1.1.1 Configure Audit Log Storage Size (Not Scored) +# 4.1.1.1 Ensure audit log storage size is configured (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.1.2_halt_when_audit_log_full.sh b/bin/hardening/4.1.1.2_halt_when_audit_log_full.sh similarity index 97% rename from bin/hardening/8.1.1.2_halt_when_audit_log_full.sh rename to bin/hardening/4.1.1.2_halt_when_audit_log_full.sh index 385225a..ecbe7b8 100755 --- a/bin/hardening/8.1.1.2_halt_when_audit_log_full.sh +++ b/bin/hardening/4.1.1.2_halt_when_audit_log_full.sh @@ -5,7 +5,7 @@ # # -# 8.1.1.2 Disable System on Audit Log Full (Not Scored) +# 4.1.1.2 Ensure system is disabled when audit logs are full (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.1.3_keep_all_audit_logs.sh b/bin/hardening/4.1.1.3_keep_all_audit_logs.sh similarity index 97% rename from bin/hardening/8.1.1.3_keep_all_audit_logs.sh rename to bin/hardening/4.1.1.3_keep_all_audit_logs.sh index ed4d9f7..dcb3f59 100755 --- a/bin/hardening/8.1.1.3_keep_all_audit_logs.sh +++ b/bin/hardening/4.1.1.3_keep_all_audit_logs.sh @@ -5,7 +5,7 @@ # # -# 8.1.1.3 Keep All Auditing Information (Scored) +# 4.1.1.3 Ensure audit logs are not automatically deleted (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.10_record_dac_edit.sh b/bin/hardening/4.1.10_record_dac_edit.sh similarity index 96% rename from bin/hardening/8.1.10_record_dac_edit.sh rename to bin/hardening/4.1.10_record_dac_edit.sh index 6d54784..54aaed5 100755 --- a/bin/hardening/8.1.10_record_dac_edit.sh +++ b/bin/hardening/4.1.10_record_dac_edit.sh @@ -5,7 +5,7 @@ # # -# 8.1.10 Collect Discretionary Access Control Permission Modification Events (Scored) +# 4.1.10 Ensure discretionary access control permission modification events are collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.11_record_failed_access_file.sh b/bin/hardening/4.1.11_record_failed_access_file.sh similarity index 96% rename from bin/hardening/8.1.11_record_failed_access_file.sh rename to bin/hardening/4.1.11_record_failed_access_file.sh index 9fc217d..dda66e3 100755 --- a/bin/hardening/8.1.11_record_failed_access_file.sh +++ b/bin/hardening/4.1.11_record_failed_access_file.sh @@ -5,7 +5,7 @@ # # -# 8.1.11 Collect Unsuccessful Unauthorized Access Attempts to Files (Scored) +# 4.1.11 Ensure unsuccessful unauthorized file access attempts are collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.12_record_privileged_commands.sh b/bin/hardening/4.1.12_record_privileged_commands.sh similarity index 97% rename from bin/hardening/8.1.12_record_privileged_commands.sh rename to bin/hardening/4.1.12_record_privileged_commands.sh index 020be64..8bad512 100755 --- a/bin/hardening/8.1.12_record_privileged_commands.sh +++ b/bin/hardening/4.1.12_record_privileged_commands.sh @@ -5,7 +5,7 @@ # # -# 8.1.12 Collect Use of Privileged Commands (Scored) +# 4.1.12 Ensure use of privileged commands is collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.13_record_successful_mount.sh b/bin/hardening/4.1.13_record_successful_mount.sh similarity index 96% rename from bin/hardening/8.1.13_record_successful_mount.sh rename to bin/hardening/4.1.13_record_successful_mount.sh index 1dbc5ca..0019606 100755 --- a/bin/hardening/8.1.13_record_successful_mount.sh +++ b/bin/hardening/4.1.13_record_successful_mount.sh @@ -5,7 +5,7 @@ # # -# 8.1.13 Collect Successful File System Mounts (Scored) +# 4.1.13 Ensure successful file system mounts are collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.14_record_file_deletions.sh b/bin/hardening/4.1.14_record_file_deletions.sh similarity index 97% rename from bin/hardening/8.1.14_record_file_deletions.sh rename to bin/hardening/4.1.14_record_file_deletions.sh index acf4302..79b3577 100755 --- a/bin/hardening/8.1.14_record_file_deletions.sh +++ b/bin/hardening/4.1.14_record_file_deletions.sh @@ -5,7 +5,7 @@ # # -# 8.1.14 Collect File Deletion Events by User (Scored) +# 4.1.14 Ensure file deletion events by users are collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.15_record_sudoers_edit.sh b/bin/hardening/4.1.15_record_sudoers_edit.sh similarity index 96% rename from bin/hardening/8.1.15_record_sudoers_edit.sh rename to bin/hardening/4.1.15_record_sudoers_edit.sh index b5dc8e9..a634fda 100755 --- a/bin/hardening/8.1.15_record_sudoers_edit.sh +++ b/bin/hardening/4.1.15_record_sudoers_edit.sh @@ -5,7 +5,7 @@ # # -# 8.1.15 Collect Changes to System Administration Scope (sudoers) (Scored) +# 4.1.15 nsure changes to system administration scope (sudoers) is collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.16_record_sudo_usage.sh b/bin/hardening/4.1.16_record_sudo_usage.sh similarity index 96% rename from bin/hardening/8.1.16_record_sudo_usage.sh rename to bin/hardening/4.1.16_record_sudo_usage.sh index 5a1348e..426e971 100755 --- a/bin/hardening/8.1.16_record_sudo_usage.sh +++ b/bin/hardening/4.1.16_record_sudo_usage.sh @@ -5,7 +5,7 @@ # # -# 8.1.16 Collect System Administrator Actions (sudolog) (Scored) +# 4.1.16 Ensure system administrator actions (sudolog) are collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.17_record_kernel_modules.sh b/bin/hardening/4.1.17_record_kernel_modules.sh similarity index 96% rename from bin/hardening/8.1.17_record_kernel_modules.sh rename to bin/hardening/4.1.17_record_kernel_modules.sh index 0b0c83f..72a3a87 100755 --- a/bin/hardening/8.1.17_record_kernel_modules.sh +++ b/bin/hardening/4.1.17_record_kernel_modules.sh @@ -5,7 +5,7 @@ # # -# 8.1.17 Collect Kernel Module Loading and Unloading (Scored) +# 4.1.17 Ensure kernel module loading and unloading is collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.18_freeze_auditd_conf.sh b/bin/hardening/4.1.18_freeze_auditd_conf.sh similarity index 97% rename from bin/hardening/8.1.18_freeze_auditd_conf.sh rename to bin/hardening/4.1.18_freeze_auditd_conf.sh index 23b7449..63edceb 100755 --- a/bin/hardening/8.1.18_freeze_auditd_conf.sh +++ b/bin/hardening/4.1.18_freeze_auditd_conf.sh @@ -5,7 +5,7 @@ # # -# 8.1.18 Make the Audit Configuration Immutable (Scored) +# 4.1.18 Ensure the audit configuration is immutable (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.2_enable_auditd.sh b/bin/hardening/4.1.2_enable_auditd.sh similarity index 95% rename from bin/hardening/8.1.2_enable_auditd.sh rename to bin/hardening/4.1.2_enable_auditd.sh index 64ae13a..36262bb 100755 --- a/bin/hardening/8.1.2_enable_auditd.sh +++ b/bin/hardening/4.1.2_enable_auditd.sh @@ -5,7 +5,7 @@ # # -# 8.1.2 Install and Enable auditd Service (Scored) +# 4.1.2 Ensure auditd service is enabled (Scored) # set -e # One error, it's over @@ -27,7 +27,7 @@ audit () { is_service_enabled $SERVICE_NAME if [ $FNRET = 0 ]; then ok "$SERVICE_NAME is enabled" - else + else crit "$SERVICE_NAME is not enabled" fi fi @@ -45,7 +45,7 @@ apply () { is_service_enabled $SERVICE_NAME if [ $FNRET = 0 ]; then ok "$SERVICE_NAME is enabled" - else + else warn "$SERVICE_NAME is not enabled, enabling it" update-rc.d $SERVICE_NAME remove > /dev/null 2>&1 update-rc.d $SERVICE_NAME defaults > /dev/null 2>&1 diff --git a/bin/hardening/8.1.3_audit_bootloader.sh b/bin/hardening/4.1.3_audit_bootloader.sh similarity index 97% rename from bin/hardening/8.1.3_audit_bootloader.sh rename to bin/hardening/4.1.3_audit_bootloader.sh index e8a8d51..bc4a6e5 100755 --- a/bin/hardening/8.1.3_audit_bootloader.sh +++ b/bin/hardening/4.1.3_audit_bootloader.sh @@ -5,7 +5,7 @@ # # -# 8.1.3 Enable Auditing for Processes That Start Prior to auditd (Scored) +# 4.1.3 Ensure auditing for processes that start prior to auditd is enabled (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.4_record_date_time_edit.sh b/bin/hardening/4.1.4_record_date_time_edit.sh similarity index 96% rename from bin/hardening/8.1.4_record_date_time_edit.sh rename to bin/hardening/4.1.4_record_date_time_edit.sh index 91093c0..3a33ced 100755 --- a/bin/hardening/8.1.4_record_date_time_edit.sh +++ b/bin/hardening/4.1.4_record_date_time_edit.sh @@ -5,7 +5,7 @@ # # -# 8.1.4 Record Events That Modify Date and Time Information (Scored) +# 4.1.4 Ensure events that modify date and time information are collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.5_record_user_group_edit.sh b/bin/hardening/4.1.5_record_user_group_edit.sh similarity index 96% rename from bin/hardening/8.1.5_record_user_group_edit.sh rename to bin/hardening/4.1.5_record_user_group_edit.sh index 03750ee..5a04a2e 100755 --- a/bin/hardening/8.1.5_record_user_group_edit.sh +++ b/bin/hardening/4.1.5_record_user_group_edit.sh @@ -5,7 +5,7 @@ # # -# 8.1.5 Record Events That Modify User/Group Information (Scored) +# 4.1.5 Ensure events that modify user/group information are collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.6_record_network_edit.sh b/bin/hardening/4.1.6_record_network_edit.sh similarity index 96% rename from bin/hardening/8.1.6_record_network_edit.sh rename to bin/hardening/4.1.6_record_network_edit.sh index 2e58b88..68cf16b 100755 --- a/bin/hardening/8.1.6_record_network_edit.sh +++ b/bin/hardening/4.1.6_record_network_edit.sh @@ -5,7 +5,7 @@ # # -# 8.1.6 Record Events That Modify the System's Network Environment (Scored) +# 4.1.6 Ensure events that modify the system's network environment are collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.7_record_mac_edit.sh b/bin/hardening/4.1.7_record_mac_edit.sh similarity index 95% rename from bin/hardening/8.1.7_record_mac_edit.sh rename to bin/hardening/4.1.7_record_mac_edit.sh index e909998..f676ee6 100755 --- a/bin/hardening/8.1.7_record_mac_edit.sh +++ b/bin/hardening/4.1.7_record_mac_edit.sh @@ -5,7 +5,7 @@ # # -# 8.1.7 Record Events That Modify the System's Mandatory Access Controls (Scored) +# 4.1.7 Ensure that events that modify the system's Mandatory Access Controls are collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.8_record_login_logout.sh b/bin/hardening/4.1.8_record_login_logout.sh similarity index 97% rename from bin/hardening/8.1.8_record_login_logout.sh rename to bin/hardening/4.1.8_record_login_logout.sh index 0bbec94..b56f6ce 100755 --- a/bin/hardening/8.1.8_record_login_logout.sh +++ b/bin/hardening/4.1.8_record_login_logout.sh @@ -5,7 +5,7 @@ # # -# 8.1.8 Collect Login and Logout Events (Scored) +# 4.1.8 Ensure login and logout events are collected (Scored) # set -e # One error, it's over diff --git a/bin/hardening/8.1.9_record_session_init.sh b/bin/hardening/4.1.9_record_session_init.sh similarity index 96% rename from bin/hardening/8.1.9_record_session_init.sh rename to bin/hardening/4.1.9_record_session_init.sh index 134a36a..95a87d7 100755 --- a/bin/hardening/8.1.9_record_session_init.sh +++ b/bin/hardening/4.1.9_record_session_init.sh @@ -5,7 +5,7 @@ # # -# 8.1.9 Collect Session Initiation Information (Scored) +# 4.1.9 Ensure session initiation information is collected (Scored) # set -e # One error, it's over diff --git a/tests/hardening/8.1.1.1_audit_log_storage.sh b/tests/hardening/4.1.1.1_audit_log_storage.sh similarity index 100% rename from tests/hardening/8.1.1.1_audit_log_storage.sh rename to tests/hardening/4.1.1.1_audit_log_storage.sh diff --git a/tests/hardening/8.1.1.2_halt_when_audit_log_full.sh b/tests/hardening/4.1.1.2_halt_when_audit_log_full.sh similarity index 100% rename from tests/hardening/8.1.1.2_halt_when_audit_log_full.sh rename to tests/hardening/4.1.1.2_halt_when_audit_log_full.sh diff --git a/tests/hardening/8.1.1.3_keep_all_audit_logs.sh b/tests/hardening/4.1.1.3_keep_all_audit_logs.sh similarity index 100% rename from tests/hardening/8.1.1.3_keep_all_audit_logs.sh rename to tests/hardening/4.1.1.3_keep_all_audit_logs.sh diff --git a/tests/hardening/8.1.10_record_dac_edit.sh b/tests/hardening/4.1.10_record_dac_edit.sh similarity index 100% rename from tests/hardening/8.1.10_record_dac_edit.sh rename to tests/hardening/4.1.10_record_dac_edit.sh diff --git a/tests/hardening/8.1.11_record_failed_access_file.sh b/tests/hardening/4.1.11_record_failed_access_file.sh similarity index 100% rename from tests/hardening/8.1.11_record_failed_access_file.sh rename to tests/hardening/4.1.11_record_failed_access_file.sh diff --git a/tests/hardening/8.1.12_record_privileged_commands.sh b/tests/hardening/4.1.12_record_privileged_commands.sh similarity index 100% rename from tests/hardening/8.1.12_record_privileged_commands.sh rename to tests/hardening/4.1.12_record_privileged_commands.sh diff --git a/tests/hardening/8.1.13_record_successful_mount.sh b/tests/hardening/4.1.13_record_successful_mount.sh similarity index 100% rename from tests/hardening/8.1.13_record_successful_mount.sh rename to tests/hardening/4.1.13_record_successful_mount.sh diff --git a/tests/hardening/8.1.14_record_file_deletions.sh b/tests/hardening/4.1.14_record_file_deletions.sh similarity index 100% rename from tests/hardening/8.1.14_record_file_deletions.sh rename to tests/hardening/4.1.14_record_file_deletions.sh diff --git a/tests/hardening/8.1.15_record_sudoers_edit.sh b/tests/hardening/4.1.15_record_sudoers_edit.sh similarity index 100% rename from tests/hardening/8.1.15_record_sudoers_edit.sh rename to tests/hardening/4.1.15_record_sudoers_edit.sh diff --git a/tests/hardening/8.1.16_record_sudo_usage.sh b/tests/hardening/4.1.16_record_sudo_usage.sh similarity index 100% rename from tests/hardening/8.1.16_record_sudo_usage.sh rename to tests/hardening/4.1.16_record_sudo_usage.sh diff --git a/tests/hardening/8.1.17_record_kernel_modules.sh b/tests/hardening/4.1.17_record_kernel_modules.sh similarity index 100% rename from tests/hardening/8.1.17_record_kernel_modules.sh rename to tests/hardening/4.1.17_record_kernel_modules.sh diff --git a/tests/hardening/8.1.18_freeze_auditd_conf.sh b/tests/hardening/4.1.18_freeze_auditd_conf.sh similarity index 100% rename from tests/hardening/8.1.18_freeze_auditd_conf.sh rename to tests/hardening/4.1.18_freeze_auditd_conf.sh diff --git a/tests/hardening/8.1.2_enable_auditd.sh b/tests/hardening/4.1.2_enable_auditd.sh similarity index 100% rename from tests/hardening/8.1.2_enable_auditd.sh rename to tests/hardening/4.1.2_enable_auditd.sh diff --git a/tests/hardening/8.1.3_audit_bootloader.sh b/tests/hardening/4.1.3_audit_bootloader.sh similarity index 100% rename from tests/hardening/8.1.3_audit_bootloader.sh rename to tests/hardening/4.1.3_audit_bootloader.sh diff --git a/tests/hardening/8.1.4_record_date_time_edit.sh b/tests/hardening/4.1.4_record_date_time_edit.sh similarity index 100% rename from tests/hardening/8.1.4_record_date_time_edit.sh rename to tests/hardening/4.1.4_record_date_time_edit.sh diff --git a/tests/hardening/8.1.5_record_user_group_edit.sh b/tests/hardening/4.1.5_record_user_group_edit.sh similarity index 100% rename from tests/hardening/8.1.5_record_user_group_edit.sh rename to tests/hardening/4.1.5_record_user_group_edit.sh diff --git a/tests/hardening/8.1.6_record_network_edit.sh b/tests/hardening/4.1.6_record_network_edit.sh similarity index 100% rename from tests/hardening/8.1.6_record_network_edit.sh rename to tests/hardening/4.1.6_record_network_edit.sh diff --git a/tests/hardening/8.1.7_record_mac_edit.sh b/tests/hardening/4.1.7_record_mac_edit.sh similarity index 100% rename from tests/hardening/8.1.7_record_mac_edit.sh rename to tests/hardening/4.1.7_record_mac_edit.sh diff --git a/tests/hardening/8.1.8_record_login_logout.sh b/tests/hardening/4.1.8_record_login_logout.sh similarity index 100% rename from tests/hardening/8.1.8_record_login_logout.sh rename to tests/hardening/4.1.8_record_login_logout.sh diff --git a/tests/hardening/8.1.9_record_session_init.sh b/tests/hardening/4.1.9_record_session_init.sh similarity index 100% rename from tests/hardening/8.1.9_record_session_init.sh rename to tests/hardening/4.1.9_record_session_init.sh