Land rapid7#4737, fix Socket Context usages

Author: Tod Beardsley

lib/metasploit/framework/ftp/client.rb

@@ -44,7 +44,11 @@ def data_connect(mode = nil, nsock = self.sock)
             # convert port to FTP syntax
             datahost = "#{$1}.#{$2}.#{$3}.#{$4}"
             dataport = ($5.to_i * 256) + $6.to_i
-            self.datasocket = Rex::Socket::Tcp.create('PeerHost' => datahost, 'PeerPort' => dataport)
+            self.datasocket = Rex::Socket::Tcp.create(
+              'PeerHost' => datahost,
+              'PeerPort' => dataport,
+              'Context'  => { 'Msf' => framework, 'MsfExploit' => framework_module }
+            )
           end
           self.datasocket
         end

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

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
+                :Socket => ::Rex::Socket::Udp.create('Context' => { 'Msf' => framework, 'MsfExploit' => framework_module })
             )
 
             result_options[:proof] = test_read_access(snmp_client)

lib/metasploit/framework/tcp/client.rb

@@ -89,7 +89,8 @@ def connect(global = true, opts={})
               'SSL'        =>  dossl,
               'SSLVersion' =>  opts['SSLVersion'] || ssl_version,
               'Proxies'    => proxies,
-              'Timeout'    => (opts['ConnectTimeout'] || connection_timeout || 10).to_i
+              'Timeout'    => (opts['ConnectTimeout'] || connection_timeout || 10).to_i,
+              'Context'    => { 'Msf' => framework, 'MsfExploit' => framework_module }
               )
           # enable evasions on this socket
           set_tcp_evasions(nsock)

lib/msf/core/exploit/ftp.rb

@@ -83,7 +83,11 @@ def data_connect(mode = nil, nsock = self.sock)
       # convert port to FTP syntax
       datahost = "#{$1}.#{$2}.#{$3}.#{$4}"
       dataport = ($5.to_i * 256) + $6.to_i
-      self.datasocket = Rex::Socket::Tcp.create('PeerHost' => datahost, 'PeerPort' => dataport)
+      self.datasocket = Rex::Socket::Tcp.create(
+        'PeerHost' => datahost,
+        'PeerPort' => dataport,
+        'Context'  => { 'Msf' => framework, 'MsfExploit' => self }
+      )
     end
     self.datasocket
   end

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|

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|

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|

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|

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|