From 36e652d227067368db27b93a267fae66a0df3cc3 Mon Sep 17 00:00:00 2001 From: "thibault.dewailly" Date: Tue, 5 Apr 2016 09:18:51 +0200 Subject: [PATCH] 2.6.4_var_tmp_noexec.sh 2.7_var_log_partition.sh --- bin/hardening/2.6.1_var_tmp_partition.sh | 2 +- bin/hardening/2.6.2_var_tmp_nodev.sh | 2 +- bin/hardening/2.6.3_var_tmp_nosuid.sh | 2 +- bin/hardening/2.6.4_var_tmp_noexec.sh | 80 ++++++++++++++++++++++++ bin/hardening/2.7_var_log_partition.sh | 69 ++++++++++++++++++++ etc/conf.d/2.6.2_var_tmp_nodev.cfg | 2 +- etc/conf.d/2.6.3_var_tmp_nosuid.cfg | 2 +- etc/conf.d/2.6.4_var_tmp_noexec.cfg | 2 + etc/conf.d/2.7_var_log_partition.cfg | 2 + 9 files changed, 158 insertions(+), 5 deletions(-) create mode 100755 bin/hardening/2.6.4_var_tmp_noexec.sh create mode 100755 bin/hardening/2.7_var_log_partition.sh create mode 100644 etc/conf.d/2.6.4_var_tmp_noexec.cfg create mode 100644 etc/conf.d/2.7_var_log_partition.cfg diff --git a/bin/hardening/2.6.1_var_tmp_partition.sh b/bin/hardening/2.6.1_var_tmp_partition.sh index cee9b19..1a1348b 100755 --- a/bin/hardening/2.6.1_var_tmp_partition.sh +++ b/bin/hardening/2.6.1_var_tmp_partition.sh @@ -5,7 +5,7 @@ # # -# 2.1 Create Separate Partition for /tmp (Scored) +# 2.6.1 Create Separate Partition for /var/tmp (Scored) # set -e # One error, it's over diff --git a/bin/hardening/2.6.2_var_tmp_nodev.sh b/bin/hardening/2.6.2_var_tmp_nodev.sh index adac6da..2be7322 100755 --- a/bin/hardening/2.6.2_var_tmp_nodev.sh +++ b/bin/hardening/2.6.2_var_tmp_nodev.sh @@ -5,7 +5,7 @@ # # -# 2.2 Set nodev option for /tmp Partition (Scored) +# 2.6.2 Set nodev option for /var/tmp Partition (Scored) # set -e # One error, it's over diff --git a/bin/hardening/2.6.3_var_tmp_nosuid.sh b/bin/hardening/2.6.3_var_tmp_nosuid.sh index 3ba5356..992d8e6 100755 --- a/bin/hardening/2.6.3_var_tmp_nosuid.sh +++ b/bin/hardening/2.6.3_var_tmp_nosuid.sh @@ -5,7 +5,7 @@ # # -# 2.3 Set nosuid option for /tmp Partition (Scored) +# 2.6.3 Set nosuid option for /var/tmp Partition (Scored) # set -e # One error, it's over diff --git a/bin/hardening/2.6.4_var_tmp_noexec.sh b/bin/hardening/2.6.4_var_tmp_noexec.sh new file mode 100755 index 0000000..223477f --- /dev/null +++ b/bin/hardening/2.6.4_var_tmp_noexec.sh @@ -0,0 +1,80 @@ +#!/bin/bash + +# +# CIS Debian 7 Hardening +# + +# +# 2.6.4 Set noexec option for /var/tmp Partition (Scored) +# + +set -e # One error, it's over +set -u # One variable unset, it's over + +# Quick factoring as many script use the same logic +PARTITION="/var/tmp" +OPTION="noexec" + +# This function will be called if the script status is on enabled / audit mode +audit () { + info "Verifying that $PARTITION is a partition" + FNRET=0 + is_a_partition "$PARTITION" + if [ $FNRET -gt 0 ]; then + crit "$PARTITION is not a partition" + FNRET=2 + else + ok "$PARTITION is a partition" + has_mount_option $PARTITION $OPTION + if [ $FNRET -gt 0 ]; then + crit "$PARTITION have no option $OPTION in fstab !" + FNRET=1 + else + ok "$PARTITION have $OPTION in fstab" + has_mounted_option $PARTITION $OPTION + if [ $FNRET -gt 0 ]; then + warn "$PARTITION is not mounted with $OPTION at runtime" + FNRET=3 + else + ok "$PARTITION mounted with $OPTION" + fi + fi + fi +} + +# This function will be called if the script status is on enabled mode +apply () { + if [ $FNRET = 0 ]; then + ok "$PARTITION is correctly set" + elif [ $FNRET = 2 ]; then + crit "$PARTITION is not a partition, correct this by yourself, I cannot help you here" + elif [ $FNRET = 1 ]; then + info "Adding $OPTION to fstab" + add_option_to_fstab $PARTITION $OPTION + info "Remounting $PARTITION from fstab" + remount_partition $PARTITION + elif [ $FNRET = 3 ]; then + info "Remounting $PARTITION from fstab" + remount_partition $PARTITION + fi +} + +# This function will check config parameters required +check_config() { + # No param for this script + : +} + +# Source Root Dir Parameter +if [ ! -r /etc/default/cis-hardenning ]; then + echo "There is no /etc/default/cis-hardenning file, cannot source CIS_ROOT_DIR variable, aborting" + exit 128 +else + . /etc/default/cis-hardenning + if [ -z $CIS_ROOT_DIR ]; then + echo "No CIS_ROOT_DIR variable, aborting" + fi +fi + +# Main function, will call the proper functions given the configuration (audit, enabled, disabled) +[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh diff --git a/bin/hardening/2.7_var_log_partition.sh b/bin/hardening/2.7_var_log_partition.sh new file mode 100755 index 0000000..32b2c74 --- /dev/null +++ b/bin/hardening/2.7_var_log_partition.sh @@ -0,0 +1,69 @@ +#!/bin/bash + +# +# CIS Debian 7 Hardening +# + +# +# 2.7 Create Separate Partition for /var/log (Scored) +# + +set -e # One error, it's over +set -u # One variable unset, it's over + +# Quick factoring as many script use the same logic +PARTITION="/var/log" + +# This function will be called if the script status is on enabled / audit mode +audit () { + info "Verifying that $PARTITION is a partition" + FNRET=0 + is_a_partition "$PARTITION" + if [ $FNRET -gt 0 ]; then + crit "$PARTITION is not a partition" + FNRET=2 + else + ok "$PARTITION is a partition" + is_mounted "$PARTITION" + if [ $FNRET -gt 0 ]; then + warn "$PARTITION is not mounted" + FNRET=1 + else + ok "$PARTITION is mounted" + fi + fi + + : +} + +# This function will be called if the script status is on enabled mode +apply () { + if [ $FNRET = 0 ]; then + ok "$PARTITION is correctly set" + elif [ $FNRET = 2 ]; then + crit "$PARTITION is not a partition, correct this by yourself, I cannot help you here" + else + info "mounting $PARTITION" + mount $PARTITION + fi +} + +# This function will check config parameters required +check_config() { + # No parameter for this script + : +} + +# Source Root Dir Parameter +if [ ! -r /etc/default/cis-hardenning ]; then + echo "There is no /etc/default/cis-hardenning file, cannot source CIS_ROOT_DIR variable, aborting" + exit 128 +else + . /etc/default/cis-hardenning + if [ -z $CIS_ROOT_DIR ]; then + echo "No CIS_ROOT_DIR variable, aborting" + fi +fi + +# Main function, will call the proper functions given the configuration (audit, enabled, disabled) +[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh diff --git a/etc/conf.d/2.6.2_var_tmp_nodev.cfg b/etc/conf.d/2.6.2_var_tmp_nodev.cfg index e1e4502..acee522 100644 --- a/etc/conf.d/2.6.2_var_tmp_nodev.cfg +++ b/etc/conf.d/2.6.2_var_tmp_nodev.cfg @@ -1,2 +1,2 @@ # Configuration for script of same name -status=enabled +status=disabled diff --git a/etc/conf.d/2.6.3_var_tmp_nosuid.cfg b/etc/conf.d/2.6.3_var_tmp_nosuid.cfg index e1e4502..acee522 100644 --- a/etc/conf.d/2.6.3_var_tmp_nosuid.cfg +++ b/etc/conf.d/2.6.3_var_tmp_nosuid.cfg @@ -1,2 +1,2 @@ # Configuration for script of same name -status=enabled +status=disabled diff --git a/etc/conf.d/2.6.4_var_tmp_noexec.cfg b/etc/conf.d/2.6.4_var_tmp_noexec.cfg new file mode 100644 index 0000000..acee522 --- /dev/null +++ b/etc/conf.d/2.6.4_var_tmp_noexec.cfg @@ -0,0 +1,2 @@ +# Configuration for script of same name +status=disabled diff --git a/etc/conf.d/2.7_var_log_partition.cfg b/etc/conf.d/2.7_var_log_partition.cfg new file mode 100644 index 0000000..e1e4502 --- /dev/null +++ b/etc/conf.d/2.7_var_log_partition.cfg @@ -0,0 +1,2 @@ +# Configuration for script of same name +status=enabled