diff --git a/modules/post/windows/gather/credentials/coreftp.rb b/modules/post/windows/gather/credentials/coreftp.rb index dfe227c0c2..41341becbf 100644 --- a/modules/post/windows/gather/credentials/coreftp.rb +++ b/modules/post/windows/gather/credentials/coreftp.rb @@ -59,9 +59,15 @@ class Metasploit3 < Msf::Post print_good("Host: #{host} Port: #{port} User: #{user} Password: #{pass}") auth = { - :host => host, :port => port, :sname => 'ftp', - :user => user, :pass => pass, - :type => 'password', :active => true + :host => host, + :port => port, + :sname => 'ftp', + :user => user, + :pass => pass, + :type => 'password', + :source_id => session.db_record.id, + :source_type => "exploit", + :active => true } report_auth_info(auth) end diff --git a/modules/post/windows/gather/credentials/credential_collector.rb b/modules/post/windows/gather/credentials/credential_collector.rb index 7f7cd5dfea..be42930a54 100644 --- a/modules/post/windows/gather/credentials/credential_collector.rb +++ b/modules/post/windows/gather/credentials/credential_collector.rb @@ -63,6 +63,8 @@ class Metasploit3 < Msf::Post data[:user] = hash.user_name data[:pass] = hash.lanman + ":" + hash.ntlm data[:type] = "smb_hash" + data[:source_id] = session.db_record.id, + data[:source_type] = "exploit", data[:active] = true print_line " Extracted: #{data[:user]}:#{data[:pass]}" diff --git a/modules/post/windows/gather/credentials/enum_cred_store.rb b/modules/post/windows/gather/credentials/enum_cred_store.rb index 9ab7f0aed4..15b272f712 100644 --- a/modules/post/windows/gather/credentials/enum_cred_store.rb +++ b/modules/post/windows/gather/credentials/enum_cred_store.rb @@ -166,6 +166,8 @@ class Metasploit3 < Msf::Post :user => cred["username"], :pass => cred["password"], :type => 'password', + :source_id => session.db_record.id, + :source_type => "exploit", :active => true } diff --git a/modules/post/windows/gather/credentials/epo_sql.rb b/modules/post/windows/gather/credentials/epo_sql.rb index b80fa21995..646747db51 100644 --- a/modules/post/windows/gather/credentials/epo_sql.rb +++ b/modules/post/windows/gather/credentials/epo_sql.rb @@ -148,6 +148,8 @@ class Metasploit3 < Msf::Post :sname => 'mssql', :user => full_user, :pass => plaintext_passwd, + :source_id => session.db_record.id, + :source_type => "exploit", :active => true ) print_good("Added credentials to report database") diff --git a/modules/post/windows/gather/credentials/filezilla_server.rb b/modules/post/windows/gather/credentials/filezilla_server.rb index eb7f428ef5..3cf26f8402 100644 --- a/modules/post/windows/gather/credentials/filezilla_server.rb +++ b/modules/post/windows/gather/credentials/filezilla_server.rb @@ -157,6 +157,8 @@ class Metasploit3 < Msf::Post :user => cred['user'], :pass => cred['password'], :ptype => "MD5 hash", + :source_id => session.db_record.id, + :source_type => "exploit", :target_host => config['ftp_bindip'], :target_port => config['ftp_port'] ) @@ -190,6 +192,8 @@ class Metasploit3 < Msf::Post :user => 'admin', :pass => config['admin_pass'], :type => "password", + :source_id => session.db_record.id, + :source_type => "exploit", :target_host => config['admin_bindip'], :target_port => config['admin_port'] ) diff --git a/modules/post/windows/gather/credentials/flashfxp.rb b/modules/post/windows/gather/credentials/flashfxp.rb index e348e67f47..12e773874f 100644 --- a/modules/post/windows/gather/credentials/flashfxp.rb +++ b/modules/post/windows/gather/credentials/flashfxp.rb @@ -93,6 +93,8 @@ class Metasploit3 < Msf::Post :host => host, :port => port, :sname => 'FTP', + :source_id => session.db_record.id, + :source_type => "exploit", :user => username, :pass => passwd) end diff --git a/modules/post/windows/gather/credentials/ftpnavigator.rb b/modules/post/windows/gather/credentials/ftpnavigator.rb index dcf20dd434..1ac4f18eae 100644 --- a/modules/post/windows/gather/credentials/ftpnavigator.rb +++ b/modules/post/windows/gather/credentials/ftpnavigator.rb @@ -79,6 +79,8 @@ class Metasploit3 < Msf::Post :host => server, :port => port, :sname => 'ftp', + :source_id => session.db_record.id, + :source_type => "exploit", :user => username, :pass => dpass ) diff --git a/modules/post/windows/gather/credentials/mremote.rb b/modules/post/windows/gather/credentials/mremote.rb index 800a69b123..0feef44ebb 100644 --- a/modules/post/windows/gather/credentials/mremote.rb +++ b/modules/post/windows/gather/credentials/mremote.rb @@ -91,6 +91,8 @@ class Metasploit3 < Msf::Post :host => host, :port => port, :sname => proto, + :source_id => session.db_record.id, + :source_type => "exploit", :user => user, :pass => pass) end diff --git a/modules/post/windows/gather/credentials/outlook.rb b/modules/post/windows/gather/credentials/outlook.rb index d9d1f99c61..1e32a354b3 100644 --- a/modules/post/windows/gather/credentials/outlook.rb +++ b/modules/post/windows/gather/credentials/outlook.rb @@ -308,6 +308,8 @@ class Metasploit3 < Msf::Post :host => host, :port => portnum, :sname => type, + :source_id => session.db_record.id, + :source_type => "exploit", :user => user, :pass => pass) #print_status("CHK report_auth_info: host = #{host}, port= #{portnum}, sname= #{type}, user= #{user}, pass= #{pass}") @@ -318,6 +320,8 @@ class Metasploit3 < Msf::Post :host => smtp_server, :port => smtp_port, :sname => "SMTP", + :source_id => session.db_record.id, + :source_type => "exploit", :user => smtp_user, :pass => smtp_decrypted_password) #print_status("SMTP report_auth_info: host = #{smtp_server}, port= #{smtp_port}, sname= SMTP, user= #{smtp_user}, pass= #{smtp_decrypted_password}") diff --git a/modules/post/windows/gather/credentials/smartftp.rb b/modules/post/windows/gather/credentials/smartftp.rb index 3c80983fd8..597ad013ee 100644 --- a/modules/post/windows/gather/credentials/smartftp.rb +++ b/modules/post/windows/gather/credentials/smartftp.rb @@ -116,6 +116,8 @@ class Metasploit3 < Msf::Post report_auth_info( :host => host, :port => port, + :source_id => session.db_record.id, + :source_type => "exploit", :user => user, :pass => pass ) diff --git a/modules/post/windows/gather/credentials/total_commander.rb b/modules/post/windows/gather/credentials/total_commander.rb index 94d7e8db52..e19d9ced89 100644 --- a/modules/post/windows/gather/credentials/total_commander.rb +++ b/modules/post/windows/gather/credentials/total_commander.rb @@ -160,6 +160,8 @@ class Metasploit3 < Msf::Post :host => host, :port => port, :sname => 'FTP', + :source_id => session.db_record.id, + :source_type => "exploit", :user => username, :pass => passwd ) diff --git a/modules/post/windows/gather/credentials/vnc.rb b/modules/post/windows/gather/credentials/vnc.rb index b5781a85ac..c999438e45 100644 --- a/modules/post/windows/gather/credentials/vnc.rb +++ b/modules/post/windows/gather/credentials/vnc.rb @@ -231,6 +231,8 @@ class Metasploit3 < Msf::Post :sname => 'vnc', :pass => "#{e[:pass]}", :port => "#{e[:port]}", + :source_id => session.db_record.id, + :source_type => "exploit", :type => 'password' ) end @@ -241,6 +243,8 @@ class Metasploit3 < Msf::Post :sname => 'vnc', :viewonly_pass => "#{e[:viewonly_pass]}", :port => "#{e[:port]}", + :source_id => session.db_record.id, + :source_type => "exploit", :type => 'password_ro' ) end diff --git a/modules/post/windows/gather/credentials/winscp.rb b/modules/post/windows/gather/credentials/winscp.rb index bcf4753c89..b2f89f3382 100644 --- a/modules/post/windows/gather/credentials/winscp.rb +++ b/modules/post/windows/gather/credentials/winscp.rb @@ -99,6 +99,8 @@ class Metasploit3 < Msf::Post :host => host, :port => portnum, :sname => proto, + :source_id => session.db_record.id, + :source_type => "exploit", :user => user, :pass => pass ) @@ -164,6 +166,8 @@ class Metasploit3 < Msf::Post :host => host, :port => portnum, :sname => proto, + :source_id => session.db_record.id, + :source_type => "exploit", :user => user, :pass => pass ) diff --git a/modules/post/windows/gather/credentials/wsftp_client.rb b/modules/post/windows/gather/credentials/wsftp_client.rb index fb4b7dea15..b95dd6f4a6 100644 --- a/modules/post/windows/gather/credentials/wsftp_client.rb +++ b/modules/post/windows/gather/credentials/wsftp_client.rb @@ -76,6 +76,8 @@ class Metasploit3 < Msf::Post :host => host, :port => port, :sname => 'FTP', + :source_id => session.db_record.id, + :source_type => "exploit", :user => username, :pass => passwd) end