the refactor continues!

Author: David Maloney

lib/metasploit/framework/login_scanner/postgres.rb

@@ -23,7 +23,11 @@ class Postgres
         # @return [Metasploit::Framework::LoginScanner::Result] The LoginScanner Result object
         def attempt_login(credential)
           result_options = {
-              credential: credential
+              credential: credential,
+              host: host,
+              port: port,
+              protocol: 'tcp',
+              service_name: 'postgres'
           }
 
           db_name = credential.realm || 'template1'

lib/metasploit/framework/login_scanner/smb.rb

@@ -212,7 +212,12 @@ def attempt_login(credential)
             access_level ||= AccessLevels::GUEST
           end
 
-          Result.new(credential: credential, status: status, proof: proof, access_level: access_level)
+          result = Result.new(credential: credential, status: status, proof: proof, access_level: access_level)
+          result.host         = host
+          result.port         = port
+          result.protocol     = 'tcp'
+          result.service_name = 'smb'
+          result
         end
 
         def connect

lib/metasploit/framework/login_scanner/snmp.rb

@@ -22,7 +22,11 @@ class SNMP
         # @return [Metasploit::Framework::LoginScanner::Result] The LoginScanner Result object
         def attempt_login(credential)
           result_options = {
-              credential: credential
+              credential: credential,
+              host: host,
+              port: port,
+              protocol: 'udp',
+              service_name: 'snmp'
           }
 
           [:SNMPv1, :SNMPv2c].each do |version|

modules/auxiliary/scanner/postgres/postgres_login.rb

@@ -69,48 +69,20 @@ def run_host(ip)
       connection_timeout: 30
     )
 
-    service_data = {
-      address: ip,
-      port: rport,
-      service_name: 'postgres',
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
     scanner.scan! do |result|
-      if result.success?
-        credential_data = {
+      credential_data = result.to_h
+      credential_data.merge!(
           module_fullname: self.fullname,
-          origin_type: :service,
-          private_data: result.credential.private,
-          private_type: :password,
-          realm_key: Metasploit::Model::Realm::Key::POSTGRESQL_DATABASE,
-          realm_value: result.credential.realm,
-          username: result.credential.public
-        }
-        credential_data.merge!(service_data)
-
+          workspace_id: myworkspace_id
+      )
+      if result.success?
         credential_core = create_credential(credential_data)
+        credential_data[:core] = credential_core
+        create_credential_login(credential_data)
 
-        login_data = {
-            core: credential_core,
-            last_attempted_at: DateTime.now,
-            status: Metasploit::Model::Login::Status::SUCCESSFUL
-        }
-        login_data.merge!(service_data)
-
-        create_credential_login(login_data)
         print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
       else
-        invalidate_login(
-            address: ip,
-            port: rport,
-            protocol: 'tcp',
-            public: result.credential.public,
-            private: result.credential.private,
-            realm_key: Metasploit::Model::Realm::Key::POSTGRESQL_DATABASE,
-            realm_value: result.credential.realm,
-            status: result.status)
+        invalidate_login(credential_data)
         print_status "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
       end
     end

modules/auxiliary/scanner/snmp/snmp_login.rb

@@ -63,43 +63,20 @@ def run_batch(batch)
           connection_timeout: 2
       )
 
-      service_data = {
-          address: ip,
-          port: rport,
-          service_name: 'snmp',
-          protocol: 'udp',
-          workspace_id: myworkspace_id
-      }
-
       scanner.scan! do |result|
+        credential_data = result.to_h
+        credential_data.merge!(
+            module_fullname: self.fullname,
+            workspace_id: myworkspace_id
+        )
         if result.success?
-          credential_data = {
-              module_fullname: self.fullname,
-              origin_type: :service,
-              username: result.credential.public
-          }
-          credential_data.merge!(service_data)
-
           credential_core = create_credential(credential_data)
+          credential_data[:core] = credential_core
+          create_credential_login(credential_data)
 
-          login_data = {
-              core: credential_core,
-              last_attempted_at: DateTime.now,
-              status: Metasploit::Model::Login::Status::SUCCESSFUL
-          }
-          login_data.merge!(service_data)
-
-          create_credential_login(login_data)
           print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
         else
-          invalidate_data = {
-              public: result.credential.public,
-              private: result.credential.private,
-              realm_key: result.credential.realm_key,
-              realm_value: result.credential.realm,
-              status: result.status
-          } .merge(service_data)
-          invalidate_login(invalidate_data)
+          invalidate_login(credential_data)
           print_status "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
         end
       end