diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2017-04-23 21:06:54 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2017-04-23 21:06:54 +0300 |
| commit | 70ea29483a5fcb82ddc89d656227194560b502f2 (patch) | |
| tree | d90db794f0ae7419b81e2b466ec017565ca176eb /include/tests_tooling | |
| parent | 9e9b95e1daf9d64d7753d37b48e88697b297fa36 (diff) | |
Code enhancements
Diffstat (limited to 'include/tests_tooling')
| -rw-r--r-- | include/tests_tooling | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/tests_tooling b/include/tests_tooling index 43cef10c..ef02c035 100644 --- a/include/tests_tooling +++ b/include/tests_tooling @@ -139,7 +139,7 @@ SALT_MASTER_RUNNING=1 Report "automation_tool_running[]=saltstack-minion" Display --indent 4 --text "Found: SaltStack master (salt-master)" --result "${STATUS_FOUND}" --color GREEN - else + else IsRunning "salt-master" if [ ${RUNNING} -eq 1 ]; then LogText "Result: found SaltStack (master)" @@ -152,7 +152,7 @@ if [ ${AUTOMATION_TOOL_FOUND} -eq 1 ]; then Display --indent 2 --text "- Automation tooling" --result "${STATUS_FOUND}" --color GREEN - else + else Display --indent 2 --text "- Automation tooling" --result "${STATUS_NOT_FOUND}" --color YELLOW ReportSuggestion ${TEST_NO} "Determine if automation tools are present for system management" fi @@ -176,7 +176,7 @@ LogText "Result: Fail2ban is installed (${FAIL2BANBINARY})" Report "ids_ips_tooling[]=fail2ban" Display --indent 2 --text "- Checking presence of Fail2ban" --result "${STATUS_FOUND}" --color GREEN - else + else LogText "Result: Fail2ban not present (fail2ban-server not found)" fi @@ -280,9 +280,9 @@ # # LogText "Checking for fail2ban iptables chains" # - # if [ ! "${IPTABLESBINARY}" = "" ]; then + # if [ ! -z "${IPTABLESBINARY}" ]; then # CHECK_CHAINS=$(${IPTABLESBINARY} -L 2>&1 | ${GREPBINARY} fail2ban) - # if [ ! "${CHECK_CHAINS}" = "" ]; then + # if [ ! -z "${CHECK_CHAINS}" ]; then # LogText "Result: found at least one iptables chain for fail2ban" # Display --indent 4 --text "- Checking for Fail2ban iptables chain" --result "${STATUS_OK}" --color GREEN # else @@ -308,7 +308,7 @@ if [ ${IDS_IPS_TOOL_FOUND} -eq 1 ]; then Display --indent 2 --text "- Checking for IDS/IPS tooling" --result "${STATUS_FOUND}" --color GREEN AddHP 2 2 - else + else Display --indent 2 --text "- Checking for IDS/IPS tooling" --result "${STATUS_NONE}" --color YELLOW #ReportSuggestion ${TEST_NO} "Install and configure automated intrusion detection/prevention tools" AddHP 0 2 |