diff options
author | Laurent Quillerou <laurent.quillerou@gmail.com> | 2015-09-07 18:35:07 +0300 |
---|---|---|
committer | Laurent Quillerou <laurent.quillerou@gmail.com> | 2015-09-07 18:35:07 +0300 |
commit | 3cdd9ea949379a8ad06daa06e739d1e65e4a52bc (patch) | |
tree | 50e15f4295d2df22c014f2c81b90e8b15c705a14 /include | |
parent | a90d225bf4ea02e8483810f60efb51ae5ef18c1a (diff) |
Delete trailing whitespace
Diffstat (limited to 'include')
-rw-r--r-- | include/functions | 8 | ||||
-rw-r--r-- | include/tests_crypto | 2 | ||||
-rw-r--r-- | include/tests_databases | 2 | ||||
-rw-r--r-- | include/tests_file_integrity | 2 | ||||
-rw-r--r-- | include/tests_filesystems | 2 | ||||
-rw-r--r-- | include/tests_kernel | 6 | ||||
-rw-r--r-- | include/tests_mac_frameworks | 4 | ||||
-rw-r--r-- | include/tests_malware | 2 | ||||
-rw-r--r-- | include/tests_memory_processes | 2 | ||||
-rw-r--r-- | include/tests_nameservices | 4 | ||||
-rw-r--r-- | include/tests_ports_packages | 2 | ||||
-rw-r--r-- | include/tests_storage_nfs | 6 | ||||
-rw-r--r-- | include/tests_webservers | 10 |
13 files changed, 26 insertions, 26 deletions
diff --git a/include/functions b/include/functions index 89e9c662..2e610fe2 100644 --- a/include/functions +++ b/include/functions @@ -89,10 +89,10 @@ # If 'file' is an directory, use -d if [ -d ${CHECKFILE} ]; then FILEVALUE=`ls -d -l ${CHECKFILE} | cut -c 2-10` - PROFILEVALUE=`cat ${PROFILE} | grep '^permdir' | grep ":${CHECKFILE}:" | cut -d: -f3` + PROFILEVALUE=`cat ${PROFILE} | grep '^permdir' | grep ":${CHECKFILE}:" | cut -d: -f3` else FILEVALUE=`ls -l ${CHECKFILE} | cut -c 2-10` - PROFILEVALUE=`cat ${PROFILE} | grep '^permfile' | grep ":${CHECKFILE}:" | cut -d: -f3` + PROFILEVALUE=`cat ${PROFILE} | grep '^permfile' | grep ":${CHECKFILE}:" | cut -d: -f3` fi if [ "${FILEVALUE}" = "${PROFILEVALUE}" ]; then PERMS="OK"; else PERMS="BAD"; fi fi @@ -1060,7 +1060,7 @@ if [ ! "${FIND}" = "" ]; then SKIPTEST=1; SKIPREASON="Skipped by configuration"; fi fi - # Skip if test is not in the list + # Skip if test is not in the list if [ ${SKIPTEST} -eq 0 -a ! "${TESTS_TO_PERFORM}" = "" ]; then FIND=`echo "${TESTS_TO_PERFORM}" | grep "${TEST_NO}"` if [ "${FIND}" = "" ]; then SKIPTEST=1; SKIPREASON="Test not in list of tests to perform"; fi @@ -1146,7 +1146,7 @@ { if [ $1 = "" ]; then TESTID="UNKNOWN"; fi # Status: OK, WARNING, NEUTRAL, SUGGESTION - # Impact: HIGH, SEVERE, LOW, + # Impact: HIGH, SEVERE, LOW, #report "result[]=TESTID-${TESTID},STATUS-$2,IMPACT-$3,MESSAGE-$4-" # Reset ID before next test TESTID="" diff --git a/include/tests_crypto b/include/tests_crypto index d883e8b8..7a08962b 100644 --- a/include/tests_crypto +++ b/include/tests_crypto @@ -29,7 +29,7 @@ if [ ${SKIPTEST} -eq 0 ]; then FOUNDPROBLEM=0 # Check profile for paths to check - sSSL_PATHS=`grep "^ssl:certificates:" ${PROFILE} | cut -d ':' -f3` + sSSL_PATHS=`grep "^ssl:certificates:" ${PROFILE} | cut -d ':' -f3` for I in ${sSSL_PATHS}; do if [ -d ${I} ]; then FileIsReadable ${I} diff --git a/include/tests_databases b/include/tests_databases index ca2fb24c..80e7405b 100644 --- a/include/tests_databases +++ b/include/tests_databases @@ -79,7 +79,7 @@ Display --indent 4 --text "- Checking empty MySQL root password" --result WARNING --color RED AddHP 0 5 else - logtext "Result: Login did not succeed, so a MySQL root password is set" + logtext "Result: Login did not succeed, so a MySQL root password is set" Display --indent 4 --text "- Checking MySQL root password" --result OK --color GREEN AddHP 2 2 fi diff --git a/include/tests_file_integrity b/include/tests_file_integrity index 7bdc2072..03fa0908 100644 --- a/include/tests_file_integrity +++ b/include/tests_file_integrity @@ -94,7 +94,7 @@ Register --test-no FINT-4316 --preqs-met ${PREQS_MET} --weight L --network NO --description "AIDE configuration: Checksums (SHA256 or SHA512)" if [ ${SKIPTEST} -eq 0 ]; then FIND=`${GREPBINARY} "^Checksums" ${AIDECONFIG}` - FIND2=`${GREPBINARY} "^Checksums" ${AIDECONFIG} | ${EGREPBINARY} "sha256|sha512"` + FIND2=`${GREPBINARY} "^Checksums" ${AIDECONFIG} | ${EGREPBINARY} "sha256|sha512"` if [ "${FIND}" = "" ]; then logtext "Result: Unclear how AIDE is dealing with checksums" Display --indent 6 --text "- AIDE config (Checksums)" --result UNKNOWN --color YELLOW diff --git a/include/tests_filesystems b/include/tests_filesystems index ded21fc1..50c7308c 100644 --- a/include/tests_filesystems +++ b/include/tests_filesystems @@ -322,7 +322,7 @@ #SKELDIRS="/etc/skel /usr/share/skel" #for I in ${SKELDIRS}; do - # + # # logtext "Searching skel directory ${I}" # # if [ -d ${I} ]; then diff --git a/include/tests_kernel b/include/tests_kernel index 15c84206..66241526 100644 --- a/include/tests_kernel +++ b/include/tests_kernel @@ -49,7 +49,7 @@ logtext "Result: Found match on runlevel5/graphical" Display --indent 2 --text "- Checking default runlevel" --result "runlevel 5" --color GREEN report "linux_default_runlevel=5" - else + else logtext "Result: No match found on runlevel, defaulting to runlevel 3" Display --indent 2 --text "- Checking default runlevel" --result "runlevel 3" --color GREEN report "linux_default_runlevel=3" @@ -376,7 +376,7 @@ if [ ${SKIPTEST} -eq 0 ]; then logtext "Test: Checking presence /etc/security/limits.conf" if [ -f /etc/security/limits.conf ]; then - logtext "Result: file /etc/security/limits.conf exists" + logtext "Result: file /etc/security/limits.conf exists" logtext "Test: Checking if core dumps are disabled in /etc/security/limits.conf" FIND1=`cat /etc/security/limits.conf | grep -v "^#" | grep -v "^$" | awk '{ if ($1=="*" && $2=="soft" && $3=="core" && $4=="1") { print "soft core enabled" } }'` FIND2=`cat /etc/security/limits.conf | grep -v "^#" | grep -v "^$" | awk '{ if ($1=="*" && $2=="hard" && $3=="core" && $4=="1") { print "hard core enabled" } }'` @@ -438,7 +438,7 @@ FILE="/var/run/reboot-required.pkgs" logtext "Test: Checking presence ${FILE}" if [ -f ${FILE} ]; then - logtext "Result: file ${FILE} exists" + logtext "Result: file ${FILE} exists" FIND=`cat ${FILE}` if [ "${FIND}" = "" ]; then logtext "Result: No reboot needed (file empty)" diff --git a/include/tests_mac_frameworks b/include/tests_mac_frameworks index 4a0bc6dc..9b7fa2c2 100644 --- a/include/tests_mac_frameworks +++ b/include/tests_mac_frameworks @@ -71,7 +71,7 @@ elif [ ${FIND} -eq 1 ]; then logtext "Result: AppArmor is disabled" Display --indent 4 --text "- Checking AppArmor status" --result "DISABLED" --color YELLOW - else + else Display --indent 4 --text "- Checking AppArmor status" --result "UNKNOWN" --color RED ReportException "${TEST_NO}:1" "Invalid or unknown AppArmor status detected" fi @@ -119,7 +119,7 @@ Display --indent 6 --text "- Checking current mode and config file" --result "OK" --color GREEN else logtext "Result: Current SELinux mode (${FIND}) is NOT the same as in config file (${FIND2})." - ReportWarning ${TEST_NO} "M" "Current SELinux mode is different from config file (current: ${FIND}, config file: ${FIND2})" + ReportWarning ${TEST_NO} "M" "Current SELinux mode is different from config file (current: ${FIND}, config file: ${FIND2})" Display --indent 6 --text "- Checking current mode and config file" --result "WARNING" --color RED fi Display --indent 8 --text "Current SELinux mode: ${FIND}" diff --git a/include/tests_malware b/include/tests_malware index 1462646c..75517156 100644 --- a/include/tests_malware +++ b/include/tests_malware @@ -47,7 +47,7 @@ ################################################################################# # # Test : MALW-3276 - # Description : Check for installed tool (Rootkit Hunter) + # Description : Check for installed tool (Rootkit Hunter) Register --test-no MALW-3276 --weight L --network NO --description "Check for Rootkit Hunter" if [ ${SKIPTEST} -eq 0 ]; then logtext "Test: checking presence Rootkit Hunter" diff --git a/include/tests_memory_processes b/include/tests_memory_processes index fda6a32e..b78429db 100644 --- a/include/tests_memory_processes +++ b/include/tests_memory_processes @@ -64,7 +64,7 @@ # # Test : PROC-3612 # Description : Searching for dead and zombie processes - # Notes : Don't perform test on Solaris + # Notes : Don't perform test on Solaris if [ ! "${OS}" = "Solaris" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no PROC-3612 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check dead or zombie processes" if [ ${SKIPTEST} -eq 0 ]; then diff --git a/include/tests_nameservices b/include/tests_nameservices index 5e59f53f..5131364b 100644 --- a/include/tests_nameservices +++ b/include/tests_nameservices @@ -94,7 +94,7 @@ # Check amount of search domains (max 1) FIND=`cat /etc/resolv.conf | grep "^search" | wc -l | tr -s ' ' | tr -d ' '` if [ ! "${FIND}" = "0" -a ! "${FIND}" = "1" ]; then - logtext "Result: found ${FIND} line(s) with a search statement (expecting less than 2 lines)" + logtext "Result: found ${FIND} line(s) with a search statement (expecting less than 2 lines)" Display --indent 4 --text "- Checking search domains lines" --result "CONFIG ERROR" --color YELLOW ReportWarning ${TEST_NO} "L" "Found more than 1 search lines in /etc/resolv.conf, which is probably a misconfiguration" else @@ -566,7 +566,7 @@ fi fi # Check if we found any NIS domain - if [ ! "${NISDOMAIN}" = "" ]; then + if [ ! "${NISDOMAIN}" = "" ]; then logtext "Found NIS domain: ${NISDOMAIN}" report "nisdomain=${NISDOMAIN}" Display --indent 4 --text "- Checking NIS domain" --result "FOUND" --color GREEN diff --git a/include/tests_ports_packages b/include/tests_ports_packages index 8143113a..c21db924 100644 --- a/include/tests_ports_packages +++ b/include/tests_ports_packages @@ -860,7 +860,7 @@ SCAN_PERFORMED=0 # Update portage. # Multiple ways to do this. Some require extra packages to be installed, - # others require potential firewall ports to be open, outbound. This is the + # others require potential firewall ports to be open, outbound. This is the # "most friendly" way. logtext "Action: updating portage with emerge-webrsync" /usr/bin/emerge-webrsync --quiet 2> /dev/null diff --git a/include/tests_storage_nfs b/include/tests_storage_nfs index 2b3d7d6b..1795aeb6 100644 --- a/include/tests_storage_nfs +++ b/include/tests_storage_nfs @@ -59,7 +59,7 @@ # # Test : STRG-1906 # Description : Check nfs protocols (TCP/UDP) and port in rpcinfo - if [ ! "${RPCINFOBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ ! "${RPCINFOBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no STRG-1906 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check nfs rpc" if [ ${SKIPTEST} -eq 0 ]; then logtext "Test: Checking NFS registered protocols" @@ -114,7 +114,7 @@ # Description : Check NFS exports if [ ${NFS_DAEMON_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no STRG-1926 --preqs-met ${PREQS_MET} --weight L --network NO --description "Checking NFS exports" - if [ ${SKIPTEST} -eq 0 ]; then + if [ ${SKIPTEST} -eq 0 ]; then logtext "Test: check /etc/exports" if [ -f /etc/exports ]; then logtext "Result: /etc/exports exists" @@ -139,7 +139,7 @@ # # Test : STRG-1928 # Description : Check for empty exports file while NFS is running - if [ ${NFS_DAEMON_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ ${NFS_DAEMON_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no STRG-1928 --preqs-met ${PREQS_MET} --weight L --network NO --description "Checking empty /etc/exports" if [ ${SKIPTEST} -eq 0 ]; then if [ ${NFS_EXPORTS_EMPTY} -eq 1 ]; then diff --git a/include/tests_webservers b/include/tests_webservers index 51a8d528..b630c7a3 100644 --- a/include/tests_webservers +++ b/include/tests_webservers @@ -194,9 +194,9 @@ # # Configuration specific tests # SERVERTOKENSFOUND=0 # APACHE_CONFIGFILES="${APACHE_CONFIGFILE} /usr/local/etc/apache22/extra/httpd-default.conf /etc/apache2/sysconfig.d/global.conf" -# +# # for APACHE_CONFIGFILE in ${APACHE_CONFIGFILES}; do -# if [ -f ${APACHE_CONFIGFILE} ]; then +# if [ -f ${APACHE_CONFIGFILE} ]; then # # Check if option ServerTokens is configured # SERVERTOKENSTEST=`cat ${APACHE_CONFIGFILE} | grep ServerTokens | grep -v '^#'` # if [ ! "${SERVERTOKENSTEST}" = "" ]; then @@ -215,17 +215,17 @@ # else # Display --indent 4 --text "- Checking option ServerTokens" --result "NOT FOUND" --color WHITE # fi -# +# # else # # File does not exist, skipping # logtext "File ${APACHE_CONFIGFILE} does not exist, so skipping tests on this file" # fi # done -# +# # # Display results from checks # if [ ${SERVERTOKENSFOUND} -eq 1 ]; then # Display --indent 6 --text "- Value of ServerTokens" --result OK --color GREEN -# else +# else # Display --indent 6 --text "- Value of ServerTokens" --result WARNING --color RED # ReportWarning ${TEST_NO} "M" "Value of 'ServerTokens' in Apache config is different than template" # fi |