set default connection tiemouts

loginscanners should have a default connection timeout

lib/metasploit/framework/login_scanner/afp.rb

@@ -39,9 +39,10 @@ module Metasploit
         end
 
         def set_sane_defaults
-          self.port          = DEFAULT_PORT if self.port.nil?
+          self.connection_timeout ||= 30
-          self.max_send_size = 0 if self.max_send_size.nil?
+          self.port               ||= DEFAULT_PORT
-          self.send_delay    = 0 if self.send_delay.nil?
+          self.max_send_size      ||= 0
+          self.send_delay         ||= 0
         end
       end
     end

lib/metasploit/framework/login_scanner/db2.rb

@@ -96,10 +96,12 @@ module Metasploit
         # This method sets the sane defaults for things
         # like timeouts and TCP evasion options
         def set_sane_defaults
-          self.port ||= DEFAULT_PORT
+          self.connection_timeout ||= 30
-          self.max_send_size ||= 0
+          self.port               ||= DEFAULT_PORT
-          self.send_delay    ||= 0
+          self.max_send_size      ||= 0
-          self.ssl           ||= false
+          self.send_delay         ||= 0
+
+          self.ssl = false  if self.ssl.nil?
         end
 
         # This method takes a response packet and checks to see

lib/metasploit/framework/login_scanner/ftp.rb

@@ -62,10 +62,11 @@ module Metasploit
         # This method sets the sane defaults for things
         # like timeouts and TCP evasion options
         def set_sane_defaults
-          self.port = DEFAULT_PORT if self.port.nil?
+          self.connection_timeout ||= 30
-          self.max_send_size = 0 if self.max_send_size.nil?
+          self.port               ||= DEFAULT_PORT
-          self.send_delay = 0 if self.send_delay.nil?
+          self.max_send_size      ||= 0
-          self.ftp_timeout = 16 if self.ftp_timeout.nil?
+          self.send_delay         ||= 0
+          self.ftp_timeout        ||= 16
         end
 
       end

lib/metasploit/framework/login_scanner/http.rb

@@ -92,6 +92,7 @@ module Metasploit
         # This method sets the sane defaults for things
         # like timeouts and TCP evasion options
         def set_sane_defaults
+          self.connection_timeout ||= 20
           self.max_send_size = 0 if self.max_send_size.nil?
           self.send_delay = 0 if self.send_delay.nil?
 

lib/metasploit/framework/login_scanner/mssql.rb

@@ -53,9 +53,12 @@ module Metasploit
         private
 
         def set_sane_defaults
-          self.port                   = DEFAULT_PORT if self.port.nil?
+          self.connection_timeout    ||= 30
-          self.max_send_size          = 0 if self.max_send_size.nil?
+          self.port                  ||= DEFAULT_PORT
-          self.send_delay             = 0 if self.send_delay.nil?
+          self.max_send_size         ||= 0
+          self.send_delay            ||= 0
+
+          # Don't use ||= with booleans
           self.send_lm                = true if self.send_lm.nil?
           self.send_ntlm              = true if self.send_ntlm.nil?
           self.send_spn               = true if self.send_spn.nil?

lib/metasploit/framework/login_scanner/mysql.rb

@@ -78,9 +78,10 @@ module Metasploit
         # This method sets the sane defaults for things
         # like timeouts and TCP evasion options
         def set_sane_defaults
-          self.port = DEFAULT_PORT if self.port.nil?
+          self.connection_timeout || 30
-          self.max_send_size = 0 if self.max_send_size.nil?
+          self.port               ||= DEFAULT_PORT
-          self.send_delay = 0 if self.send_delay.nil?
+          self.max_send_size      ||= 0
+          self.send_delay         ||= 0
         end
 
       end

lib/metasploit/framework/login_scanner/pop3.rb

@@ -68,9 +68,10 @@ module Metasploit
 
         # (see Base#set_sane_defaults)
         def set_sane_defaults
-          self.port = DEFAULT_PORT if self.port.nil?
+          self.connection_timeout ||= 30
-          self.max_send_size ||= 0
+          self.port               ||= DEFAULT_PORT
-          self.send_delay ||= 0
+          self.max_send_size      ||= 0
+          self.send_delay         ||= 0
         end
 
       end

lib/metasploit/framework/login_scanner/postgres.rb

@@ -70,7 +70,8 @@ module Metasploit
       end
 
       def set_sane_defaults
-        self.port = DEFAULT_PORT if self.port.nil?
+        self.connection_timeout ||= 30
+        self.port               ||= DEFAULT_PORT
       end
 
     end

lib/metasploit/framework/login_scanner/telnet.rb

@@ -96,6 +96,7 @@ module Metasploit
         # This method sets the sane defaults for things
         # like timeouts and TCP evasion options
         def set_sane_defaults
+          self.connection_timeout ||= 30
           self.max_send_size      ||= 0
           self.port               ||= DEFAULT_PORT
           self.send_delay         ||= 0

lib/metasploit/framework/login_scanner/vnc.rb

@@ -90,9 +90,10 @@ module Metasploit
         # This method sets the sane defaults for things
         # like timeouts and TCP evasion options
         def set_sane_defaults
-          self.port ||= 5900
+          self.connection_timeout ||= 30
-          self.max_send_size ||= 0
+          self.port               ||= 5900
-          self.send_delay    ||= 0
+          self.max_send_size      ||= 0
+          self.send_delay         ||= 0
         end
 
         # This method attempts the actual VNC authentication. It has built in retries to handle