Merge pull request #142 from kboratynski/features/sshd

features/sshd

include/functions

@@ -49,6 +49,7 @@
 #    IsWorldExecutable          Check if a file is world executable
 #    IsWorldReadable            Check if a file is world readable
 #    IsWorldWritable            Check if a file is world writable
+#    IsTcpUdpListening          Check if machine is listening on specified protocol and port
 #    LogText                    Log text strings to logfile, prefixed with date/time
 #    ParseNginx                 Parse nginx configuration lines
 #    Progress                   Show progress on screen
@@ -118,6 +119,29 @@
       }
 
 
+    ################################################################################
+    # Name        : IsTcpUdpListening()
+    # Description : Check if machine is listening on specified protocol and port
+    # Returns     : LISTENING (0 or 1)
+    ################################################################################
+
+    IsTcpUdpListening()
+      {
+          LISTENING=0
+          if [ $# -eq 2 ] && [ $1 = "TCP" -o $1 = "UDP" ]; then
+            LogText "Test: find service listening on $1:$2"
+            FIND=`lsof -i${1} -s${1}:LISTEN | grep "${2}" | wc -l`
+            if [ ! "${FIND}" = "" ]; then
+                LogText "Result: found service listening on $1:$2"
+                LISTENING=1
+            else
+                LogText "Result: did not find service listening on $1:$2"
+            fi
+          else
+            ReportException ${TEST_NO} "Error in function call to IsTcpUdpListening"
+         fi
+      }
+
     ################################################################################
     # Name        : CheckItem()
     # Description : Check if a specific item exists in the report

include/tests_ssh

@@ -39,7 +39,8 @@
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Searching for a SSH daemon"
         IsRunning sshd
-        if [ ${RUNNING} -eq 1 ]; then
+        IsTcpUdpListening "TCP" 22
+        if [ ${RUNNING} -eq 1 ] || [ ${LISTENING} -eq 1 ]; then
             SSH_DAEMON_RUNNING=1
             Display --indent 2 --text "- Checking running SSH daemon" --result FOUND --color GREEN
           else