Fix error when saving creds

Author: AgoraSecurity

modules/post/windows/gather/credentials/mdaemon_cred_collector.rb

@@ -159,7 +159,8 @@ def parse_userlist(data)
     del_cmd = 'rm '
     del_cmd << data
     system(del_cmd)
-    return creds, imap, pop3
+    result = [creds, imap, pop3]
+    return result
   end
 
   def report_cred(creds)
@@ -170,30 +171,28 @@ def report_cred(creds)
       port: 25,
       service_name: 'smtp',
       protocol: 'tcp',
+      workspace_id: myworkspace_id
     }
     # Iterate through credentials
     creds.each do |cred|
       # Build credential information
       credential_data = {
-        origin_type: :service,
+        origin_type: :session,
         session_id: session_db_id,
         post_reference_name: self.refname,
         private_type: :password,
         private_data: cred[4],
         username: cred[1],
-        workspace_id: myworkspace_id,
         module_fullname: self.fullname
       }
-      print_status("Debug 1: #{credential_data}")
       credential_data.merge!(service_data)
-      print_status("Debug 2: #{credential_data}")
       credential_core = create_credential(credential_data)
 
       # Assemble the options hash for creating the Metasploit::Credential::Login object
       login_data = {
         core: credential_core,
         status: Metasploit::Model::Login::Status::UNTRIED,
-        workspace_id: myworkspace_id
+        # workspace_id: myworkspace_id
       }
 
       login_data.merge!(service_data)
@@ -208,38 +207,36 @@ def report_cred(creds)
     print_status("SMPT credentials saved in: #{loot_path}")
   end
 
-  def report_pop3(pop3)
+  def report_pop3(creds)
     # Build service information
     service_data = {
       # address: session.session_host, # Gives internal IP
       address: session.tunnel_peer.partition(':')[0], # Gives public IP
       port: 110,
       service_name: 'pop3',
       protocol: 'tcp',
+      workspace_id: myworkspace_id
     }
     # Iterate through credentials
-    pop3.each do |cred|
+    creds.each do |cred|
       # Build credential information
       credential_data = {
-        origin_type: :service,
+        origin_type: :session,
         session_id: session_db_id,
         post_reference_name: self.refname,
         private_type: :password,
         private_data: cred[4],
         username: cred[1],
-        workspace_id: myworkspace_id,
         module_fullname: self.fullname
       }
-      vprint_status("Debug 1: #{credential_data}")
       credential_data.merge!(service_data)
-      vprint_status("Debug 2: #{credential_data}")
       credential_core = create_credential(credential_data)
 
       # Assemble the options hash for creating the Metasploit::Credential::Login object
       login_data = {
         core: credential_core,
         status: Metasploit::Model::Login::Status::UNTRIED,
-        workspace_id: myworkspace_id
+        # workspace_id: myworkspace_id
       }
 
       login_data.merge!(service_data)
@@ -254,31 +251,29 @@ def report_pop3(pop3)
     print_status("POP3 credentials saved in: #{loot_path}")
   end
 
-  def report_imap(imap)
+  def report_imap(creds)
     # Build service information
     service_data = {
       # address: session.session_host, # Gives internal IP
       address: session.tunnel_peer.partition(':')[0], # Gives public IP
       port: 143,
       service_name: 'imap',
       protocol: 'tcp',
+      workspace_id: myworkspace_id
     }
     # Iterate through credentials
-    imap.each do |cred|
+    creds.each do |cred|
       # Build credential information
       credential_data = {
-        origin_type: :service,
+        origin_type: :session,
         session_id: session_db_id,
         post_reference_name: self.refname,
         private_type: :password,
         private_data: cred[4],
         username: cred[1],
-        workspace_id: myworkspace_id,
         module_fullname: self.fullname
       }
-      vprint_status("Debug 1: #{credential_data}")
       credential_data.merge!(service_data)
-      vprint_status("Debug 2: #{credential_data}")
       credential_core = create_credential(credential_data)
 
       # Assemble the options hash for creating the Metasploit::Credential::Login object
@@ -312,10 +307,9 @@ def get_mdaemon_creds(userlist)
         'Mail Dir',
         'Password'
       ])
-    creds, imap, pop3 = parse_userlist(userlist)
-    report_cred(creds)
-    report_pop3(pop3)
-    report_imap(imap)
-
+    result = parse_userlist(userlist)
+    report_cred(result[0])
+    report_pop3(result[1])
+    report_imap(result[2])
   end
 end