chore: add new scripts for debian 12

- package_manager_is_configured         -> 1.2.1.2
- ptrace_scope_is_restricted            -> 1.5.2
- gdm_is_removed.sh                     -> 1.7.1
- dnsmasq_is_disabled.sh                -> 2.1.5

bin/hardening/dnsmasq_is_disabled.sh

@@ -6,7 +6,7 @@
 #
 
 #
-# Ensure tftp services are not in use (Automated)
+# Ensure dnsmasq services are not in use (Automated)
 #
 
 set -e # One error, it's over
@@ -15,13 +15,13 @@ set -u # One variable unset, it's over
 # shellcheck disable=2034
 HARDENING_LEVEL=3
 # shellcheck disable=2034
-DESCRIPTION="Ensure tftp services are not in use."
-PACKAGE='tftpd-hpa'
-SERVICE="tftpd-hpa.service"
+DESCRIPTION="Ensure dnsmasq services are not in use."
+PACKAGE='dnsmasq'
+SERVICE="dnsmasq.service"
 
 # 2 scenario here:
-# - tftp is a dependency for another package -> disable the service
-# - tftp is not a dependency for another package -> remove the package
+# - dnsmasq is a dependency for another package -> disable the service
+# - dnsmasq is not a dependency for another package -> remove the package
 
 # This function will be called if the script status is on enabled / audit mode
 audit() {
@@ -88,4 +88,4 @@ if [ -r "${CIS_LIB_DIR}"/main.sh ]; then
 else
     echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_LIB_DIR in /etc/default/cis-hardening"
     exit 128
-fi
+fi

bin/hardening/gdm_is_removed.sh

@@ -6,7 +6,7 @@
 #
 
 #
-# Ensure only approved services are listening on a network interface (Manual)
+# Ensure GDM is removed (Automated)
 #
 
 set -e # One error, it's over
@@ -15,24 +15,29 @@ set -u # One variable unset, it's over
 # shellcheck disable=2034
 HARDENING_LEVEL=3
 # shellcheck disable=2034
-DESCRIPTION="Ensure only approved services are listening on a network interface"
+DESCRIPTION="Ensure GDM is removed."
+PACKAGE='gdm3'
 
 # This function will be called if the script status is on enabled / audit mode
 audit() {
-    ss -plntuH | while read i ;
-    do socket=$(echo "$i" | awk '{print $5}') ;
-        proc=$(echo "$i" | awk '{print $7}' | awk -F ',' '{print $1}' | sed 's/users:((//') ;
-        info -e "$proc listening on \t$socket" ;
-    done
-
-    # output example :
-    # "ntpd" listening on 	127.0.0.1:123
-    # "ntpd" listening on 	0.0.0.0:123
+    is_pkg_installed "$PACKAGE"
+    if [ "$FNRET" = 0 ]; then
+        crit "$PACKAGE is installed!"
+    else
+        ok "$PACKAGE is absent"
+    fi
 }
 
 # This function will be called if the script status is on enabled mode
 apply() {
-    info "This recommendation has to be reviewed and applied manually"
+    is_pkg_installed "$PACKAGE"
+    if [ "$FNRET" = 0 ]; then
+        crit "$PACKAGE is installed, purging it"
+        apt-get purge "$PACKAGE" -y
+        apt-get autoremove -y
+    else
+        ok "$PACKAGE is absent"
+    fi
 }
 
 # This function will check config parameters required
@@ -58,4 +63,4 @@ if [ -r "${CIS_LIB_DIR}"/main.sh ]; then
 else
     echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_LIB_DIR in /etc/default/cis-hardening"
     exit 128
-fi
+fi

bin/hardening/package_manager_is_configured.sh

@@ -6,63 +6,38 @@
 #
 
 #
-# Ensure chrony is enabled and running (Automated)
+# Ensure package manager repositories are configured (Manual)
 #
 
 set -e # One error, it's over
 set -u # One variable unset, it's over
 
 # shellcheck disable=2034
-HARDENING_LEVEL=3
+HARDENING_LEVEL=1
 # shellcheck disable=2034
-DESCRIPTION="Ensure chrony is enabled and running."
-PACKAGE="chrony"
-SERVICE="chrony"
+DESCRIPTION="Ensure apt has source list"
+
+# CIS recommends to execute "apt-cache policy" to ensure the configuration is correct
+# this is not convenient to test, we check the presence of sources list in /var/lib/apt/lists/
+APT_LIB_PATH="/var/lib/apt/lists/"
+# files that are going to be present anyway
+MANDATORY_FILES="lock auxfiles partial"
 
 # This function will be called if the script status is on enabled / audit mode
 audit() {
-    CHRONY_INSTALLED=0
-    CHRONY_ENABLED=0
-    CHRONY_RUNNING=0
+    apt update >/dev/null 2>&1 || true
 
-    is_pkg_installed "$PACKAGE"
-    if [ "$FNRET" -ne 0 ]; then
-        CHRONY_INSTALLED=1
-        crit "chrony is not installed"
-    fi
-    # no package, no need to check further
-    return
-
-    is_service_enabled "$SERVICE"
-    if [ "$FNRET" -ne 0 ]; then
-        CHRONY_INSTALLED=1
-        crit "chrony is not enabled"
-    fi
-
-    is_service_active "$SERVICE"
-    if [ "$FNRET" -ne 0 ]; then
-        CHRONY_RUNNING=1
-        crit "chrony is not running"
+    # shellcheck disable=2012
+    if [ "$(ls "$APT_LIB_PATH" | wc -l)" -ne "$(wc -w <<<"$MANDATORY_FILES")" ]; then
+        ok "apt package manager is configured"
+    else
+        crit "there is no source file, apt is not configured"
     fi
 }
 
 # This function will be called if the script status is on enabled mode
 apply() {
-    audit
-    if [ "$CHRONY_INSTALLED" -eq 1 ]; then
-        warn "Please install chrony manually to ensure only one time synchronization system is installed"
-    fi
-
-    if [ "$CHRONY_ENABLED" -eq 1 ]; then
-        info "Enablign chrony service"
-        manage_service "enable" "$SERVICE"
-    fi
-
-    if [ "$CHRONY_RUNNING" -eq 1 ]; then
-        info "Starting chrony service"
-        manage_service "start" "$SERVICE"
-    fi
-
+    warn "This recommendation can only be resolved manually"
 }
 
 # This function will check config parameters required

bin/hardening/ptrace_scope_is_restricted.sh

@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# run-shellcheck
+#
+# CIS Debian Hardening
+#
+
+#
+# Ensure ptrace_scope is restricted (Automated)
+#
+
+set -e # One error, it's over
+set -u # One variable unset, it's over
+
+# shellcheck disable=2034
+HARDENING_LEVEL=2
+# shellcheck disable=2034
+DESCRIPTION="Ensure ptrace_scope is restricted"
+
+SYSCTL_PARAMS='kernel.yama.ptrace_scope=1'
+
+# This function will be called if the script status is on enabled / audit mode
+audit() {
+    for SYSCTL_VALUES in $SYSCTL_PARAMS; do
+        SYSCTL_PARAM=$(echo "$SYSCTL_VALUES" | cut -d= -f 1)
+        SYSCTL_EXP_RESULT=$(echo "$SYSCTL_VALUES" | cut -d= -f 2)
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
+        has_sysctl_param_expected_result "$SYSCTL_PARAM" "$SYSCTL_EXP_RESULT"
+        if [ "$FNRET" != 0 ]; then
+            crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
+        elif [ "$FNRET" = 255 ]; then
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
+        else
+            ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
+        fi
+    done
+}
+
+# This function will be called if the script status is on enabled mode
+apply() {
+    for SYSCTL_VALUES in $SYSCTL_PARAMS; do
+        SYSCTL_PARAM=$(echo "$SYSCTL_VALUES" | cut -d= -f 1)
+        SYSCTL_EXP_RESULT=$(echo "$SYSCTL_VALUES" | cut -d= -f 2)
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
+        has_sysctl_param_expected_result "$SYSCTL_PARAM" "$SYSCTL_EXP_RESULT"
+        if [ "$FNRET" != 0 ]; then
+            warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
+            set_sysctl_param "$SYSCTL_PARAM" "$SYSCTL_EXP_RESULT"
+            sysctl -w net.ipv4.route.flush=1 >/dev/null
+        elif [ "$FNRET" = 255 ]; then
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
+        else
+            ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
+        fi
+    done
+}
+
+# This function will check config parameters required
+check_config() {
+    :
+}
+
+# Source Root Dir Parameter
+if [ -r /etc/default/cis-hardening ]; then
+    # shellcheck source=../../debian/default
+    . /etc/default/cis-hardening
+fi
+if [ -z "$CIS_LIB_DIR" ]; then
+    echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+    echo "Cannot source CIS_LIB_DIR variable, aborting."
+    exit 128
+fi
+
+# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
+if [ -r "${CIS_LIB_DIR}"/main.sh ]; then
+    # shellcheck source=../../lib/main.sh
+    . "${CIS_LIB_DIR}"/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_LIB_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/use_time_sync.sh

@@ -6,7 +6,7 @@
 #
 
 #
-# Ensure a single time synchronization daemon is in use (Automated)
+# Ensure time synchronization is in use (Not Scored)
 #
 
 set -e # One error, it's over
@@ -15,31 +15,28 @@ set -u # One variable unset, it's over
 # shellcheck disable=2034
 HARDENING_LEVEL=3
 # shellcheck disable=2034
-DESCRIPTION="Ensure a single time synchronization is in use"
+DESCRIPTION="Ensure time synchronization is in use"
 
 PACKAGES="systemd-timesyncd ntp chrony"
 
 # This function will be called if the script status is on enabled / audit mode
 audit() {
-    local count=0
+    FOUND=false
     for PACKAGE in $PACKAGES; do
         is_pkg_installed "$PACKAGE"
-        if [ "$FNRET" -eq 0 ]; then
-            let count=$((count+1))
+        if [ "$FNRET" = 0 ]; then
+            ok "Time synchronization is available through $PACKAGE"
+            FOUND=true
         fi
     done
-    if [ "$count" -eq 0 ]; then
+    if [ "$FOUND" = false ]; then
         crit "None of the following time sync packages are installed: $PACKAGES"
-    elif [ "$count" -gt 1 ]; then
-        crit "Multiple time sync packages are installed, from $PACKAGES. Pick one and remove the others"
-    else
-        info "A single time sync package from $PACKAGES is installed"
     fi
 }
 
 # This function will be called if the script status is on enabled mode
 apply() {
-    info "This recommendation has to be reviewed and applied manually"
+    :
 }
 
 # This function will check config parameters required

lib/utils.sh

@@ -335,27 +335,6 @@ is_service_enabled() {
     fi
 }
 
-is_service_active() {
-    local SERVICE=$1
-
-    # if running in a container, it does not make much sense to test for systemd / service
-    # the var "IS_CONTAINER" defined in lib/constant may not be enough, in case we are using systemd slices
-    # currently, did not find a unified way to manage all cases, so we check this only for systemctl usage
-    is_using_sbin_init
-    if [ "$FNRET" -eq 1 ]; then
-        debug "host was not started using '/sbin/init', systemd should not be available"
-        FNRET=1
-        return
-    fi
-    if $SUDO_CMD systemctl -t service is-active "$SERVICE" >/dev/null; then
-        debug "Service $SERVICE is active"
-        FNRET=0
-    else
-        debug "Service $SERVICE is active"
-        FNRET=1
-    fi
-}
-
 #
 # Kernel Options checks
 #
@@ -687,5 +666,4 @@ manage_service() {
     fi
 
     systemctl "$action" "$service" >/dev/null 2>&1
-
 }

tests/hardening/chrony_is_enabled_and_running.sh

@@ -1,18 +0,0 @@
-# shellcheck shell=bash
-# run-shellcheck
-test_audit() {
-
-    describe Ensure package is installed
-
-    # install dependencies
-    apt  update
-    apt  install -y chrony
-
-    # not much to test here, we are running in a container, we wont check service state
-    describe Checking blank host
-    register_test retvalshouldbe 0
-    run blank "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
-
-    apt remove -y chrony
-
-}

tests/hardening/dnsmasq_is_disabled.sh

@@ -3,7 +3,7 @@
 test_audit() {
 
     describe Prepare on purpose failed test
-    apt install -y tftp
+    apt install -y dnsmasq
     # running on a container, will can only test the package installation, not the service management
 
     describe Running on purpose failed test
@@ -20,9 +20,9 @@ test_audit() {
     run resolved "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
 
     describe Prepare test package dependencies
-    # try to install a package that depends on 'tftp-hpa'
-    apt install -y tfpt-hpa-dbg
-    # running on a container, we can only test the package installation, not the service management
+    # try to install a package with not much dependencies
+    apt install -y ocserv
+    # running on a container, will can only test the package installation, not the service management
 
     describe Running successfull test
     register_test retvalshouldbe 0
@@ -30,7 +30,7 @@ test_audit() {
     run blank "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
 
     describe clean installation
-    apt remove -y tfpt-hpa-dbg
+    apt remove -y ocserv
     apt autoremove -y
 
-}
+}

tests/hardening/gdm_is_removed.sh

@@ -0,0 +1,16 @@
+# 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 "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
+
+    ##################################################################
+    # For this test, we only check that it runs properly on a blank  #
+    # host, and we check root/sudo consistency. But, we don't test   #
+    # the apply function because it can't be automated or it is very #
+    # long to test and not very useful.                              #
+    ##################################################################
+}

tests/hardening/package_manager_is_configured.sh

@@ -2,9 +2,8 @@
 # run-shellcheck
 test_audit() {
     describe Running on blank host
+    # chance to not have any souces list on a blank host are close to null
     register_test retvalshouldbe 0
-    dismiss_count_for_test
     # shellcheck disable=2154
     run blank "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
-
 }

tests/hardening/ptrace_scope_is_restricted.sh

@@ -0,0 +1,30 @@
+# 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 "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
+
+    if [ -f "/.dockerenv" ]; then
+        skip "SKIPPED on docker"
+    else
+        describe Tests purposely failing
+        sysctl -w kernel.yama.ptrace_scope=0 2>/dev/null
+        register_test retvalshouldbe 1
+        register_test contain "kernel.yama.ptrace_scope was not set to 1"
+
+        run noncompliant "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
+
+        describe correcting situation
+        sed -i 's/audit/enabled/' "${CIS_CONF_DIR}/conf.d/${script}.cfg"
+        "${CIS_CHECKS_DIR}/${script}.sh" --apply || true
+
+        describe Checking resolved state
+        register_test retvalshouldbe 0
+        register_test contain "correctly set to 1"
+        register_test contain "kernel.yama.ptrace_scope correctly set to 1"
+        run resolved "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
+    fi
+}

tests/hardening/use_time_sync.sh

@@ -3,6 +3,7 @@
 test_audit() {
     describe Running on blank host
     register_test retvalshouldbe 1
+    dismiss_count_for_test
     # shellcheck disable=2154
     run blank "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
 
@@ -13,13 +14,6 @@ test_audit() {
     # Finally assess that your corrective actions end up with a compliant system
     describe Checking resolved state
     register_test retvalshouldbe 0
+    register_test contain "Time synchronization is available through"
     run resolved "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
-
-    describe Break things
-    apt-get update
-    apt-get install -y chrony
-
-    describe Checking broken state
-    register_test retvalshouldbe 1
-    run broken "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
 }