Use detected binaries

1 files changed, 21 insertions, 21 deletions

diff --git a/include/tests_webservers b/include/tests_webservers
index 756ae297..72972bf9 100644
--- a/include/tests_webservers
+++ b/include/tests_webservers
@@ -61,7 +61,7 @@
             Display --indent 2 --text "- Checking Apache" --result "${STATUS_NOT_FOUND}" --color WHITE
           else
             LogText "Test: Scanning for Apache binary"
-            IS_APACHE=`${HTTPDBINARY} -v 2> /dev/null | egrep '[aA]pache'`
+            IS_APACHE=`${HTTPDBINARY} -v 2> /dev/null | ${EGREPBINARY} '[aA]pache'`
             if [ "${IS_APACHE}" = "" ]; then
                 LogText "Result: ${HTTPDBINARY} is not Apache"
                 Display --indent 2 --text "- Checking Apache (binary ${HTTPDBINARY})" --result "NO MATCH" --color WHITE
@@ -69,7 +69,7 @@
                 Display --indent 2 --text "- Checking Apache (binary ${HTTPDBINARY})" --result "${STATUS_FOUND}" --color GREEN
                 LogText "Result: ${HTTPDBINARY} seems to be Apache HTTP daemon"
                 APACHE_INSTALLED=1
-                APACHE_VERSION=`${HTTPDBINARY} -v 2> /dev/null | grep "^Server version:" | awk '{ print $3 }' | awk -F/ '{ print $2 }'`
+                APACHE_VERSION=`${HTTPDBINARY} -v 2> /dev/null | ${GREPBINARY} "^Server version:" | ${AWKBINARY} '{ print $3 }' | ${AWKBINARY} -F/ '{ print $2 }'`
                 LogText "Apache version: ${APACHE_VERSION}"
                 Report "apache_version=${APACHE_VERSION}"
             fi
@@ -93,7 +93,7 @@
     Register --test-no HTTP-6624 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Testing main Apache configuration file"
     if [ ${SKIPTEST} -eq 0 ]; then
         APACHE_CONFIGFILE=""
-        APACHE_TEST=`${HTTPDBINARY} -V 2> /dev/null | grep "\-D SERVER_CONFIG_FILE=" | sed 's/[ ]-D SERVER_CONFIG_FILE=//' | tr -d '"' | tr -d ' ' | tr -d '[:cntrl:]'`
+        APACHE_TEST=`${HTTPDBINARY} -V 2> /dev/null | ${GREPBINARY} "\-D SERVER_CONFIG_FILE=" | sed 's/[ ]-D SERVER_CONFIG_FILE=//' | tr -d '"' | tr -d ' ' | tr -d '[:cntrl:]'`
 
         if [ "${APACHE_TEST}" = "" ]; then
             LogText "Result: Can't find the configuration file, so skipping some Apache related tests"
@@ -104,7 +104,7 @@
                 Display --indent 6 --text "Info: Configuration file found (${APACHE_CONFIGFILE})"
               else
                 # Probably the prefix is missing, so we are going to search that
-                APACHE_HTTPDROOT=`${HTTPDBINARY} -V 2> /dev/null | grep "\-D HTTPD_ROOT=" | sed 's/[ ]-D HTTPD_ROOT=//' | tr -d '"' | tr -d ' '`
+                APACHE_HTTPDROOT=`${HTTPDBINARY} -V 2> /dev/null | ${GREPBINARY} "\-D HTTPD_ROOT=" | sed 's/[ ]-D HTTPD_ROOT=//' | tr -d '"' | tr -d ' '`
                 #echo "Apache root prefix: ${APACHE_HTTPDROOT}"
                 #echo "Complete path to configuration file: ${APACHE_HTTPDROOT}/${APACHE_TEST}"
                 APACHE_TESTFILE="${APACHE_HTTPDROOT}/${APACHE_TEST}"
@@ -137,7 +137,7 @@
 
         # Sort unsorted list, save it in temp file and then remove unsorted list
         if [ -f ${TMPFILE2} ]; then
-            sort -u ${TMPFILE2} >> ${TMPFILE}
+            ${SORTBINARY} -u ${TMPFILE2} >> ${TMPFILE}
             rm -f ${TMPFILE2}
         fi
         cVHOSTS=0; tVHOSTS=""
@@ -149,14 +149,14 @@
             FileIsReadable ${I}
             if [ ${CANREAD} -eq 1 ]; then
                 # Search Virtual Hosts
-                for J in `grep "ServerName" ${I} | grep -v "^#" | awk '{ if ($1=="ServerName" && $2!="*" && $2!="default") print $2 }'`; do
+                for J in `${GREPBINARY} "ServerName" ${I} | ${GREPBINARY} -v "^#" | ${AWKBINARY} '{ if ($1=="ServerName" && $2!="*" && $2!="default") print $2 }'`; do
                     if [ ! -z ${J} ]; then
                         tVHOSTS="${tVHOSTS} ${J}"
                         cVHOSTS=$((cVHOSTS + 1))
                     fi
                 done
                 # Search Server aliases
-                for J in `grep "ServerAlias" ${I} | grep -v "^#" | sed "s/.* ServerAlias//g" | sed "s/#.*//g"`; do
+                for J in `${GREPBINARY} "ServerAlias" ${I} | ${GREPBINARY} -v "^#" | sed "s/.* ServerAlias//g" | sed "s/#.*//g"`; do
                     if [ ! -z ${J} ]; then
                         tVHOSTS="${tVHOSTS} ${J}"
                         cVHOSTS=$((cVHOSTS + 1))
@@ -205,12 +205,12 @@
 #	        for APACHE_CONFIGFILE in ${APACHE_CONFIGFILES}; do
 #	            if [ -f ${APACHE_CONFIGFILE} ]; then
 #	        	# Check if option ServerTokens is configured
-#	        	SERVERTOKENSTEST=`grep ServerTokens ${APACHE_CONFIGFILE} | grep -v '^#'`
+#	        	SERVERTOKENSTEST=`${GREPBINARY} ServerTokens ${APACHE_CONFIGFILE} | ${GREPBINARY} -v '^#'`
 #	        	if [ ! "${SERVERTOKENSTEST}" = "" ]; then
 #	    		    Display --indent 4 --text "- Checking option ServerTokens" --result "${STATUS_FOUND}" --color WHITE
 #	        	    SERVERTOKENSTEST=`echo ${SERVERTOKENSTEST} | sed 's/ServerTokens//' | tr -d ' '`
 #	    		    LogText "Option ServerTokens found: ${SERVERTOKENSTEST}"
-#	    		    SERVERTOKENSEXPECTED=`grep 'apache' ${PROFILE} | grep 'ServerTokens' | cut -d ':' -f3`
+#	    		    SERVERTOKENSEXPECTED=`${GREPBINARY} 'apache' ${PROFILE} | ${GREPBINARY} 'ServerTokens' | cut -d ':' -f3`
 #	    		    if [ "${SERVERTOKENSEXPECTED}" = "${SERVERTOKENSTEST}" ]; then
 #	    		        LogText "Result: Value from configuration file yielded the same output as in template"
 #	    		        SERVERTOKENSFOUND=1
@@ -250,11 +250,11 @@
     #if [ ${SKIPTEST} -eq 0 ]; then
         # Testing Debian style
         #LogText "Test: searching loaded/enabled Apache modules"
-        #apachectl -t -D DUMP_MODULES 2>&1 | egrep -v "(Loaded Modules|Syntax OK)" | sed 's/(\(shared\|static\))//' | sed 's/ //'
+        #apachectl -t -D DUMP_MODULES 2>&1 | ${EGREPBINARY} -v "(Loaded Modules|Syntax OK)" | sed 's/(\(shared\|static\))//' | sed 's/ //'
         #for I in ${APACHE_MODULES_ENABLED_LOCS}; do
             #LogText "Test: checking ${I}"
             #if [ -d ${I} ]; then
-                #FIND=`grep -r LoadModule ${I}/* | grep -v "^#" | awk '{ print $2":"$3 }'`
+                #FIND=`${GREPBINARY} -r LoadModule ${I}/* | ${GREPBINARY} -v "^#" | ${AWKBINARY} '{ print $2":"$3 }'`
               #else
                 #LogText "Result: ${I} does not exist"
             #fi
@@ -380,7 +380,7 @@
     Register --test-no HTTP-6702 --weight L --network NO --category security --description "Check nginx process"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: searching running nginx process"
-        FIND=`${PSBINARY} ax | grep "/nginx" | grep "master" | grep -v "grep"`
+        FIND=`${PSBINARY} ax | ${GREPBINARY} "/nginx" | ${GREPBINARY} "master" | ${GREPBINARY} -v "grep"`
         if [ ! "${FIND}" = "" ]; then
             LogText "Result: found running nginx process(es)"
             Display --indent 2 --text "- Checking nginx" --result "${STATUS_FOUND}" --color GREEN
@@ -428,9 +428,9 @@
         # Remove temp file
         if [ ! "${TMPFILE}" = "" ]; then if [ -f ${TMPFILE} ]; then rm -f ${TMPFILE}; fi; fi
         N=0
-        sed -e 's/^[ 	]*//' ${NGINX_CONF_LOCATION} | grep -v "^#" | grep -v "^$" | sed 's/[	]/ /g' | sed 's/  / /g' | sed 's/  / /g' >> ${TMPFILE}
+        sed -e 's/^[ 	]*//' ${NGINX_CONF_LOCATION} | ${GREPBINARY} -v "^#" | ${GREPBINARY} -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'`
+        FIND=`${GREPBINARY} "include" ${NGINX_CONF_LOCATION} | ${AWKBINARY} '{ if ($1=="include") { print $2 }}' | sed 's/;$//g'`
         for I in ${FIND}; do
             FIND2=`${LSBINARY} ${I} 2>/dev/null`
             for J in ${FIND2}; do
@@ -442,7 +442,7 @@
                         FileIsReadable ${J}
                         if [ ${CANREAD} -eq 1 ]; then
                             NGINX_CONF_FILES="${NGINX_CONF_FILES} ${J}"
-                            FIND3=`sed -e 's/^[ 	]*//' ${J} | grep -v "^#" | grep -v "^$" | sed 's/[	]/ /g' | sed 's/  / /g' | sed 's/  / /g' >> ${TMPFILE}`
+                            FIND3=`sed -e 's/^[ 	]*//' ${J} | ${GREPBINARY} -v "^#" | ${GREPBINARY} -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
@@ -451,7 +451,7 @@
         done
 
         # Sort all discovered configuration lines and store unique ones. Also strip out the mime types configured in nginx
-        SORTFILE=`sort -u ${TMPFILE} | sed 's/ /:space:/g' | egrep -v "(application|audio|image|text|video)/" | egrep -v "({|})"`
+        SORTFILE=`${SORTBINARY} -u ${TMPFILE} | sed 's/ /:space:/g' | ${EGREPBINARY} -v "(application|audio|image|text|video)/" | ${EGREPBINARY} -v "({|})"`
         for I in ${SORTFILE}; do
             I=`echo ${I} | sed 's/:space:/ /g'`
             Report "nginx_config_option[]=${I}";
@@ -478,7 +478,7 @@
         LogText "Test: start parsing all discovered nginx options"
         Display --indent 4 --text "- Parsing configuration options"
         for I in ${NGINX_CONF_FILES}; do
-            FILENAME=$(echo ${I} | awk -F/ '{print $NF}')
+            FILENAME=$(echo ${I} | ${AWKBINARY} -F/ '{print $NF}')
             if [ ! "${FILENAME}" = "mime.types" ]; then
                 if FileIsReadable ${I}; then
                     Display --indent 8 --text "- ${I}"
@@ -492,7 +492,7 @@
         done
         if [ ! -z "${NGINX_CONF_FILES_ADDITIONS}" ]; then
             for I in ${NGINX_CONF_FILES_ADDITIONS}; do
-                FILENAME=$(echo ${I} | awk -F/ '{print $NF}')
+                FILENAME=$(echo ${I} | ${AWKBINARY} -F/ '{print $NF}')
                 if [ ! "${FILENAME}" = "mime.types" ]; then
                     if FileIsReadable ${I}; then
                         Display --indent 8 --text "- ${I}"
@@ -651,7 +651,7 @@
 #    if [ ${SKIPTEST} -eq 0 ]; then
 #	N=0
 #	LogText "Test: searching proxy_pass statement in configuration file ${NGINX_CONF_LOCATION}"
-#	FIND=`grep "proxy_pass" ${NGINX_CONF_LOCATION} | grep -v "#" | sed 's/proxy_pass//g' | tr -d ';'`
+#	FIND=`${GREPBINARY} "proxy_pass" ${NGINX_CONF_LOCATION} | ${GREPBINARY} -v "#" | sed 's/proxy_pass//g' | tr -d ';'`
 #	for I in ${FIND}; do
 #	    LogText "Found reverse proxy configuration for: ${I}"
 #	    N=$((N + 1))
@@ -675,7 +675,7 @@
 #    if [ ${SKIPTEST} -eq 0 ]; then
 #	N=0
 #	LogText "Test: searching nginx virtual hosts"
-#	FIND=`grep "server_name" ${NGINX_CONF_LOCATION} | grep -v "#" | sed 's/server_name//g' | tr -d ';'`
+#	FIND=`${GREPBINARY} "server_name" ${NGINX_CONF_LOCATION} | ${GREPBINARY} -v "#" | sed 's/server_name//g' | tr -d ';'`
 #	for I in ${FIND}; do
 #	    if [ "${I}" = "_" ]; then I="Default virtual host"; fi
 #	    LogText "Found virtual host: ${I}"
@@ -703,7 +703,7 @@
             LogText "Test: Checking ${DIR}"
             if [ -d ${DIR} ]; then
                 LogText "Result: Directory ${DIR} exists, so will be used as search path"
-                FIND=$(find ${DIR} -type f -exec grep access_log \{\} \; | grep -v "#" | awk '{ if($1=="access_log") { print $2 } }' | sed 's/;$//g' | sort -u)
+                FIND=$(find ${DIR} -type f -exec ${GREPBINARY} access_log \{\} \; | ${GREPBINARY} -v "#" | ${AWKBINARY} '{ if($1=="access_log") { print $2 } }' | sed 's/;$//g' | ${SORTBINARY} -u)
                 if [ -z "${FIND}" ]; then
                     LogText "Result: no log files found"
                 else