Pass the framework/module down into LoginScanner

HD Moore · HD Moore · commit 8d982e328663 · 2015-02-07T11:50:30.000-06:00
diff --git a/lib/metasploit/framework/ftp/client.rb b/lib/metasploit/framework/ftp/client.rb
@@ -47,7 +47,7 @@ def data_connect(mode = nil, nsock = self.sock)
             self.datasocket = Rex::Socket::Tcp.create(
               'PeerHost' => datahost,
               'PeerPort' => dataport,
-              'Context'  => { 'Msf' => framework, 'MsfExploit' => self }
+              'Context'  => { 'Msf' => framework, 'MsfExploit' => framework_module }
             )
           end
           self.datasocket
diff --git a/lib/metasploit/framework/login_scanner/base.rb b/lib/metasploit/framework/login_scanner/base.rb
@@ -12,6 +12,12 @@ module Base
         include ActiveModel::Validations
 
         included do
+          # @!attribute framework
+          #   @return [Object] The framework instance object
+          attr_accessor :framework
+          # @!attribute framework_module
+          #   @return [Object] The framework module caller, if availale
+          attr_accessor :framework_module
           # @!attribute connection_timeout
           #   @return [Fixnum] The timeout in seconds for a single SSH connection
           attr_accessor :connection_timeout
diff --git a/lib/metasploit/framework/login_scanner/snmp.rb b/lib/metasploit/framework/login_scanner/snmp.rb
@@ -38,7 +38,7 @@ def attempt_login(credential)
                 :Timeout => connection_timeout,
                 :Retries => 2,
                 :Transport => ::SNMP::RexUDPTransport,
-                :Socket => ::Rex::Socket::Udp.create('Context' => { 'Msf' => framework, 'MsfExploit' => self })
+                :Socket => ::Rex::Socket::Udp.create('Context' => { 'Msf' => framework, 'MsfExploit' => framework_module })
             )
 
             result_options[:proof] = test_read_access(snmp_client)
diff --git a/lib/metasploit/framework/tcp/client.rb b/lib/metasploit/framework/tcp/client.rb
@@ -90,7 +90,7 @@ def connect(global = true, opts={})
               'SSLVersion' =>  opts['SSLVersion'] || ssl_version,
               'Proxies'    => proxies,
               'Timeout'    => (opts['ConnectTimeout'] || connection_timeout || 10).to_i,
-              'Context'    => { 'Msf' => framework, 'MsfExploit' => self }
+              'Context'    => { 'Msf' => framework, 'MsfExploit' => framework_module }
               )
           # enable evasions on this socket
           set_tcp_evasions(nsock)
diff --git a/modules/auxiliary/scanner/acpp/login.rb b/modules/auxiliary/scanner/acpp/login.rb
@@ -71,7 +71,9 @@ def run_host(ip)
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
       connection_timeout: datastore['ConnectTimeout'],
       max_send_size: datastore['TCP::max_send_size'],
-      send_delay: datastore['TCP::send_delay']
+      send_delay: datastore['TCP::send_delay'],
+      framework: framework,
+      framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/afp/afp_login.rb b/modules/auxiliary/scanner/afp/afp_login.rb
@@ -67,6 +67,8 @@ def run_host(ip)
         connection_timeout: 30,
         max_send_size: datastore['TCP::max_send_size'],
         send_delay: datastore['TCP::send_delay'],
+        framework: framework,
+        framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/db2/db2_auth.rb b/modules/auxiliary/scanner/db2/db2_auth.rb
@@ -65,6 +65,8 @@ def run_host(ip)
         connection_timeout: 30,
         max_send_size: datastore['TCP::max_send_size'],
         send_delay: datastore['TCP::send_delay'],
+        framework: framework,
+        framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/ftp/ftp_login.rb b/modules/auxiliary/scanner/ftp/ftp_login.rb
@@ -78,7 +78,9 @@ def run_host(ip)
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         max_send_size: datastore['TCP::max_send_size'],
         send_delay: datastore['TCP::send_delay'],
-        connection_timeout: 30
+        connection_timeout: 30,
+        framework: framework,
+        framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/http/appletv_login.rb b/modules/auxiliary/scanner/http/appletv_login.rb
@@ -83,6 +83,8 @@ def run_host(ip)
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5,
+        framework: framework,
+        framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/http/axis_login.rb b/modules/auxiliary/scanner/http/axis_login.rb
@@ -88,7 +88,9 @@ def run_host(ip)
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
       connection_timeout: 5,
       user_agent: datastore['UserAgent'],
-      vhost: datastore['VHOST']
+      vhost: datastore['VHOST'],
+      framework: framework,
+      framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/http/buffalo_login.rb b/modules/auxiliary/scanner/http/buffalo_login.rb
@@ -52,7 +52,9 @@ def run_host(ip)
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
       connection_timeout: 10,
       user_agent: datastore['UserAgent'],
-      vhost: datastore['VHOST']
+      vhost: datastore['VHOST'],
+      framework: framework,
+      framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/http/glassfish_login.rb b/modules/auxiliary/scanner/http/glassfish_login.rb
@@ -101,7 +101,9 @@ def init_loginscanner(ip)
       cred_details:       @cred_collection,
       stop_on_success:    datastore['STOP_ON_SUCCESS'],
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
-      connection_timeout: 5
+      connection_timeout: 5,
+      framework: framework,
+      framework_module: self,
     )
 
     @scanner.ssl         = datastore['SSL']
diff --git a/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb b/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
@@ -83,7 +83,9 @@ def init_loginscanner(ip)
       cred_details:       @cred_collection,
       stop_on_success:    datastore['STOP_ON_SUCCESS'],
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
-      connection_timeout: 5
+      connection_timeout: 5,
+      framework: framework,
+      framework_module: self,
     )
 
     @scanner.ssl         = datastore['SSL']
diff --git a/modules/auxiliary/scanner/http/http_login.rb b/modules/auxiliary/scanner/http/http_login.rb
@@ -163,7 +163,9 @@ def run_host(ip)
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
       connection_timeout: 5,
       user_agent: datastore['UserAgent'],
-      vhost: datastore['VHOST']
+      vhost: datastore['VHOST'],
+      framework: framework,
+      framework_module: self,
     )
 
     msg = scanner.check_setup
diff --git a/modules/auxiliary/scanner/http/ipboard_login.rb b/modules/auxiliary/scanner/http/ipboard_login.rb
@@ -47,7 +47,9 @@ def run_host(ip)
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5,
         user_agent: datastore['UserAgent'],
-        vhost: datastore['VHOST']
+        vhost: datastore['VHOST'],
+        framework: framework,
+        framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/http/jenkins_login.rb b/modules/auxiliary/scanner/http/jenkins_login.rb
@@ -51,7 +51,9 @@ def run_host(ip)
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
       connection_timeout: 10,
       user_agent: datastore['UserAgent'],
-      vhost: datastore['VHOST']
+      vhost: datastore['VHOST'],
+      framework: framework,
+      framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/http/mybook_live_login.rb b/modules/auxiliary/scanner/http/mybook_live_login.rb
@@ -63,7 +63,9 @@ def run_host(ip)
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
       connection_timeout: 10,
       user_agent: datastore['UserAgent'],
-      vhost: datastore['VHOST']
+      vhost: datastore['VHOST'],
+      framework: framework,
+      framework_module: self,
     )
 
     if ssl
diff --git a/modules/auxiliary/scanner/http/tomcat_mgr_login.rb b/modules/auxiliary/scanner/http/tomcat_mgr_login.rb
@@ -114,7 +114,9 @@ def run_host(ip)
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 10,
         user_agent: datastore['UserAgent'],
-        vhost: datastore['VHOST']
+        vhost: datastore['VHOST'],
+        framework: framework,
+        framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/http/wordpress_xmlrpc_login.rb b/modules/auxiliary/scanner/http/wordpress_xmlrpc_login.rb
@@ -72,6 +72,8 @@ def run_host(ip)
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5,
+        framework: framework,
+        framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/mssql/mssql_login.rb b/modules/auxiliary/scanner/mssql/mssql_login.rb
@@ -55,7 +55,9 @@ def run_host(ip)
         connection_timeout: 30,
         max_send_size: datastore['TCP::max_send_size'],
         send_delay: datastore['TCP::send_delay'],
-        windows_authentication: datastore['USE_WINDOWS_AUTHENT']
+        windows_authentication: datastore['USE_WINDOWS_AUTHENT'],
+        framework: framework,
+        framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/mysql/mysql_login.rb b/modules/auxiliary/scanner/mysql/mysql_login.rb
@@ -64,6 +64,8 @@ def run_host(ip)
             connection_timeout: 30,
             max_send_size: datastore['TCP::max_send_size'],
             send_delay: datastore['TCP::send_delay'],
+            framework: framework,
+            framework_module: self,
         )
 
         scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/pop3/pop3_login.rb b/modules/auxiliary/scanner/pop3/pop3_login.rb
@@ -74,6 +74,8 @@ def run_host(ip)
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
       max_send_size: datastore['TCP::max_send_size'],
       send_delay: datastore['TCP::send_delay'],
+      framework: framework,
+      framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/postgres/postgres_login.rb b/modules/auxiliary/scanner/postgres/postgres_login.rb
@@ -70,7 +70,9 @@ def run_host(ip)
       cred_details: cred_collection,
       stop_on_success: datastore['STOP_ON_SUCCESS'],
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
-      connection_timeout: 30
+      connection_timeout: 30,
+      framework: framework,
+      framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/smb/smb_login.rb b/modules/auxiliary/scanner/smb/smb_login.rb
@@ -77,6 +77,8 @@ def run_host(ip)
       connection_timeout: 5,
       max_send_size: datastore['TCP::max_send_size'],
       send_delay: datastore['TCP::send_delay'],
+      framework: framework,
+      framework_module: self,
     )
 
     bogus_result = @scanner.attempt_bogus_login(domain)
diff --git a/modules/auxiliary/scanner/snmp/snmp_login.rb b/modules/auxiliary/scanner/snmp/snmp_login.rb
@@ -61,7 +61,9 @@ def run_batch(batch)
           cred_details: collection,
           stop_on_success: datastore['STOP_ON_SUCCESS'],
           bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
-          connection_timeout: 2
+          connection_timeout: 2,
+          framework: framework,
+          framework_module: self,
       )
 
       scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/ssh/ssh_login.rb b/modules/auxiliary/scanner/ssh/ssh_login.rb
@@ -117,6 +117,8 @@ def run_host(ip)
       stop_on_success: datastore['STOP_ON_SUCCESS'],
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
       connection_timeout: datastore['SSH_TIMEOUT'],
+      framework: framework,
+      framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/ssh/ssh_login_pubkey.rb b/modules/auxiliary/scanner/ssh/ssh_login_pubkey.rb
@@ -210,6 +210,8 @@ def run_host(ip)
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
       proxies: datastore['Proxies'],
       connection_timeout: datastore['SSH_TIMEOUT'],
+      framework: framework,
+      framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/telnet/telnet_login.rb b/modules/auxiliary/scanner/telnet/telnet_login.rb
@@ -70,6 +70,8 @@ def run_host(ip)
         send_delay: datastore['TCP::send_delay'],
         banner_timeout: datastore['TelnetBannerTimeout'],
         telnet_timeout: datastore['TelnetTimeout']
+        framework: framework,
+        framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/vmware/vmauthd_login.rb b/modules/auxiliary/scanner/vmware/vmauthd_login.rb
@@ -76,6 +76,8 @@ def run_host(ip)
       connection_timeout: 30,
       max_send_size: datastore['TCP::max_send_size'],
       send_delay: datastore['TCP::send_delay'],
+      framework: framework,
+      framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/vnc/vnc_login.rb b/modules/auxiliary/scanner/vnc/vnc_login.rb
@@ -81,6 +81,8 @@ def run_host(ip)
         connection_timeout: datastore['ConnectTimeout'],
         max_send_size: datastore['TCP::max_send_size'],
         send_delay: datastore['TCP::send_delay'],
+        framework: framework,
+        framework_module: self,
     )
 
     scanner.scan! do |result|
diff --git a/modules/auxiliary/scanner/winrm/winrm_login.rb b/modules/auxiliary/scanner/winrm/winrm_login.rb
@@ -61,6 +61,8 @@ def run_host(ip)
       stop_on_success: datastore['STOP_ON_SUCCESS'],
       bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
       connection_timeout: 10,
+      framework: framework,
+      framework_module: self,
     )
 
     scanner.scan! do |result|

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ def data_connect(mode = nil, nsock = self.sock)`
`47`	`47`	`self.datasocket = Rex::Socket::Tcp.create(`
`48`	`48`	`'PeerHost' => datahost,`
`49`	`49`	`'PeerPort' => dataport,`
`50`		`- 'Context' => { 'Msf' => framework, 'MsfExploit' => self }`
	`50`	`+ 'Context' => { 'Msf' => framework, 'MsfExploit' => framework_module }`
`51`	`51`	`)`
`52`	`52`	`end`
`53`	`53`	`self.datasocket`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ def attempt_login(credential)`
`38`	`38`	`:Timeout => connection_timeout,`
`39`	`39`	`:Retries => 2,`
`40`	`40`	`:Transport => ::SNMP::RexUDPTransport,`
`41`		`- :Socket => ::Rex::Socket::Udp.create('Context' => { 'Msf' => framework, 'MsfExploit' => self })`
	`41`	`+ :Socket => ::Rex::Socket::Udp.create('Context' => { 'Msf' => framework, 'MsfExploit' => framework_module })`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`result_options[:proof] = test_read_access(snmp_client)`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ def connect(global = true, opts={})`
`90`	`90`	`'SSLVersion' => opts['SSLVersion'] \|\| ssl_version,`
`91`	`91`	`'Proxies' => proxies,`
`92`	`92`	`'Timeout' => (opts['ConnectTimeout'] \|\| connection_timeout \|\| 10).to_i,`
`93`		`- 'Context' => { 'Msf' => framework, 'MsfExploit' => self }`
	`93`	`+ 'Context' => { 'Msf' => framework, 'MsfExploit' => framework_module }`
`94`	`94`	`)`
`95`	`95`	`# enable evasions on this socket`
`96`	`96`	`set_tcp_evasions(nsock)`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ def run_host(ip)`
`67`	`67`	`connection_timeout: 30,`
`68`	`68`	`max_send_size: datastore['TCP::max_send_size'],`
`69`	`69`	`send_delay: datastore['TCP::send_delay'],`
	`70`	`+ framework: framework,`
	`71`	`+ framework_module: self,`
`70`	`72`	`)`
`71`	`73`
`72`	`74`	`scanner.scan! do \|result\|`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ def run_host(ip)`
`65`	`65`	`connection_timeout: 30,`
`66`	`66`	`max_send_size: datastore['TCP::max_send_size'],`
`67`	`67`	`send_delay: datastore['TCP::send_delay'],`
	`68`	`+ framework: framework,`
	`69`	`+ framework_module: self,`
`68`	`70`	`)`
`69`	`71`
`70`	`72`	`scanner.scan! do \|result\|`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,8 @@ def run_host(ip)`
`83`	`83`	`stop_on_success: datastore['STOP_ON_SUCCESS'],`
`84`	`84`	`bruteforce_speed: datastore['BRUTEFORCE_SPEED'],`
`85`	`85`	`connection_timeout: 5,`
	`86`	`+ framework: framework,`
	`87`	`+ framework_module: self,`
`86`	`88`	`)`
`87`	`89`
`88`	`90`	`scanner.scan! do \|result\|`