call new prepend cred methods

David Maloney · David Maloney · commit 00ec47fb836d · 2014-09-04T12:32:35.000-05:00
add method calls o all the lgoinscanner modules
so that they call the prepend_db_* methods as approrpiate
these methods automatically check to see if DB_ALL_CREDS was
selected
diff --git a/modules/auxiliary/scanner/afp/afp_login.rb b/modules/auxiliary/scanner/afp/afp_login.rb
@@ -54,6 +54,8 @@ def run_host(ip)
         user_as_pass: datastore['USER_AS_PASS'],
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::AFP.new(
         host: ip,
         port: rport,
diff --git a/modules/auxiliary/scanner/db2/db2_auth.rb b/modules/auxiliary/scanner/db2/db2_auth.rb
@@ -52,6 +52,8 @@ def run_host(ip)
         realm: datastore['DATABASE']
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::DB2.new(
         host: ip,
         port: rport,
diff --git a/modules/auxiliary/scanner/ftp/ftp_login.rb b/modules/auxiliary/scanner/ftp/ftp_login.rb
@@ -66,6 +66,8 @@ def run_host(ip)
         prepended_creds: anonymous_creds
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::FTP.new(
         host: ip,
         port: rport,
diff --git a/modules/auxiliary/scanner/http/axis_login.rb b/modules/auxiliary/scanner/http/axis_login.rb
@@ -72,6 +72,8 @@ def run_host(ip)
       user_as_pass: datastore['USER_AS_PASS'],
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::Axis2.new(
       host: ip,
       port: rport,
diff --git a/modules/auxiliary/scanner/http/http_login.rb b/modules/auxiliary/scanner/http/http_login.rb
@@ -129,6 +129,8 @@ def run_host(ip)
       user_as_pass: datastore['USER_AS_PASS'],
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::HTTP.new(
       host: ip,
       port: rport,
diff --git a/modules/auxiliary/scanner/http/tomcat_mgr_login.rb b/modules/auxiliary/scanner/http/tomcat_mgr_login.rb
@@ -103,13 +103,17 @@ def run_host(ip)
         user_as_pass: datastore['USER_AS_PASS'],
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::Tomcat.new(
         host: ip,
         port: rport,
         proxies: datastore['PROXIES'],
         cred_details: cred_collection,
         stop_on_success: datastore['STOP_ON_SUCCESS'],
-        connection_timeout: 10
+        connection_timeout: 10,
+        user_agent: datastore['UserAgent'],
+        vhost: datastore['VHOST']
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/mssql/mssql_login.rb b/modules/auxiliary/scanner/mssql/mssql_login.rb
@@ -43,6 +43,8 @@ def run_host(ip)
         realm: datastore['DOMAIN']
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::MSSQL.new(
         host: ip,
         port: rport,
diff --git a/modules/auxiliary/scanner/mysql/mysql_login.rb b/modules/auxiliary/scanner/mysql/mysql_login.rb
@@ -47,6 +47,8 @@ def run_host(ip)
             user_as_pass: datastore['USER_AS_PASS'],
         )
 
+        cred_collection = prepend_db_passwords(cred_collection)
+
         scanner = Metasploit::Framework::LoginScanner::MySQL.new(
             host: ip,
             port: rport,
diff --git a/modules/auxiliary/scanner/pop3/pop3_login.rb b/modules/auxiliary/scanner/pop3/pop3_login.rb
@@ -62,6 +62,8 @@ def run_host(ip)
       user_as_pass: datastore['USER_AS_PASS'],
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::POP3.new(
       host: ip,
       port: rport,
diff --git a/modules/auxiliary/scanner/postgres/postgres_login.rb b/modules/auxiliary/scanner/postgres/postgres_login.rb
@@ -60,6 +60,8 @@ def run_host(ip)
         realm: datastore['DATABASE']
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::Postgres.new(
       host: ip,
       port: rport,
diff --git a/modules/auxiliary/scanner/smb/smb_login.rb b/modules/auxiliary/scanner/smb/smb_login.rb
@@ -96,6 +96,9 @@ def run_host(ip)
       realm: domain,
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+    cred_collection = prepend_db_hashes(cred_collection)
+
     @scanner.cred_details = cred_collection
 
     @scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/ssh/ssh_login.rb b/modules/auxiliary/scanner/ssh/ssh_login.rb
@@ -107,6 +107,8 @@ def run_host(ip)
       user_as_pass: datastore['USER_AS_PASS'],
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::SSH.new(
       host: ip,
       port: rport,
diff --git a/modules/auxiliary/scanner/ssh/ssh_login_pubkey.rb b/modules/auxiliary/scanner/ssh/ssh_login_pubkey.rb
@@ -196,6 +196,8 @@ def run_host(ip)
       username: datastore['USERNAME'],
     )
 
+    keys = prepend_db_keys(keys)
+
     print_brute :level => :vstatus, :ip => ip, :msg => "Testing #{keys.key_data.count} keys"
     scanner = Metasploit::Framework::LoginScanner::SSH.new(
       host: ip,
@@ -236,7 +238,7 @@ def run_host(ip)
 
   end
 
-  class KeyCollection
+  class KeyCollection < Metasploit::Framework::CredentialCollection
     attr_accessor :key_data
 
     def initialize(opts={})
@@ -272,6 +274,8 @@ def valid_key?(key_data)
     end
 
     def each
+      prepended_creds.each { |c| yield c }
+
       if @user_file.present?
         File.open(@user_file, 'rb') do |user_fd|
           user_fd.each_line do |user_from_file|
diff --git a/modules/auxiliary/scanner/telnet/telnet_login.rb b/modules/auxiliary/scanner/telnet/telnet_login.rb
@@ -57,6 +57,8 @@ def run_host(ip)
         user_as_pass: datastore['USER_AS_PASS'],
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::Telnet.new(
         host: ip,
         port: rport,
diff --git a/modules/auxiliary/scanner/vnc/vnc_login.rb b/modules/auxiliary/scanner/vnc/vnc_login.rb
@@ -68,6 +68,8 @@ def run_host(ip)
         user_as_pass: datastore['USER_AS_PASS']
     )
 
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::VNC.new(
         host: ip,
         port: rport,
diff --git a/modules/auxiliary/scanner/winrm/winrm_login.rb b/modules/auxiliary/scanner/winrm/winrm_login.rb
@@ -50,6 +50,9 @@ def run_host(ip)
       user_as_pass: datastore['USER_AS_PASS'],
       realm: datastore['DOMAIN'],
     )
+
+    cred_collection = prepend_db_passwords(cred_collection)
+
     scanner = Metasploit::Framework::LoginScanner::WinRM.new(
       host: ip,
       port: rport,

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ def run_host(ip)`
`54`	`54`	`user_as_pass: datastore['USER_AS_PASS'],`
`55`	`55`	`)`
`56`	`56`
	`57`	`+ cred_collection = prepend_db_passwords(cred_collection)`
	`58`	`+`
`57`	`59`	`scanner = Metasploit::Framework::LoginScanner::AFP.new(`
`58`	`60`	`host: ip,`
`59`	`61`	`port: rport,`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@ def run_host(ip)`
`52`	`52`	`realm: datastore['DATABASE']`
`53`	`53`	`)`
`54`	`54`
	`55`	`+ cred_collection = prepend_db_passwords(cred_collection)`
	`56`	`+`
`55`	`57`	`scanner = Metasploit::Framework::LoginScanner::DB2.new(`
`56`	`58`	`host: ip,`
`57`	`59`	`port: rport,`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ def run_host(ip)`
`66`	`66`	`prepended_creds: anonymous_creds`
`67`	`67`	`)`
`68`	`68`
	`69`	`+ cred_collection = prepend_db_passwords(cred_collection)`
	`70`	`+`
`69`	`71`	`scanner = Metasploit::Framework::LoginScanner::FTP.new(`
`70`	`72`	`host: ip,`
`71`	`73`	`port: rport,`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ def run_host(ip)`
`72`	`72`	`user_as_pass: datastore['USER_AS_PASS'],`
`73`	`73`	`)`
`74`	`74`
	`75`	`+ cred_collection = prepend_db_passwords(cred_collection)`
	`76`	`+`
`75`	`77`	`scanner = Metasploit::Framework::LoginScanner::Axis2.new(`
`76`	`78`	`host: ip,`
`77`	`79`	`port: rport,`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,8 @@ def run_host(ip)`
`129`	`129`	`user_as_pass: datastore['USER_AS_PASS'],`
`130`	`130`	`)`
`131`	`131`
	`132`	`+ cred_collection = prepend_db_passwords(cred_collection)`
	`133`	`+`
`132`	`134`	`scanner = Metasploit::Framework::LoginScanner::HTTP.new(`
`133`	`135`	`host: ip,`
`134`	`136`	`port: rport,`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ def run_host(ip)`
`43`	`43`	`realm: datastore['DOMAIN']`
`44`	`44`	`)`
`45`	`45`
	`46`	`+ cred_collection = prepend_db_passwords(cred_collection)`
	`47`	`+`
`46`	`48`	`scanner = Metasploit::Framework::LoginScanner::MSSQL.new(`
`47`	`49`	`host: ip,`
`48`	`50`	`port: rport,`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ def run_host(ip)`
`47`	`47`	`user_as_pass: datastore['USER_AS_PASS'],`
`48`	`48`	`)`
`49`	`49`
	`50`	`+ cred_collection = prepend_db_passwords(cred_collection)`
	`51`	`+`
`50`	`52`	`scanner = Metasploit::Framework::LoginScanner::MySQL.new(`
`51`	`53`	`host: ip,`
`52`	`54`	`port: rport,`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ def run_host(ip)`
`62`	`62`	`user_as_pass: datastore['USER_AS_PASS'],`
`63`	`63`	`)`
`64`	`64`
	`65`	`+ cred_collection = prepend_db_passwords(cred_collection)`
	`66`	`+`
`65`	`67`	`scanner = Metasploit::Framework::LoginScanner::POP3.new(`
`66`	`68`	`host: ip,`
`67`	`69`	`port: rport,`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ def run_host(ip)`
`60`	`60`	`realm: datastore['DATABASE']`
`61`	`61`	`)`
`62`	`62`
	`63`	`+ cred_collection = prepend_db_passwords(cred_collection)`
	`64`	`+`
`63`	`65`	`scanner = Metasploit::Framework::LoginScanner::Postgres.new(`
`64`	`66`	`host: ip,`
`65`	`67`	`port: rport,`