[bulk change] cleaning up, code enhancements, initialization of variables, and new tests

1 files changed, 55 insertions, 63 deletions

diff --git a/include/report b/include/report
index 80bacfe5..b5f7522d 100644
--- a/include/report
+++ b/include/report
@@ -22,64 +22,55 @@
 #
 #################################################################################
 #
-
-    #
-    #################################################################################
-    #
     # Hardening Index
     # Define approximately how strong a machine has been hardened
-    #
-    #################################################################################
-    #
-            # If no hardening has been found, set value to 1
-            if [ ${HPPOINTS} -eq 0 ]; then HPPOINTS=1; HPTOTAL=100; fi
-            HPINDEX=$((HPPOINTS * 100 / HPTOTAL))
-            HPAOBLOCKS=$((HPPOINTS * 20 / HPTOTAL))
-            # Set color related to rating
-            if [ ${HPINDEX} -lt 50 ]; then
-                HPCOLOR="${RED}"
-                HIDESCRIPTION="System has not or a low amount been hardened"
-            fi
-            if [ ${HPINDEX} -gt 49 -a ${HPINDEX} -lt 80 ]; then
-                HPCOLOR="${YELLOW}"
-                HIDESCRIPTION="System has been hardened, but could use additional hardening"
-            fi
-            if [ ${HPINDEX} -gt 79 -a ${HPINDEX} -lt 90 ]; then
-                HPCOLOR="${GREEN}"
-                HIDESCRIPTION="System seem to be decent hardened"
-            fi
-            if [ ${HPINDEX} -gt 89 ]; then
-                HPCOLOR="${GREEN}"
-                HIDESCRIPTION="System seem to be well hardened"
-            fi
 
-            case ${HPAOBLOCKS} in
-                0)  HPBLOCKS="#"; HPEMPTY="                   " ;;
-                1)  HPBLOCKS="#"; HPEMPTY="                   " ;;
-                2)  HPBLOCKS="##"; HPEMPTY="                  " ;;
-                3)  HPBLOCKS="###"; HPEMPTY="                 " ;;
-                4)  HPBLOCKS="####"; HPEMPTY="                " ;;
-                5)  HPBLOCKS="#####"; HPEMPTY="               " ;;
-                6)  HPBLOCKS="######"; HPEMPTY="              " ;;
-                7)  HPBLOCKS="#######"; HPEMPTY="             " ;;
-                8)  HPBLOCKS="########"; HPEMPTY="            " ;;
-                9)  HPBLOCKS="#########"; HPEMPTY="           " ;;
-                10) HPBLOCKS="##########"; HPEMPTY="          " ;;
-                11) HPBLOCKS="###########"; HPEMPTY="         " ;;
-                12) HPBLOCKS="############"; HPEMPTY="        " ;;
-                13) HPBLOCKS="#############"; HPEMPTY="       " ;;
-                14) HPBLOCKS="##############"; HPEMPTY="      " ;;
-                15) HPBLOCKS="###############"; HPEMPTY="     " ;;
-                16) HPBLOCKS="################"; HPEMPTY="    " ;;
-                17) HPBLOCKS="#################"; HPEMPTY="   " ;;
-                18) HPBLOCKS="##################"; HPEMPTY="  " ;;
-                19) HPBLOCKS="###################"; HPEMPTY=" " ;;
-                20) HPBLOCKS="####################"; HPEMPTY="" ;;
-            esac
+        # If no hardening has been found, set value to 1
+        if [ ${HPPOINTS} -eq 0 ]; then HPPOINTS=1; HPTOTAL=100; fi
+        HPINDEX=$((HPPOINTS * 100 / HPTOTAL))
+        HPAOBLOCKS=$((HPPOINTS * 20 / HPTOTAL))
+        # Set color related to rating
+        if [ ${HPINDEX} -lt 50 ]; then
+            HPCOLOR="${RED}"
+            HIDESCRIPTION="System has not or a low amount been hardened"
+        elif [ ${HPINDEX} -gt 49 -a ${HPINDEX} -lt 80 ]; then
+            HPCOLOR="${YELLOW}"
+            HIDESCRIPTION="System has been hardened, but could use additional hardening"
+        elif [ ${HPINDEX} -gt 79 -a ${HPINDEX} -lt 90 ]; then
+            HPCOLOR="${GREEN}"
+            HIDESCRIPTION="System seem to be decent hardened"
+        elif [ ${HPINDEX} -gt 89 ]; then
+            HPCOLOR="${GREEN}"
+            HIDESCRIPTION="System seem to be well hardened"
+        fi
+
+        case ${HPAOBLOCKS} in
+            0)  HPBLOCKS="#"; HPEMPTY="                   " ;;
+            1)  HPBLOCKS="#"; HPEMPTY="                   " ;;
+            2)  HPBLOCKS="##"; HPEMPTY="                  " ;;
+            3)  HPBLOCKS="###"; HPEMPTY="                 " ;;
+            4)  HPBLOCKS="####"; HPEMPTY="                " ;;
+            5)  HPBLOCKS="#####"; HPEMPTY="               " ;;
+            6)  HPBLOCKS="######"; HPEMPTY="              " ;;
+            7)  HPBLOCKS="#######"; HPEMPTY="             " ;;
+            8)  HPBLOCKS="########"; HPEMPTY="            " ;;
+            9)  HPBLOCKS="#########"; HPEMPTY="           " ;;
+            10) HPBLOCKS="##########"; HPEMPTY="          " ;;
+            11) HPBLOCKS="###########"; HPEMPTY="         " ;;
+            12) HPBLOCKS="############"; HPEMPTY="        " ;;
+            13) HPBLOCKS="#############"; HPEMPTY="       " ;;
+            14) HPBLOCKS="##############"; HPEMPTY="      " ;;
+            15) HPBLOCKS="###############"; HPEMPTY="     " ;;
+            16) HPBLOCKS="################"; HPEMPTY="    " ;;
+            17) HPBLOCKS="#################"; HPEMPTY="   " ;;
+            18) HPBLOCKS="##################"; HPEMPTY="  " ;;
+            19) HPBLOCKS="###################"; HPEMPTY=" " ;;
+            20) HPBLOCKS="####################"; HPEMPTY="" ;;
+        esac
 
-            HPGRAPH="[${HPCOLOR}${HPBLOCKS}${NORMAL}${HPEMPTY}]"
-            LogText "Hardening index : [${HPINDEX}] [${HPBLOCKS}${HPEMPTY}]"
-            LogText "Hardening strength: ${HIDESCRIPTION}"
+        HPGRAPH="[${HPCOLOR}${HPBLOCKS}${NORMAL}${HPEMPTY}]"
+        LogText "Hardening index : [${HPINDEX}] [${HPBLOCKS}${HPEMPTY}]"
+        LogText "Hardening strength: ${HIDESCRIPTION}"
 
 
     # Only show overview if not running in quiet mode
@@ -111,7 +102,7 @@
             SWARNINGS=$(${GREPBINARY} -i 'warning:' ${LOGFILE} | sed 's/ /!space!/g')
             if [ -z "${SWARNINGS}" ]; then
                 echo "  ${OK}Great, no warnings${NORMAL}"; echo ""
-              else
+            else
                 echo "  ${WARNING}Warnings${NORMAL} (${TOTAL_WARNINGS}):"
                 echo "  ${WHITE}----------------------------${NORMAL}"
                 for WARNING in ${SWARNINGS}; do
@@ -132,7 +123,7 @@
                     if [ ${SHOW_REPORT_SOLUTION} -eq 1 -a ! "${SOLUTION}" = "-" ]; then echo "    - Solution : ${SOLUTION}"; fi
                     if [ -z "${IS_CUSTOM}" ]; then
                         echo "      ${CONTROL_URL_PROTOCOL}://${CONTROL_URL_PREPEND}${ADDLINK}${CONTROL_URL_APPEND}"
-                      else
+                    else
                         echo "      ${CUSTOM_URL_PROTOCOL}://${CUSTOM_URL_PREPEND}${ADDLINK}${CUSTOM_URL_APPEND}"
                     fi
                     echo ""
@@ -144,7 +135,7 @@
 
             if [ "${SSUGGESTIONS}" = "" ]; then
                 echo "  ${OK}No suggestions${NORMAL}"; echo ""
-              else
+            else
                 echo "  ${YELLOW}Suggestions${NORMAL} (${TOTAL_SUGGESTIONS}):"
                 echo "  ${WHITE}----------------------------${NORMAL}"
                 for SUGGESTION in ${SSUGGESTIONS}; do
@@ -165,7 +156,7 @@
                     if [ ${SHOW_REPORT_SOLUTION} -eq 1 -a ! "${SOLUTION}" = "-" ]; then echo "    - Solution : ${SOLUTION}"; fi
                     if [ -z "${IS_CUSTOM}" ]; then
                         echo "      ${GRAY}${CONTROL_URL_PROTOCOL}://${CONTROL_URL_PREPEND}${ADDLINK}${CONTROL_URL_APPEND}${NORMAL}"
-                      else
+                    else
                         echo "      ${GRAY}${CUSTOM_URL_PROTOCOL}://${CUSTOM_URL_PREPEND}${ADDLINK}${CUSTOM_URL_APPEND}${NORMAL}"
                     fi
                     echo ""
@@ -203,7 +194,8 @@
             echo "  ${SECTION}Lynis Modules${NORMAL}:"
             if [ ${COMPLIANCE_TESTS_PERFORMED} -eq 1 ]; then
                 if [ ${COMPLIANCE_FINDINGS_FOUND} -eq 0 ]; then COMPLIANCE="${GREEN}V"; else COMPLIANCE="${RED}X"; fi
-              else COMPLIANCE="${YELLOW}?";
+            else
+                COMPLIANCE="${YELLOW}?"
             fi
             echo "  - Compliance Status      [${COMPLIANCE}${NORMAL}]"
             echo "  - Security Audit         [${GREEN}V${NORMAL}]"
@@ -218,7 +210,7 @@
                 echo "  ${NOTICE}Notice: ${WHITE}${PROGRAM_NAME} ${GEN_UPDATE_AVAILABLE}${NORMAL}"
                 echo "  ${GEN_CURRENT_VERSION} : ${WHITE}${PROGRAM_AC}${NORMAL}    ${GEN_LATEST_VERSION} : ${WHITE}${PROGRAM_LV}${NORMAL}"
                 echo "================================================================================"
-              else
+            else
                 ###########################################################################################
                 #
                 # Software quality program
@@ -252,9 +244,9 @@
                 # Split entries
                 FIND=$(echo ${FIND} | sed 's/====/ /g')
                 # Display found entries
-                for I in ${FIND}; do
-                    J=$(echo ${I} | sed 's/:space:/ /g')
-                    echo "    ${J}"
+                for ITEM in ${FIND}; do
+                    OUTPUT=$(echo ${ITEM} | sed 's/:space:/ /g')
+                    echo "    ${OUTPUT}"
                 done
                 echo ""
                 echo "================================================================================"