diff options
| author | SiemKorteweg <Siem.Korteweg@qnh.nl> | 2015-10-10 14:25:14 +0300 |
|---|---|---|
| committer | SiemKorteweg <Siem.Korteweg@qnh.nl> | 2015-10-10 14:25:14 +0300 |
| commit | 0c48fc3880551d862063e56a029ce43082df376a (patch) | |
| tree | d57f59a582b3d457fccd0dad6f32b3513ebf294f /include/tests_ssh | |
| parent | c0378f38f517e916b141a8bc5049eb742e66d48f (diff) | |
Optimized use of cat, grep and awk.
Detection of duplicate entries in /etc/hosts is now more robust.
On CentOS7 the SERVICE_MANAGER is detected correctly.
Diffstat (limited to 'include/tests_ssh')
| -rw-r--r-- | include/tests_ssh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/tests_ssh b/include/tests_ssh index 303af6b6..5cc466ce 100644 --- a/include/tests_ssh +++ b/include/tests_ssh @@ -86,7 +86,7 @@ Register --test-no SSH-7408 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check SSH defined options" if [ ${SKIPTEST} -eq 0 ]; then logtext "Test: Checking all specific defined options in ${SSH_DAEMON_CONFIG}" - FIND=`cat ${SSH_DAEMON_CONFIG} | grep -v "^#" | grep -v "^$" | ${AWKBINARY} '{gsub("\t"," ");print}' | sed 's/ /!space!/g'` + FIND=`grep -v "^#" ${SSH_DAEMON_CONFIG} | grep -v "^$" | ${AWKBINARY} '{gsub("\t"," ");print}' | sed 's/ /!space!/g'` for I in ${FIND}; do I=`echo ${I} | sed 's/!space!/ /g'` logtext "Found SSH option: ${I}" @@ -102,7 +102,7 @@ Register --test-no SSH-7412 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check SSH option: PermitRootLogin" if [ ${SKIPTEST} -eq 0 ]; then logtext "Test: check PermitRootLogin option" - FIND=`cat ${SSH_DAEMON_CONFIG} | grep "^PermitRootLogin" | awk '{ print $2 }'` + FIND=`awk '/^PermitRootLogin/ { print $2 }' ${SSH_DAEMON_CONFIG}` if [ "${FIND}" = "yes" -o "${FIND}" = "YES" -o "${FIND}" = "Yes" ]; then logtext "Result: PermitRootLogin is enabled, root can login directly" Display --indent 4 --text "- SSH option: PermitRootLogin" --result WARNING --color RED @@ -134,7 +134,7 @@ Register --test-no SSH-7414 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check SSH option: Protocol" if [ ${SKIPTEST} -eq 0 ]; then logtext "Test: check allowed SSH protocol versions" - FIND=`cat ${SSH_DAEMON_CONFIG} | grep "^Protocol" | awk '{ print $2 }'` + FIND=`awk '/^Protocol/ { print $2 }' ${SSH_DAEMON_CONFIG}` if [ "${FIND}" = "1" -o "${FIND}" = "2,1" -o "${FIND}" = "1,2" ]; then logtext "Result: Protocol option is set to allow SSH protocol version 1" Display --indent 4 --text "- SSH option: Protocol" --result WARNING --color RED @@ -160,7 +160,7 @@ Register --test-no SSH-7416 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check SSH option: StrictModes" if [ ${SKIPTEST} -eq 0 ]; then logtext "Test: Check configured StrictModes option" - FIND=`cat ${SSH_DAEMON_CONFIG} | grep "^StrictModes" | awk '{ print $2 }'` + FIND=`awk '/^StrictModes/ { print $2 }' ${SSH_DAEMON_CONFIG}` if [ "${FIND}" = "no" -o "${FIND}" = "NO" -o "${FIND}" = "No" ]; then logtext "Result: StrictModes option is set to 'no', which means file permissions are NOT checked" Display --indent 4 --text "- SSH option: StrictModes" --result WARNING --color RED |