From adc57330f6591d905a0216c80725692fa6b38eaa Mon Sep 17 00:00:00 2001 From: Alexander Lobodzinski Date: Mon, 21 Sep 2015 13:04:44 +0200 Subject: [PATCH 1/2] Bugfix: nginx SSL detection worked on Linux only (only GNU sed understands \t on the command line) --- include/tests_webservers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_webservers b/include/tests_webservers index cfe6dcce..2cfd10ed 100644 --- a/include/tests_webservers +++ b/include/tests_webservers @@ -422,7 +422,7 @@ # Remove temp file if [ ! "${TMPFILE}" = "" ]; then if [ -f ${TMPFILE} ]; then rm -f ${TMPFILE}; fi; fi N=0 - cat ${NGINX_CONF_LOCATION} | sed -e 's/^[ \t]*//' | grep -v "^#" | grep -v "^$" | sed 's/[\t]/ /g' | sed 's/ / /g' | sed 's/ / /g' >> ${TMPFILE} + cat ${NGINX_CONF_LOCATION} | sed -e 's/^[ ]*//' | grep -v "^#" | grep -v "^$" | sed 's/[ ]/ /g' | sed 's/ / /g' | sed 's/ / /g' >> ${TMPFILE} # Search for included configuration files (may include directories and wild cards) FIND=`grep "include" ${NGINX_CONF_LOCATION} | ${AWKBINARY} '{ if ($1=="include") { print $2 }}' | sed 's/;$//g'` for I in ${FIND}; do @@ -435,7 +435,7 @@ report "nginx_sub_conf_file=${J}" FileIsReadable ${J} if [ ${CANREAD} -eq 1 ]; then - FIND3=`cat ${J} | sed -e 's/^[ \t]*//' | grep -v "^#" | grep -v "^$" | sed 's/[\t]/ /g' | sed 's/ / /g' | sed 's/ / /g' >> ${TMPFILE}` + FIND3=`cat ${J} | sed -e 's/^[ ]*//' | grep -v "^#" | grep -v "^$" | sed 's/[ ]/ /g' | sed 's/ / /g' | sed 's/ / /g' >> ${TMPFILE}` else ReportException "${TEST_NO}:1" "Can not parse file ${J}, as it is not readable" fi From d80bf2f437bb64a112540eb20d58c8db2c3b632b Mon Sep 17 00:00:00 2001 From: Alexander Lobodzinski Date: Tue, 22 Sep 2015 12:00:44 +0200 Subject: [PATCH 2/2] Bugfix: wrong logtext for HRDN-7230 --- include/tests_hardening | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tests_hardening b/include/tests_hardening index 713264b9..69cca70c 100644 --- a/include/tests_hardening +++ b/include/tests_hardening @@ -96,7 +96,7 @@ # Description : Check for installed malware scanners Register --test-no HRDN-7230 --weight L --network NO --description "Check for malware scanner" if [ ${SKIPTEST} -eq 0 ]; then - logtext "Test: Check if one or more compilers can be found on the system" + logtext "Test: Check if a malware scanner is installed" if [ ${MALWARE_SCANNER_INSTALLED} -eq 1 ]; then logtext "Result: found at least one malware scanner" Display --indent 4 --text "- Installed malware scanner" --result "FOUND" --color GREEN