1 files changed, 105 insertions, 30 deletions
diff --git a/worker/tests/smtp.rb b/worker/tests/smtp.rb
index 66da545..113dd5f 100755
--- a/worker/tests/smtp.rb
+++ b/worker/tests/smtp.rb
@@ -1,52 +1,127 @@
+#!/usr/bin/ruby
+
+
+
+require 'socket'
 require 'timeout'
 
 
 #
-# Run an SMTP test.
-#
-#
-# Return value
-#   TRUE:  The host is up
-#
-#  FALSE:  The host is not up
+# Test that we can receive a response from an SMTP server that looks
+# reasonable.
 #
-def smtp_test ( params )
+class SMTPTest
+
+  #
+  # Data passed from the JSON hash.
+  #
+  attr_reader :test_data
+
+  #
+  # The error text we return on failure.
+  #
+  attr_reader :error
+
+
 
   #
-  #  Get the hostname & port to test against.
+  # Save the data away.
+  #
+  def initialize( data )
+    @test_data = data
+  end
+
+
+  #
+  # Run the test.
+  #
+  #  Return "true" on success
+  #
+  #  Return "false" on failure.
+  #
+  # If the test fails the details should be retrieved from "get_details".
   #
-  host = params['target_host']
-  port = 25
+  def run_test
+    @error = ""
 
-  puts "SMTP testing host #{host}:#{port}"
+    #
+    #  Get the hostname & port to test against.
+    #
+    host = @test_data['target_host']
+    port = 25
 
+    puts "SMTP testing host #{host}:#{port}" if ( @test_data['verbose'] )
 
-  begin
-    timeout(3) do
+    begin
+      timeout(3) do
 
-      begin
-        socket = TCPSocket.new( host, port )
-        socket.puts( "QUIT\n\n")
+        begin
+          socket = TCPSocket.new( host, port )
+          socket.puts( "QUIT")
 
-        banner = socket.gets(nil)
-        banner = banner[0,20]
+          banner = socket.gets(nil)
+          banner = banner[0,40]
 
-        socket.close()
+          socket.close()
 
-        if ( banner =~ /SMTP/i )
-          puts "SMTP alive: #{banner}"
-          return true
+          if ( banner =~ /SMTP/i )
+            puts "SMTP alive: #{banner}" if ( @test_data['verbose'] )
+            return true
+          else
+            @error = "Banner didn't seem reasonable: #{banner}"
+            return false;
+          end
+        rescue
+          @error = "SMTP exception on host #{host}:#{port} - #{$!}"
+          return false
         end
-      rescue
-        puts "SMTP exception on host #{host}:#{port} - #{$!}"
-        return false
       end
+    rescue Timeout::Error => e
+      @error = "TIMEOUT: #{e}"
+      return false
     end
-  rescue Timeout::Error => e
 
-    puts "SMTP TIMEOUT: #{e}"
+    @error = "Misc failure"
     return false
   end
-  puts "SMTP Misc Failure"
-  return false
+
+
+
+  #
+  #  Return the error text for why this test failed.
+  #
+  def get_details
+    return @error
+  end
+
+end
+
+
+#
+# Sample test, for testing.
+#
+if __FILE__ == $0 then
+
+  #
+  #  Sample data.
+  #
+  test = {
+    "target_host" => "mail.steve.org.uk",
+    "test_type"   => "smtp",
+    "verbose"     => 1,
+    "test_alert"  => "SMTP failure",
+  }
+
+
+  #
+  #  Run the test.
+  #
+  obj = SMTPTest.new( test )
+  if ( obj.run_test )
+    puts "TEST OK"
+  else
+    puts "TEST FAILED"
+    puts obj.get_details()
+  end
+
 end