Merge remote-tracking branch 'upstream/master'

lib/metasploit/framework/login_scanner/kerberos.rb

@@ -12,6 +12,10 @@ class Kerberos
         DEFAULT_PORT = 88
         REALM_KEY = Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN
         DEFAULT_REALM = nil
+        LIKELY_PORTS = [ DEFAULT_PORT ].freeze
+        LIKELY_SERVICE_NAMES = [ 'kerberos', 'kerberos5', 'krb5', 'kerberos-sec' ].freeze
+        PRIVATE_TYPES = %i[ password ].freeze
+        CAN_GET_SESSION = true
 
         def attempt_login(credential)
           result_options = {
@@ -117,6 +121,7 @@ def self.login_status_for_kerberos_error(krb_err)
         private
 
         def set_sane_defaults
+          self.connection_timeout = 10 if self.connection_timeout.nil?
           self.port = DEFAULT_PORT unless self.port
         end
 

lib/msf/core/exploit/remote/kerberos/client.rb

@@ -179,7 +179,7 @@ def send_request_tgt_pkinit(options = {})
             pfx = options[:pfx]
             request_pac = options.fetch(:request_pac, true)
             realm = options[:realm]
-            server_name = options.fetch(:server_name, "krbtgt/#{realm}")
+            server_name = options[:server_name] || "krbtgt/#{realm}"
             client_name = options[:client_name]
             client_name = client_name.dup.force_encoding('utf-8') if client_name
             ticket_options = options.fetch(:options) { 0x50800000 } # Forwardable, Proxiable, Renewable
@@ -245,7 +245,7 @@ def send_request_tgt_pkinit(options = {})
           # @raise [Rex::Proto::Kerberos::Model::Error::KerberosError] if the provided credentials are invalid
           def send_request_tgt(options = {})
             realm = options[:realm]
-            server_name = options[:server_name]
+            server_name = options[:server_name] || "krbtgt/#{realm}"
             client_name = options[:client_name]
             client_name = client_name.dup.force_encoding('utf-8') if client_name
             password = options[:password]