diff options
| author | mboelen <michael@cisofy.com> | 2016-04-15 21:07:20 +0300 |
|---|---|---|
| committer | mboelen <michael@cisofy.com> | 2016-04-15 21:07:20 +0300 |
| commit | 1205511c9dd98bdf799d3f536cf54f6705e761f5 (patch) | |
| tree | 48dfa073af8968bbafe621e65b2702f88f415d98 /include | |
| parent | e86f0522bf261f4311b82dd73ab7f56d33d50ccf (diff) | |
Change of variables for IDS/IPS and layout changes
Diffstat (limited to 'include')
| -rw-r--r-- | include/consts | 1 | ||||
| -rw-r--r-- | include/report | 14 | ||||
| -rw-r--r-- | include/tests_tooling | 16 |
3 files changed, 18 insertions, 13 deletions
diff --git a/include/consts b/include/consts index 2df132c8..5ff585e1 100644 --- a/include/consts +++ b/include/consts @@ -87,6 +87,7 @@ unset LANG HAS_SYSTEMD=0 HELPER="" HOSTID="" + IDS_IPS_TOOL_FOUND=0 IPTABLESBINARY="" LINUX_VERSION="" LINUXCONFIGFILE="" diff --git a/include/report b/include/report index 34c7f81f..3ff786d9 100644 --- a/include/report +++ b/include/report @@ -169,11 +169,15 @@ echo " ${CYAN}Tests performed${NORMAL} : ${WHITE}${CTESTS_PERFORMED}${NORMAL}" echo " ${CYAN}Plugins enabled${NORMAL} : ${WHITE}${N_PLUGIN_ENABLED}${NORMAL}" echo "" - echo " ${WHITE}Quick overview${NORMAL}:" + echo " ${WHITE}Components${NORMAL}:" if [ ${FIREWALL_ACTIVE} -eq 1 ]; then FIREWALL="${GREEN}V"; else FIREWALL="${RED}X"; fi if [ ${MALWARE_SCANNER_INSTALLED} -eq 1 ]; then MALWARE="${GREEN}V"; else MALWARE="${RED}X"; fi + if [ ${IDS_IPS_TOOL_FOUND} -eq 1 ]; then IDSIPS="${GREEN}V"; else IDSIPS="${RED}X"; fi - echo " - Firewall [${FIREWALL}${NORMAL}] - Malware scanner [${MALWARE}${NORMAL}]" + echo " - Firewall [${FIREWALL}${NORMAL}]" + #echo " - Integrity monitoring [${IDSIPS}${NORMAL}]"" + #echo " - Intrusion software [${IDSIPS}${NORMAL}]" + echo " - Malware scanner [${MALWARE}${NORMAL}]" echo "" echo " ${SECTION}Lynis Modules${NORMAL}:" @@ -181,9 +185,9 @@ if [ ${COMPLIANCE_FINDINGS_FOUND} -eq 0 ]; then COMPLIANCE="${GREEN}V"; else COMPLIANCE="${RED}X"; fi else COMPLIANCE="${YELLOW}?"; fi - echo " - Compliance Status [${COMPLIANCE}${NORMAL}]" - echo " - Security Audit [${GREEN}V${NORMAL}]" - echo " - Vulnerability Scan [${GREEN}V${NORMAL}]" + echo " - Compliance Status [${COMPLIANCE}${NORMAL}]" + echo " - Security Audit [${GREEN}V${NORMAL}]" + echo " - Vulnerability Scan [${GREEN}V${NORMAL}]" echo "" echo " ${SECTION}Files${NORMAL}:" echo " - Test and debug information : ${WHITE}${LOGFILE}${NORMAL}" diff --git a/include/tests_tooling b/include/tests_tooling index 1c3d6a9a..407460cb 100644 --- a/include/tests_tooling +++ b/include/tests_tooling @@ -161,13 +161,13 @@ # Fail2ban presence if [ ! "${FAIL2BANBINARY}" = "" ]; then LogText "Result: Fail2ban is installed (${FAIL2BANBINARY})" - IPS_TOOL_FOUND=1 + IDS_IPS_TOOL_FOUND=1 + report "ids_ips_tooling[]=fail2ban" FAIL2BAN_FOUND=1 Report "IPS_tool_running[]=fail2ban-server" Display --indent 2 --text "- Checking presence of Fail2ban" --result FOUND --color GREEN else LogText "Result: Fail2ban not present (fail2ban-server not found)" - Display --indent 2 --text "- Checking presence of Fail2ban" --result "NOT FOUND" --color WHITE fi # Fail2ban configuration @@ -268,16 +268,16 @@ ################################################################################# # # Test : TOOL-5190 - # Description : Check for an IPS tool - Register --test-no TOOL-5014 --weight L --network NO --description "Check presence of IPS tool" + # Description : Check for an IDS/IPS tool + Register --test-no TOOL-5014 --weight L --network NO --description "Check presence of IDS/IPS tool" if [ ${SKIPTEST} -eq 0 ]; then - if [ ${IPS_TOOL_FOUND} -eq 1 ]; then - Display --indent 2 --text "- Checking for implemented IPS" --result FOUND --color GREEN + if [ ${IDS_IPS_TOOL_FOUND} -eq 1 ]; then + Display --indent 2 --text "- Checking for intrusion detection/prevention system" --result FOUND --color GREEN AddHP 2 2 else - Display --indent 2 --text "- Checking for implemented IPS" --result NONE --color YELLOW - #ReportSuggestion ${TEST_NO} "Ensure that automatic intrusion prevention tools are installed" + Display --indent 2 --text "- Checking for intrusion detection/prevention system" --result NONE --color YELLOW + #ReportSuggestion ${TEST_NO} "Ensure that automatic intrusion detection/prevention tools are installed" AddHP 0 2 fi fi |