From f535548d0b02b8cea1ae0172c3747d1e31c8a6db Mon Sep 17 00:00:00 2001
From: "thibault.dewailly" <thibault.dewailly@ovh.net>
Date: Tue, 5 Apr 2016 09:29:09 +0200
Subject: [PATCH] 2.8_var_log_audit_partition.sh 2.9_home_partition.sh

---
 bin/hardening/2.8_var_log_audit_partition.sh | 69 ++++++++++++++++++++
 bin/hardening/2.9_home_partition.sh          | 69 ++++++++++++++++++++
 etc/conf.d/2.7_var_log_partition.cfg         |  2 +-
 etc/conf.d/2.8_var_log_audit_partition.cfg   |  2 +
 etc/conf.d/2.9_home_partition.cfg            |  2 +
 5 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100755 bin/hardening/2.8_var_log_audit_partition.sh
 create mode 100755 bin/hardening/2.9_home_partition.sh
 create mode 100644 etc/conf.d/2.8_var_log_audit_partition.cfg
 create mode 100644 etc/conf.d/2.9_home_partition.cfg

diff --git a/bin/hardening/2.8_var_log_audit_partition.sh b/bin/hardening/2.8_var_log_audit_partition.sh
new file mode 100755
index 0000000..9c7bf92
--- /dev/null
+++ b/bin/hardening/2.8_var_log_audit_partition.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+#
+# CIS Debian 7 Hardening
+#
+
+#
+# 2.8 Create Separate Partition for /var/log/audit (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/audit"
+
+# 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/bin/hardening/2.9_home_partition.sh b/bin/hardening/2.9_home_partition.sh
new file mode 100755
index 0000000..2fe6fd1
--- /dev/null
+++ b/bin/hardening/2.9_home_partition.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+#
+# CIS Debian 7 Hardening
+#
+
+#
+# 2.8 Create Separate Partition for /var/log/audit (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="/home"
+
+# 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.7_var_log_partition.cfg b/etc/conf.d/2.7_var_log_partition.cfg
index e1e4502..acee522 100644
--- a/etc/conf.d/2.7_var_log_partition.cfg
+++ b/etc/conf.d/2.7_var_log_partition.cfg
@@ -1,2 +1,2 @@
 # Configuration for script of same name
-status=enabled
+status=disabled
diff --git a/etc/conf.d/2.8_var_log_audit_partition.cfg b/etc/conf.d/2.8_var_log_audit_partition.cfg
new file mode 100644
index 0000000..acee522
--- /dev/null
+++ b/etc/conf.d/2.8_var_log_audit_partition.cfg
@@ -0,0 +1,2 @@
+# Configuration for script of same name
+status=disabled
diff --git a/etc/conf.d/2.9_home_partition.cfg b/etc/conf.d/2.9_home_partition.cfg
new file mode 100644
index 0000000..acee522
--- /dev/null
+++ b/etc/conf.d/2.9_home_partition.cfg
@@ -0,0 +1,2 @@
+# Configuration for script of same name
+status=disabled