Land rapid7#5045 : Convert stageless proxy to new format

Author: OJ

lib/rex/payloads/meterpreter/patch.rb

@@ -63,7 +63,7 @@ def self.patch_proxy!(blob, proxyhost, proxyport, proxy_type)
             if proxyport == "80"
               proxyinfo = proxyhost
             end
-            if proxy_type.to_s == 'HTTP'
+            if proxy_type.to_s.upcase == 'HTTP'
               proxyinfo = 'http://' + proxyinfo
             else #socks
               proxyinfo = 'socks=' + proxyinfo
@@ -76,17 +76,21 @@ def self.patch_proxy!(blob, proxyhost, proxyport, proxy_type)
         # Proxy authentification
         def self.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
-            proxy_type == 'SOCKS'
+          return if proxy_type.nil? || proxy_type.upcase == 'SOCKS'
 
-            patch_string!(blob, "METERPRETER_USERNAME_PROXY#{"\x00" * 10}",
+          if proxy_username && !proxy_username.empty?
+            unless patch_string!(blob, "METERPRETER_USERNAME_PROXY#{"\x00" * 10}",
                           proxy_username + "\x00")
+              raise ArgumentError, "Unable to patch Proxy Username"
+            end
+          end
 
-            patch_string!(blob, "METERPRETER_PASSWORD_PROXY#{"\x00" * 10}",
+          if proxy_password && !proxy_password.empty?
+            unless patch_string!(blob, "METERPRETER_PASSWORD_PROXY#{"\x00" * 10}",
                           proxy_password + "\x00")
+              raise ArgumentError, "Unable to patch Proxy Password"
+            end
           end
-
         end
 
         # Patch the ssl cert hash

modules/payloads/singles/windows/meterpreter_reverse_https.rb

@@ -66,11 +66,11 @@ def generate
         :expiration     => datastore['SessionExpirationTimeout'].to_i,
         :comm_timeout   => datastore['SessionCommunicationTimeout'].to_i,
         :ua             => datastore['MeterpreterUserAgent'],
-        :proxyhost      => datastore['PROXYHOST'],
-        :proxyport      => datastore['PROXYPORT'],
-        :proxy_type     => datastore['PROXY_TYPE'],
-        :proxy_username => datastore['PROXY_USERNAME'],
-        :proxy_password => datastore['PROXY_PASSWORD'])
+        :proxy_host     => datastore['PayloadProxyHost'],
+        :proxy_port     => datastore['PayloadProxyPort'],
+        :proxy_type     => datastore['PayloadProxyType'],
+        :proxy_user     => datastore['PayloadProxyUser'],
+        :proxy_pass     => datastore['PayloadProxyPass'])
     end
 
   end