Added validation of target + port

1 files changed, 19 insertions, 1 deletions

diff --git a/worker/tests/smtp.rb b/worker/tests/smtp.rb
index 58029e4..aa577d6 100755
--- a/worker/tests/smtp.rb
+++ b/worker/tests/smtp.rb
@@ -29,6 +29,24 @@ class SMTPTest
   #
   def initialize( data )
     @test_data = data
+    @error     = nil
+
+
+    #
+    # Ensure we have a host to probe
+    #
+    if ( @test_data["target_host"].nil? )
+      @error = "Missing target for the test."
+      raise ArgumentError, @error
+    end
+
+    #
+    # Ensure we have a port to test.
+    #
+    if ( @test_data["test_port"].nil? )
+      @error = "Missing port for the test."
+      raise ArgumentError, @error
+    end
   end
 
 
@@ -48,7 +66,7 @@ class SMTPTest
     #  Get the hostname & port to test against.
     #
     host = @test_data['target_host']
-    port = 25
+    port = @test_data['test_port']
 
     puts "SMTP testing host #{host}:#{port}" if ( @test_data['verbose'] )