diff --git a/bin/hardening/1.4.1_bootloader_ownership.sh b/bin/hardening/1.5.1_bootloader_ownership.sh similarity index 97% rename from bin/hardening/1.4.1_bootloader_ownership.sh rename to bin/hardening/1.5.1_bootloader_ownership.sh index 803a374..c23768a 100755 --- a/bin/hardening/1.4.1_bootloader_ownership.sh +++ b/bin/hardening/1.5.1_bootloader_ownership.sh @@ -6,7 +6,7 @@ # # -# 1.4.1 Ensure permissions on bootloader config are configured (Scored) +# 1.5.1 Ensure permissions on bootloader config are configured (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.4.2_bootloader_password.sh b/bin/hardening/1.5.2_bootloader_password.sh similarity index 97% rename from bin/hardening/1.4.2_bootloader_password.sh rename to bin/hardening/1.5.2_bootloader_password.sh index 0585c1b..45e8a39 100755 --- a/bin/hardening/1.4.2_bootloader_password.sh +++ b/bin/hardening/1.5.2_bootloader_password.sh @@ -6,7 +6,7 @@ # # -# 1.4.2 Ensure bootloader password is set (Scored) +# 1.5.2 Ensure bootloader password is set (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.4.3_root_password.sh b/bin/hardening/1.5.3_root_password.sh similarity index 96% rename from bin/hardening/1.4.3_root_password.sh rename to bin/hardening/1.5.3_root_password.sh index cc44ef9..ee24236 100755 --- a/bin/hardening/1.4.3_root_password.sh +++ b/bin/hardening/1.5.3_root_password.sh @@ -6,7 +6,7 @@ # # -# 1.4.3 Ensure authentication required for single user mode (Scored) +# 1.5.3 Ensure authentication required for single user mode (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.5.2_enable_nx_support.sh b/bin/hardening/1.6.1_enable_nx_support.sh similarity index 97% rename from bin/hardening/1.5.2_enable_nx_support.sh rename to bin/hardening/1.6.1_enable_nx_support.sh index 96159eb..881f61c 100755 --- a/bin/hardening/1.5.2_enable_nx_support.sh +++ b/bin/hardening/1.6.1_enable_nx_support.sh @@ -6,7 +6,7 @@ # # -# 1.5.2 Ensure XD/NX support is enabled (Not Scored) +# 1.6.1 Ensure XD/NX support is enabled (Not Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.5.3_enable_randomized_vm_placement.sh b/bin/hardening/1.6.2_enable_randomized_vm_placement.sh similarity index 97% rename from bin/hardening/1.5.3_enable_randomized_vm_placement.sh rename to bin/hardening/1.6.2_enable_randomized_vm_placement.sh index c4c6ee7..e158aef 100755 --- a/bin/hardening/1.5.3_enable_randomized_vm_placement.sh +++ b/bin/hardening/1.6.2_enable_randomized_vm_placement.sh @@ -6,7 +6,7 @@ # # -# 1.5.3 Ensure address space layout randomization (ASLR) is enabled (Scored) +# 1.6.2 Ensure address space layout randomization (ASLR) is enabled (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.5.4_disable_prelink.sh b/bin/hardening/1.6.3_disable_prelink.sh similarity index 97% rename from bin/hardening/1.5.4_disable_prelink.sh rename to bin/hardening/1.6.3_disable_prelink.sh index b859c29..043f49f 100755 --- a/bin/hardening/1.5.4_disable_prelink.sh +++ b/bin/hardening/1.6.3_disable_prelink.sh @@ -6,7 +6,7 @@ # # -# 1.5.4 Ensure prelink is disabled (Scored) +# 1.6.3 Ensure prelink is disabled (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.5.1_restrict_core_dumps.sh b/bin/hardening/1.6.4_restrict_core_dumps.sh similarity index 98% rename from bin/hardening/1.5.1_restrict_core_dumps.sh rename to bin/hardening/1.6.4_restrict_core_dumps.sh index f4d6ab9..3845952 100755 --- a/bin/hardening/1.5.1_restrict_core_dumps.sh +++ b/bin/hardening/1.6.4_restrict_core_dumps.sh @@ -6,7 +6,7 @@ # # -# 1.5.1 Ensure core dumps are restricted (Scored) +# 1.6.4 Ensure core dumps are restricted (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.6.2.1_enable_apparmor.sh b/bin/hardening/1.7.1.2_enable_apparmor.sh similarity index 98% rename from bin/hardening/1.6.2.1_enable_apparmor.sh rename to bin/hardening/1.7.1.2_enable_apparmor.sh index 1102ea3..06e05fb 100755 --- a/bin/hardening/1.6.2.1_enable_apparmor.sh +++ b/bin/hardening/1.7.1.2_enable_apparmor.sh @@ -6,7 +6,7 @@ # # -# 1.6.2.1 Activate AppArmor (Scored) +# 1.7.2.2 Activate AppArmor (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.7.1.1_remove_os_info_motd.sh b/bin/hardening/1.8.1.1_remove_os_info_motd.sh similarity index 96% rename from bin/hardening/1.7.1.1_remove_os_info_motd.sh rename to bin/hardening/1.8.1.1_remove_os_info_motd.sh index 87540da..70e63d5 100755 --- a/bin/hardening/1.7.1.1_remove_os_info_motd.sh +++ b/bin/hardening/1.8.1.1_remove_os_info_motd.sh @@ -6,7 +6,7 @@ # # -# 1.7.1.1 Ensure message of the day is configured properly (Scored) +# 1.8.1.1 Ensure message of the day is configured properly (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.7.1.2_remove_os_info_issue.sh b/bin/hardening/1.8.1.2_remove_os_info_issue.sh similarity index 96% rename from bin/hardening/1.7.1.2_remove_os_info_issue.sh rename to bin/hardening/1.8.1.2_remove_os_info_issue.sh index c055301..89f3c78 100755 --- a/bin/hardening/1.7.1.2_remove_os_info_issue.sh +++ b/bin/hardening/1.8.1.2_remove_os_info_issue.sh @@ -6,7 +6,7 @@ # # -# 1.7.1.2 Ensure local login warning banner is configured properly (Scored) +# 1.8.1.2 Ensure local login warning banner is configured properly (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.7.1.3_remove_os_info_issue_net.sh b/bin/hardening/1.8.1.3_remove_os_info_issue_net.sh similarity index 96% rename from bin/hardening/1.7.1.3_remove_os_info_issue_net.sh rename to bin/hardening/1.8.1.3_remove_os_info_issue_net.sh index 381d0cf..1fef6a0 100755 --- a/bin/hardening/1.7.1.3_remove_os_info_issue_net.sh +++ b/bin/hardening/1.8.1.3_remove_os_info_issue_net.sh @@ -6,7 +6,7 @@ # # -# 1.7.1.3 Ensure remote login warning banner is configured properly (Scored) +# 1.8.1.3 Ensure remote login warning banner is configured properly (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.7.1.4_motd_perms.sh b/bin/hardening/1.8.1.4_motd_perms.sh similarity index 97% rename from bin/hardening/1.7.1.4_motd_perms.sh rename to bin/hardening/1.8.1.4_motd_perms.sh index b697ad6..e86d3a1 100755 --- a/bin/hardening/1.7.1.4_motd_perms.sh +++ b/bin/hardening/1.8.1.4_motd_perms.sh @@ -6,7 +6,7 @@ # # -# 1.7.1.4 Ensure permissions on /etc/motd are configured (Scored) +# 1.8.1.4 Ensure permissions on /etc/motd are configured (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.7.1.5_etc_issue_perms.sh b/bin/hardening/1.8.1.5_etc_issue_perms.sh similarity index 97% rename from bin/hardening/1.7.1.5_etc_issue_perms.sh rename to bin/hardening/1.8.1.5_etc_issue_perms.sh index 648da80..51406db 100755 --- a/bin/hardening/1.7.1.5_etc_issue_perms.sh +++ b/bin/hardening/1.8.1.5_etc_issue_perms.sh @@ -6,7 +6,7 @@ # # -# 1.7.1.5 Ensure permissions on /etc/issue are configured (Scored) +# 1.8.1.5 Ensure permissions on /etc/issue are configured (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.7.1.6_etc_issue_net_perms.sh b/bin/hardening/1.8.1.6_etc_issue_net_perms.sh similarity index 97% rename from bin/hardening/1.7.1.6_etc_issue_net_perms.sh rename to bin/hardening/1.8.1.6_etc_issue_net_perms.sh index fd6aa7a..0c66a65 100755 --- a/bin/hardening/1.7.1.6_etc_issue_net_perms.sh +++ b/bin/hardening/1.8.1.6_etc_issue_net_perms.sh @@ -6,7 +6,7 @@ # # -# 1.7.1.6 Ensure permissions on /etc/issue.net are configured (Scored) +# 1.8.1.6 Ensure permissions on /etc/issue.net are configured (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.7.2_graphical_warning_banners.sh b/bin/hardening/1.8.2_graphical_warning_banners.sh similarity index 95% rename from bin/hardening/1.7.2_graphical_warning_banners.sh rename to bin/hardening/1.8.2_graphical_warning_banners.sh index d5656a1..69335c1 100755 --- a/bin/hardening/1.7.2_graphical_warning_banners.sh +++ b/bin/hardening/1.8.2_graphical_warning_banners.sh @@ -6,7 +6,7 @@ # # -# 1.7.2 Ensure GDM login banner is configured (Scored) +# 1.8.2 Ensure GDM login banner is configured (Scored) # set -e # One error, it's over diff --git a/bin/hardening/1.8_install_updates.sh b/bin/hardening/1.9_install_updates.sh similarity index 96% rename from bin/hardening/1.8_install_updates.sh rename to bin/hardening/1.9_install_updates.sh index 00d1128..07c6155 100755 --- a/bin/hardening/1.8_install_updates.sh +++ b/bin/hardening/1.9_install_updates.sh @@ -6,7 +6,7 @@ # # -# 1.8 Ensure updates, patches and additional security software are installed (Not Scored) +# 1.9 Ensure updates, patches and additional security software are installed (Not Scored) # set -e # One error, it's over diff --git a/tests/hardening/1.4.1_bootloader_ownership.sh b/tests/hardening/1.5.1_bootloader_ownership.sh similarity index 100% rename from tests/hardening/1.4.1_bootloader_ownership.sh rename to tests/hardening/1.5.1_bootloader_ownership.sh diff --git a/tests/hardening/1.4.2_bootloader_password.sh b/tests/hardening/1.5.2_bootloader_password.sh similarity index 100% rename from tests/hardening/1.4.2_bootloader_password.sh rename to tests/hardening/1.5.2_bootloader_password.sh diff --git a/tests/hardening/1.4.3_root_password.sh b/tests/hardening/1.5.3_root_password.sh similarity index 100% rename from tests/hardening/1.4.3_root_password.sh rename to tests/hardening/1.5.3_root_password.sh diff --git a/tests/hardening/1.5.2_enable_nx_support.sh b/tests/hardening/1.6.1_enable_nx_support.sh similarity index 100% rename from tests/hardening/1.5.2_enable_nx_support.sh rename to tests/hardening/1.6.1_enable_nx_support.sh diff --git a/tests/hardening/1.5.3_enable_randomized_vm_placement.sh b/tests/hardening/1.6.2_enable_randomized_vm_placement.sh similarity index 100% rename from tests/hardening/1.5.3_enable_randomized_vm_placement.sh rename to tests/hardening/1.6.2_enable_randomized_vm_placement.sh diff --git a/tests/hardening/1.5.4_disable_prelink.sh b/tests/hardening/1.6.3_disable_prelink.sh similarity index 100% rename from tests/hardening/1.5.4_disable_prelink.sh rename to tests/hardening/1.6.3_disable_prelink.sh diff --git a/tests/hardening/1.5.1_restrict_core_dumps.sh b/tests/hardening/1.6.4_restrict_core_dumps.sh similarity index 100% rename from tests/hardening/1.5.1_restrict_core_dumps.sh rename to tests/hardening/1.6.4_restrict_core_dumps.sh diff --git a/tests/hardening/1.6.2.1_enable_apparmor.sh b/tests/hardening/1.7.1.2_enable_apparmor.sh similarity index 100% rename from tests/hardening/1.6.2.1_enable_apparmor.sh rename to tests/hardening/1.7.1.2_enable_apparmor.sh diff --git a/tests/hardening/1.7.1.1_remove_os_info_motd.sh b/tests/hardening/1.8.1.1_remove_os_info_motd.sh similarity index 100% rename from tests/hardening/1.7.1.1_remove_os_info_motd.sh rename to tests/hardening/1.8.1.1_remove_os_info_motd.sh diff --git a/tests/hardening/1.7.1.2_remove_os_info_issue.sh b/tests/hardening/1.8.1.2_remove_os_info_issue.sh similarity index 100% rename from tests/hardening/1.7.1.2_remove_os_info_issue.sh rename to tests/hardening/1.8.1.2_remove_os_info_issue.sh diff --git a/tests/hardening/1.7.1.3_remove_os_info_issue_net.sh b/tests/hardening/1.8.1.3_remove_os_info_issue_net.sh similarity index 100% rename from tests/hardening/1.7.1.3_remove_os_info_issue_net.sh rename to tests/hardening/1.8.1.3_remove_os_info_issue_net.sh diff --git a/tests/hardening/1.7.1.4_motd_perms.sh b/tests/hardening/1.8.1.4_motd_perms.sh similarity index 100% rename from tests/hardening/1.7.1.4_motd_perms.sh rename to tests/hardening/1.8.1.4_motd_perms.sh diff --git a/tests/hardening/1.7.2_graphical_warning_banners.sh b/tests/hardening/1.8.1.5_etc_issue_perms.sh similarity index 100% rename from tests/hardening/1.7.2_graphical_warning_banners.sh rename to tests/hardening/1.8.1.5_etc_issue_perms.sh diff --git a/tests/hardening/1.8.1.6_etc_issue_net_perms.sh b/tests/hardening/1.8.1.6_etc_issue_net_perms.sh new file mode 100644 index 0000000..f85b20d --- /dev/null +++ b/tests/hardening/1.8.1.6_etc_issue_net_perms.sh @@ -0,0 +1,11 @@ +# shellcheck shell=bash +# run-shellcheck +test_audit() { + describe Running on blank host + register_test retvalshouldbe 0 + dismiss_count_for_test + # shellcheck disable=2154 + run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all + + # TODO fill comprehensive tests +} diff --git a/tests/hardening/1.8.2_graphical_warning_banners.sh b/tests/hardening/1.8.2_graphical_warning_banners.sh new file mode 100644 index 0000000..f85b20d --- /dev/null +++ b/tests/hardening/1.8.2_graphical_warning_banners.sh @@ -0,0 +1,11 @@ +# shellcheck shell=bash +# run-shellcheck +test_audit() { + describe Running on blank host + register_test retvalshouldbe 0 + dismiss_count_for_test + # shellcheck disable=2154 + run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all + + # TODO fill comprehensive tests +} diff --git a/tests/hardening/1.8_install_updates.sh b/tests/hardening/1.9_install_updates.sh similarity index 100% rename from tests/hardening/1.8_install_updates.sh rename to tests/hardening/1.9_install_updates.sh