From 65f92a75562591f46b1600937be6c36277e0aeec Mon Sep 17 00:00:00 2001
From: Charles Herlin <charles.herlin@corp.ovh.com>
Date: Wed, 11 Sep 2019 11:52:24 +0200
Subject: [PATCH] Renum 8.2.x to 4.2.2.x for syslog-ng

	renamed:    bin/hardening/8.2.2_enable_syslog-ng.sh -> bin/hardening/4.2.2.1_enable_syslog-ng.sh
	renamed:    bin/hardening/8.2.3_configure_syslog-ng.sh -> bin/hardening/4.2.2.2_configure_syslog-ng.sh
	new file:   bin/hardening/4.2.2.3_syslog_ng_logfiles_perm.sh
	renamed:    bin/hardening/8.2.5_syslog-ng_remote_host.sh -> bin/hardening/4.2.2.4_syslog-ng_remote_host.sh
	renamed:    bin/hardening/8.2.6_remote_syslog-ng_acl.sh -> bin/hardening/4.2.2.5_remote_syslog-ng_acl.sh
	renamed:    tests/hardening/8.2.6_remote_syslog-ng_acl.sh -> tests/hardening/4.2.2.1_enable_syslog-ng.sh
	renamed:    tests/hardening/8.2.3_configure_syslog-ng.sh -> tests/hardening/4.2.2.2_configure_syslog-ng.sh
	renamed:    tests/hardening/8.2.2_enable_syslog-ng.sh -> tests/hardening/4.2.2.3_syslog_ng_logfiles_perm.sh
	renamed:    tests/hardening/8.2.5_syslog-ng_remote_host.sh -> tests/hardening/4.2.2.4_syslog-ng_remote_host.sh
	new file:   tests/hardening/4.2.2.5_remote_syslog-ng_acl.sh
---
 ...slog-ng.sh => 4.2.2.1_enable_syslog-ng.sh} |  2 +-
 ...g-ng.sh => 4.2.2.2_configure_syslog-ng.sh} |  2 +-
 .../4.2.2.3_syslog_ng_logfiles_perm.sh        | 83 +++++++++++++++++++
 ...st.sh => 4.2.2.4_syslog-ng_remote_host.sh} |  2 +-
 ...acl.sh => 4.2.2.5_remote_syslog-ng_acl.sh} |  2 +-
 ...slog-ng.sh => 4.2.2.1_enable_syslog-ng.sh} |  0
 ...g-ng.sh => 4.2.2.2_configure_syslog-ng.sh} |  0
 ....sh => 4.2.2.3_syslog_ng_logfiles_perm.sh} |  0
 ...st.sh => 4.2.2.4_syslog-ng_remote_host.sh} |  0
 .../hardening/4.2.2.5_remote_syslog-ng_acl.sh | 10 +++
 10 files changed, 97 insertions(+), 4 deletions(-)
 rename bin/hardening/{8.2.2_enable_syslog-ng.sh => 4.2.2.1_enable_syslog-ng.sh} (96%)
 rename bin/hardening/{8.2.3_configure_syslog-ng.sh => 4.2.2.2_configure_syslog-ng.sh} (95%)
 create mode 100755 bin/hardening/4.2.2.3_syslog_ng_logfiles_perm.sh
 rename bin/hardening/{8.2.5_syslog-ng_remote_host.sh => 4.2.2.4_syslog-ng_remote_host.sh} (96%)
 rename bin/hardening/{8.2.6_remote_syslog-ng_acl.sh => 4.2.2.5_remote_syslog-ng_acl.sh} (93%)
 rename tests/hardening/{8.2.2_enable_syslog-ng.sh => 4.2.2.1_enable_syslog-ng.sh} (100%)
 rename tests/hardening/{8.2.3_configure_syslog-ng.sh => 4.2.2.2_configure_syslog-ng.sh} (100%)
 rename tests/hardening/{8.2.6_remote_syslog-ng_acl.sh => 4.2.2.3_syslog_ng_logfiles_perm.sh} (100%)
 rename tests/hardening/{8.2.5_syslog-ng_remote_host.sh => 4.2.2.4_syslog-ng_remote_host.sh} (100%)
 create mode 100644 tests/hardening/4.2.2.5_remote_syslog-ng_acl.sh

diff --git a/bin/hardening/8.2.2_enable_syslog-ng.sh b/bin/hardening/4.2.2.1_enable_syslog-ng.sh
similarity index 96%
rename from bin/hardening/8.2.2_enable_syslog-ng.sh
rename to bin/hardening/4.2.2.1_enable_syslog-ng.sh
index 9bb7f6d..54f1e2e 100755
--- a/bin/hardening/8.2.2_enable_syslog-ng.sh
+++ b/bin/hardening/4.2.2.1_enable_syslog-ng.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# 8.2.2 Ensure the syslog-ng Service is activated (Scored)
+# 4.2.2.1 Ensure syslog-ng service is enabled (Scored)
 #
 
 set -e # One error, it's over
diff --git a/bin/hardening/8.2.3_configure_syslog-ng.sh b/bin/hardening/4.2.2.2_configure_syslog-ng.sh
similarity index 95%
rename from bin/hardening/8.2.3_configure_syslog-ng.sh
rename to bin/hardening/4.2.2.2_configure_syslog-ng.sh
index fc83f3a..9b5ba82 100755
--- a/bin/hardening/8.2.3_configure_syslog-ng.sh
+++ b/bin/hardening/4.2.2.2_configure_syslog-ng.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# 8.2.3 Configure /etc/syslog-ng/syslog-ng.conf (Not Scored)
+# 4.2.2.2 Configure /etc/syslog-ng/syslog-ng.conf (Not Scored)
 #
 
 set -e # One error, it's over
diff --git a/bin/hardening/4.2.2.3_syslog_ng_logfiles_perm.sh b/bin/hardening/4.2.2.3_syslog_ng_logfiles_perm.sh
new file mode 100755
index 0000000..05eb25d
--- /dev/null
+++ b/bin/hardening/4.2.2.3_syslog_ng_logfiles_perm.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+#
+# CIS Debian Hardening
+#
+
+#
+# 4.2.2.3 Ensure syslog-ng default file permissions configured (Scored)
+#
+
+set -e # One error, it's over
+set -u # One variable unset, it's over
+
+HARDENING_LEVEL=3
+DESCRIPTION="Ensure logfile are created with root:640"
+
+PATTERN='options[[:space:]]*{[[:alnum:] ()_;"\t]*perm\(0640\);'
+
+# This function will be called if the script status is on enabled / audit mode
+audit () {
+    FOUND=0
+    FILES="$SYSLOG_BASEDIR/syslog-ng.conf $($SUDO_CMD find -L $SYSLOG_BASEDIR/conf.d/ -type f)"
+    for FILE in $FILES; do
+       does_pattern_exist_in_file_multiline "$FILE" "$PATTERN"
+        if [ $FNRET = 0 ]; then
+            FOUND=1
+        fi
+    done
+
+    if [ $FOUND = 1 ]; then
+        ok "$PATTERN is present in $FILES"
+    else
+        crit "$PATTERN is not present in $FILES"
+    fi
+}
+
+# This function will be called if the script status is on enabled mode
+apply () {
+    FOUND=0
+    FILES="$SYSLOG_BASEDIR/syslog-ng.conf $(find -L $SYSLOG_BASEDIR/conf.d/ -type f)"
+    for FILE in $FILES; do
+       does_pattern_exist_in_file_multiline "$FILE" "$PATTERN"
+        if [ $FNRET = 0 ]; then
+            FOUND=1
+        fi
+    done
+    if [ $FOUND = 1 ]; then
+        ok "$PATTERN is present in $FILES"
+    else
+        crit "$PATTERN is not present in $FILES, please set a remote host to send your logs"
+    fi
+}
+
+# This function will create the config file for this check with default values
+create_config() {
+    cat <<EOF
+status=audit
+SYSLOG_BASEDIR='/etc/syslog-ng'
+EOF
+}
+
+# This function will check config parameters required
+check_config() {
+    :
+}
+
+# Source Root Dir Parameter
+if [ -r /etc/default/cis-hardening ]; then
+    . /etc/default/cis-hardening
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
+    exit 128
+fi
+
+# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi
diff --git a/bin/hardening/8.2.5_syslog-ng_remote_host.sh b/bin/hardening/4.2.2.4_syslog-ng_remote_host.sh
similarity index 96%
rename from bin/hardening/8.2.5_syslog-ng_remote_host.sh
rename to bin/hardening/4.2.2.4_syslog-ng_remote_host.sh
index f623c76..629ba69 100755
--- a/bin/hardening/8.2.5_syslog-ng_remote_host.sh
+++ b/bin/hardening/4.2.2.4_syslog-ng_remote_host.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# 8.2.5 Configure rsyslog to Send Logs to a Remote Log Host (Scored)
+# 4.2.2.4 Ensure syslog-ng is configured to send logs to a remote log host (Not Scored)
 #
 
 set -e # One error, it's over
diff --git a/bin/hardening/8.2.6_remote_syslog-ng_acl.sh b/bin/hardening/4.2.2.5_remote_syslog-ng_acl.sh
similarity index 93%
rename from bin/hardening/8.2.6_remote_syslog-ng_acl.sh
rename to bin/hardening/4.2.2.5_remote_syslog-ng_acl.sh
index 7bb289c..caefde6 100755
--- a/bin/hardening/8.2.6_remote_syslog-ng_acl.sh
+++ b/bin/hardening/4.2.2.5_remote_syslog-ng_acl.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# 8.2.6 Accept Remote rsyslog Messages Only on Designated Log Hosts (Not Scored)
+# 4.2.2.5 Accept Remote rsyslog Messages Only on Designated Log Hosts (Not Scored)
 #
 
 set -e # One error, it's over
diff --git a/tests/hardening/8.2.2_enable_syslog-ng.sh b/tests/hardening/4.2.2.1_enable_syslog-ng.sh
similarity index 100%
rename from tests/hardening/8.2.2_enable_syslog-ng.sh
rename to tests/hardening/4.2.2.1_enable_syslog-ng.sh
diff --git a/tests/hardening/8.2.3_configure_syslog-ng.sh b/tests/hardening/4.2.2.2_configure_syslog-ng.sh
similarity index 100%
rename from tests/hardening/8.2.3_configure_syslog-ng.sh
rename to tests/hardening/4.2.2.2_configure_syslog-ng.sh
diff --git a/tests/hardening/8.2.6_remote_syslog-ng_acl.sh b/tests/hardening/4.2.2.3_syslog_ng_logfiles_perm.sh
similarity index 100%
rename from tests/hardening/8.2.6_remote_syslog-ng_acl.sh
rename to tests/hardening/4.2.2.3_syslog_ng_logfiles_perm.sh
diff --git a/tests/hardening/8.2.5_syslog-ng_remote_host.sh b/tests/hardening/4.2.2.4_syslog-ng_remote_host.sh
similarity index 100%
rename from tests/hardening/8.2.5_syslog-ng_remote_host.sh
rename to tests/hardening/4.2.2.4_syslog-ng_remote_host.sh
diff --git a/tests/hardening/4.2.2.5_remote_syslog-ng_acl.sh b/tests/hardening/4.2.2.5_remote_syslog-ng_acl.sh
new file mode 100644
index 0000000..b333419
--- /dev/null
+++ b/tests/hardening/4.2.2.5_remote_syslog-ng_acl.sh
@@ -0,0 +1,10 @@
+# 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
+}