Fix some bugs for CentOS8

bin/hardening/7.7.2_ensure_set_firewall_rules.sh

@@ -27,7 +27,7 @@ audit () {
         crit "Iptables/Ip6tables is not set rule!"
         FNRET=1
     else
-        ok "Ip4tables rules are set!"
+        ok "Iptables/Ip6tables rules are set!"
         FNRET=0
     fi
 }

bin/hardening/8.1.1.5_ensure_set_remote_server.sh

@@ -49,7 +49,7 @@ apply () {
         ok "$PATTERN is present in $FILE"
     elif [ $FNRET = 1 ]; then
         warn "$PACKAGE is not installed, need install."
-        apt_install $PACKAGE
+        install_package $PACKAGE
     elif [ $FNRET = 2 ]; then
         warn "$FILE is not exist, please manual check."
     elif [ $FNRET = 3 ]; then

bin/hardening/8.1.1.6_ensure_set_encrypt_for_audit_remote.sh

@@ -56,7 +56,7 @@ apply () {
         ok "$PATTERN is present in $FILE"
     elif [ $FNRET = 1 ]; then
         warn "$PACKAGE is not installed, need install."
-        apt_install $PACKAGE
+        install_package $PACKAGE
     elif [ $FNRET = 2 ]; then
         warn "$FILE is not exist, please manual check."
     elif [ $FNRET = 3 ]; then

bin/hardening/8.1.1.7_ensure_set_action_for_audit_storage_full.sh

@@ -56,7 +56,7 @@ apply () {
         ok "$PATTERN is present in $FILE"
     elif [ $FNRET = 1 ]; then
         warn "$PACKAGE is not installed, need install."
-        apt_install $PACKAGE
+        install_package $PACKAGE
     elif [ $FNRET = 2 ]; then
         warn "$FILE is not exist, please manual check."
     elif [ $FNRET = 3 ]; then

bin/hardening/8.1.1.8_ensure_set_action_for_net_fail.sh

@@ -56,7 +56,7 @@ apply () {
         ok "$PATTERN is present in $FILE"
     elif [ $FNRET = 1 ]; then
         warn "$PACKAGE is not installed, need install."
-        apt_install $PACKAGE
+        install_package $PACKAGE
     elif [ $FNRET = 2 ]; then
         warn "$FILE is not exist, please manual check."
     elif [ $FNRET = 3 ]; then

bin/hardening/8.1.3_audit_bootloader.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# harbian audit 7/8/9  Hardening
+# harbian audit 7/8/9 or CentOS8 Hardening
 # Modify author:
 # Samson-W (sccxboy@gmail.com)
 #
@@ -55,11 +55,19 @@ apply () {
     elif [ $FNRET = 2 ]; then
         warn "$OPTION is not present in $FILE, add it to $KEYWORD line, need to reboot the system  after setting it"
         sed -i "s;\(${KEYWORD}=\)\(\".*\)\(\"\);\1\2 ${OPTION}=${SETVAL}\3;" $FILE
-        /usr/sbin/update-grub2 
+		if [ OS_RELEASE -eq 1 ]; then
+        	usr/sbin/update-grub2 
+		elif [ OS_RELEASE -eq 2 ]; then
+			grub2-mkconfig –o /boot/grub2/grub.cfg
+		fi
     elif [ $FNRET = 3 ]; then
         warn "Parameter $OPTION is present but with the wrong value -- Fixing, need to reboot the system after setting it"
         sed -i "s/${OPTION}=./${OPTION}=${SETVAL}/" $FILE 
-        /usr/sbin/update-grub2
+		if [ OS_RELEASE -eq 1 ]; then
+        	usr/sbin/update-grub2 
+		elif [ OS_RELEASE -eq 2 ]; then
+			grub2-mkconfig –o /boot/grub2/grub.cfg
+		fi
     fi
 }
 

lib/utils.sh

@@ -565,6 +565,20 @@ yum_install()
     FNRET=0
 }
 
+install_package()
+{
+	if [ $OS_RELEASE -eq 1 ]; then
+		local PACKAGE=$1
+		apt_install $PACKAGE
+	elif [ $OS_RELEASE -eq 2 ]; then
+		local PACKAGE=$1
+		yum_install $PACKAGE
+	else
+		warn "Current OS is not support!"
+	fi
+    FNRET=0
+}
+
 #
 #   Returns if a package is installed
 #