Merge branch 'feature/MSP-9732/flashfxp' into staging/electro-release

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

@@ -84,19 +84,32 @@ class Metasploit3 < Msf::Post
         passwd = decrypt(epass)
 
         print_good("*** Host: #{host} Port: #{port} User: #{username}  Password: #{passwd} ***")
-        if session.db_record
+        service_data = {
-          source_id = session.db_record.id
+          address: Rex::Socket.getaddress(host),
-        else
+          port: port,
-          source_id = nil
+          protocol: "tcp",
-        end
+          service_name: "ftp",
-        report_auth_info(
+          workspace_id: myworkspace_id
-          :host  => host,
+        }
-          :port => port,
+
-          :sname => 'ftp',
+        credential_data = {
-          :source_id => source_id,
+          origin_type: :session,
-          :source_type => "exploit",
+          session_id: session_db_id,
-          :user => username,
+          post_reference_name: self.refname,
-          :pass => passwd)
+          username: username,
+          private_data: passwd,
+          private_type: :password
+        }
+
+        credential_core = create_credential(credential_data.merge(service_data))
+
+        login_data = {
+          core: credential_core,
+          access_level: "User",
+          status: Metasploit::Credential::Login::Status::UNTRIED
+        }
+
+        create_credential_login(login_data.merge(service_data))
       end
     rescue
       print_status("Either could not find or could not open file #{filename}")