Mitigates excessive use of lookup operator (hopefully adds clarity)

Author: veritysr

lib/rex/payloads/meterpreter/patch.rb

@@ -11,7 +11,7 @@ module Meterpreter
       module Patch
 
         # Replace the transport string
-        def self.patch_transport blob, ssl
+        def patch_transport! blob, ssl
 
           i = blob.index("METERPRETER_TRANSPORT_SSL")
           if i
@@ -23,7 +23,7 @@ def self.patch_transport blob, ssl
         end
 
         # Replace the URL
-        def self.patch_url blob, url
+        def patch_url! blob, url
 
           i = blob.index("https://" + ("X" * 256))
           if i
@@ -35,7 +35,7 @@ def self.patch_url blob, url
         end
 
         # Replace the session expiration timeout
-        def self.patch_expiration blob, expiration
+        def patch_expiration! blob, expiration
 
           i = blob.index([0xb64be661].pack("V"))
           if i
@@ -47,7 +47,7 @@ def self.patch_expiration blob, expiration
         end
 
         # Replace the session communication timeout
-        def self.patch_comm_timeout blob, comm_timeout
+        def patch_comm_timeout! blob, comm_timeout
 
           i = blob.index([0xaf79257f].pack("V"))
           if i
@@ -59,7 +59,7 @@ def self.patch_comm_timeout blob, comm_timeout
         end
 
         # Replace the user agent string with our option
-        def self.patch_ua blob, ua
+        def patch_ua! blob, ua
 
           i = blob.index("METERPRETER_UA\x00")
           if i
@@ -70,7 +70,7 @@ def self.patch_ua blob, ua
         end
 
         # Activate a custom proxy
-        def self.patch_proxy blob, proxyhost, proxyport, proxy_type
+        def patch_proxy! blob, proxyhost, proxyport, proxy_type
 
           i = blob.index("METERPRETER_PROXY\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")
           if i
@@ -97,7 +97,7 @@ def self.patch_proxy blob, proxyhost, proxyport, proxy_type
         end
 
         # Proxy authentification
-        def self.patch_proxy_auth blob, proxy_username, proxy_password, proxy_type
+        def patch_proxy_auth! blob, proxy_username, proxy_password, proxy_type
 
           unless (proxy_username.nil? or proxy_username.empty?) or
             (proxy_password.nil? or proxy_password.empty?) or

lib/rex/post/meterpreter/client_core.rb

@@ -231,45 +231,35 @@ def migrate( pid )
 
     if client.passive_service
 
+      blob.extend(Rex::Payloads::Meterpreter::Patch)
+
       # Replace the transport string first (TRANSPORT_SOCKET_SSL)
-      blob = Rex::Payloads::Meterpreter::Patch.patch_transport(
-        blob,
-        client.ssl
-      )
+      blob.patch_transport!(blob, client.ssl)
 
       # Replace the URL
-      blob = Rex::Payloads::Meterpreter::Patch.patch_url(
-        blob,
-        self.client.url
-      )
+      blob.patch_url!(blob, self.client.url)
 
       # Replace the session expiration timeout
-      blob = Rex::Payloads::Meterpreter::Patch.patch_expiration(
-        blob,
-        self.client.expiration
-      ) 
+      blob.patch_expiration!(blob, self.client.expiration)
 
       # Replace the session communication timeout
-      blob = Rex::Payloads::Meterpreter::Patch.patch_comm_timeout(
-        blob,
-        self.client.comm_timeout
-      )
+      blob.patch_comm_timeout!(blob, self.client.comm_timeout)
 
       # Replace the user agent string with our option
-      blob, i = Rex::Payloads::Meterpreter::Patch.patch_ua(
+      blob.patch_ua!(
         blob,
         client.exploit_datastore['MeterpreterUserAgent'][0,255] + "\x00"
       )
 
       # Activate a custom proxy
-      blob, i = Rex::Payloads::Meterpreter::Patch.patch_proxy(
+      blob.patch_proxy!(
         blob,
         client.exploit_datastore['PROXYHOST'],
         client.exploit_datastore['PROXYPORT'],
         client.exploit_datastore['PROXY_TYPE']
       )
       # Proxy authentication
-      blob = Rex::Payloads::Meterpreter::Patch.patch_proxy_auth(
+      blob.patch_proxy_auth!(
         blob,
         client.exploit_datastore['PROXY_USERNAME'],
         client.exploit_datastore['PROXY_PASSWORD'],