Switch PROXY_HOST to PROXY_URL which is more accurate

Still not fully accurate though since socks seems to be prefixed with
socks= and not socks://

Author: zeroSteiner

lib/rex/payloads/meterpreter/config.rb

@@ -100,14 +100,14 @@ def add_c2_tlv(tlv, opts)
     # if the transport URI is for a HTTP payload we need to add a stack
     # of other stuff that can only be set in MSF, not in the C2 profile
     if url.start_with?('http')
-      proxy_host = ''
+      proxy_url = ''
       if opts[:proxy_host] && opts[:proxy_port]
         prefix = 'http://'
         prefix = 'socks=' if opts[:proxy_type].to_s.downcase == 'socks'
-        proxy_host = "#{prefix}#{opts[:proxy_host]}:#{opts[:proxy_port]}"
+        proxy_url = "#{prefix}#{opts[:proxy_host]}:#{opts[:proxy_port]}"
       end
 
-      c2_tlv.add_tlv(MET::TLV_TYPE_C2_PROXY_HOST, proxy_host) unless (proxy_host || '').empty?
+      c2_tlv.add_tlv(MET::TLV_TYPE_C2_PROXY_URL, proxy_url) unless (proxy_url || '').empty?
       c2_tlv.add_tlv(MET::TLV_TYPE_C2_PROXY_USER, opts[:proxy_user]) unless (opts[:proxy_user] || '').empty?
       c2_tlv.add_tlv(MET::TLV_TYPE_C2_PROXY_PASS, opts[:proxy_pass]) unless (opts[:proxy_pass] || '').empty?
 

lib/rex/post/meterpreter/client_core.rb

@@ -147,7 +147,7 @@ def transport_list
     }
 
     response.each(TLV_TYPE_C2) { |t|
-      # TODO: Consider adding more informationt to the output for malleable profiles?
+      # TODO: Consider adding more information to the output for malleable profiles?
       # TLV_TYPE_C2_GET, TLV_TYPE_C2_POST, TLV_TYPE_C2_PREFIX, TLV_TYPE_C2_SUFFIX, TLV_TYPE_C2_ENC,
       # TLV_TYPE_C2_SKIP_COUNT, TLV_TYPE_C2_UUID_COOKIE, TLV_TYPE_C2_UUID_GET, TLV_TYPE_C2_UUID_HEADER
       # Not sure if this stuff is useful for this display though.
@@ -157,7 +157,7 @@ def transport_list
         :retry_total    => t.get_tlv_value(TLV_TYPE_C2_RETRY_TOTAL),
         :retry_wait     => t.get_tlv_value(TLV_TYPE_C2_RETRY_WAIT),
         :ua             => t.get_tlv_value(TLV_TYPE_C2_UA),
-        :proxy_host     => t.get_tlv_value(TLV_TYPE_C2_PROXY_HOST),
+        :proxy_host     => t.get_tlv_value(TLV_TYPE_C2_PROXY_URL),
         :proxy_user     => t.get_tlv_value(TLV_TYPE_C2_PROXY_USER),
         :proxy_pass     => t.get_tlv_value(TLV_TYPE_C2_PROXY_PASS),
         :cert_hash      => t.get_tlv_value(TLV_TYPE_C2_CERT_HASH),
@@ -931,8 +931,8 @@ def transport_prepare_request(command_id, opts={})
       if opts[:proxy_host] && opts[:proxy_port]
         prefix = 'http://'
         prefix = 'socks=' if opts[:proxy_type].to_s.downcase == 'socks'
-        proxy = "#{prefix}#{opts[:proxy_host]}:#{opts[:proxy_port]}"
-        c2_tlv.add_tlv(TLV_TYPE_C2_PROXY_HOST, proxy)
+        proxy = "#{prefix}#{Rex::Socket.to_authority(opts[:proxy_host], opts[:proxy_port])}"
+        c2_tlv.add_tlv(TLV_TYPE_C2_PROXY_URL, proxy)
 
         if opts[:proxy_user]
           c2_tlv.add_tlv(TLV_TYPE_C2_PROXY_USER, opts[:proxy_user])

lib/rex/post/meterpreter/packet.rb

@@ -121,7 +121,7 @@ module Meterpreter
 TLV_TYPE_C2_RETRY_WAIT         = TLV_META_TYPE_UINT   | 707 # how long to wait between reconnect attempts
 TLV_TYPE_C2_URL                = TLV_META_TYPE_STRING | 708 # base URL of this C2 (scheme://host:port/uri)
 TLV_TYPE_C2_URI                = TLV_META_TYPE_STRING | 709 # URI to append to base URL (for HTTP(s)), if any
-TLV_TYPE_C2_PROXY_HOST         = TLV_META_TYPE_STRING | 710 # Host name of proxy
+TLV_TYPE_C2_PROXY_URL          = TLV_META_TYPE_STRING | 710 # Proxy URL
 TLV_TYPE_C2_PROXY_USER         = TLV_META_TYPE_STRING | 711 # Proxy user name
 TLV_TYPE_C2_PROXY_PASS         = TLV_META_TYPE_STRING | 712 # Proxy password
 TLV_TYPE_C2_GET                = TLV_META_TYPE_GROUP  | 713 # A grouping of params associated with GET requests