Fix TLV defs for http headers

Author: OJ

lib/rex/post/meterpreter/client_core.rb

@@ -139,15 +139,16 @@ def transport_list
 
     response.each(TLV_TYPE_TRANS_GROUP) { |t|
       result[:transports] << {
-        :url          => t.get_tlv_value(TLV_TYPE_TRANS_URL),
-        :comm_timeout => t.get_tlv_value(TLV_TYPE_TRANS_COMM_TIMEOUT),
-        :retry_total  => t.get_tlv_value(TLV_TYPE_TRANS_RETRY_TOTAL),
-        :retry_wait   => t.get_tlv_value(TLV_TYPE_TRANS_RETRY_WAIT),
-        :ua           => t.get_tlv_value(TLV_TYPE_TRANS_UA),
-        :proxy_host   => t.get_tlv_value(TLV_TYPE_TRANS_PROXY_HOST),
-        :proxy_user   => t.get_tlv_value(TLV_TYPE_TRANS_PROXY_USER),
-        :proxy_pass   => t.get_tlv_value(TLV_TYPE_TRANS_PROXY_PASS),
-        :cert_hash    => t.get_tlv_value(TLV_TYPE_TRANS_CERT_HASH)
+        :url            => t.get_tlv_value(TLV_TYPE_TRANS_URL),
+        :comm_timeout   => t.get_tlv_value(TLV_TYPE_TRANS_COMM_TIMEOUT),
+        :retry_total    => t.get_tlv_value(TLV_TYPE_TRANS_RETRY_TOTAL),
+        :retry_wait     => t.get_tlv_value(TLV_TYPE_TRANS_RETRY_WAIT),
+        :ua             => t.get_tlv_value(TLV_TYPE_TRANS_UA),
+        :proxy_host     => t.get_tlv_value(TLV_TYPE_TRANS_PROXY_HOST),
+        :proxy_user     => t.get_tlv_value(TLV_TYPE_TRANS_PROXY_USER),
+        :proxy_pass     => t.get_tlv_value(TLV_TYPE_TRANS_PROXY_PASS),
+        :cert_hash      => t.get_tlv_value(TLV_TYPE_TRANS_CERT_HASH),
+        :custom_headers => t.get_tlv_value(TLV_TYPE_TRANS_HEADERS)
       }
     }
 
@@ -555,6 +556,7 @@ def migrate(target_pid, writable_dir = nil, opts = {})
     # We cannot migrate into a process that we are unable to open
     # On linux, arch is empty even if we can access the process
     if client.platform == 'windows'
+
       if target_process['arch'] == nil || target_process['arch'].empty?
         raise RuntimeError, "Cannot migrate into this process (insufficient privileges)", caller
       end
@@ -718,7 +720,8 @@ def negotiate_tlv_encryption
   # Get a reference to the currently active transport.
   #
   def get_current_transport
-    transport_list[:transports][0]
+    x = transport_list
+    x[:transports][0]
   end
 
   #
@@ -728,6 +731,7 @@ def get_current_transport
   def generate_migrate_stub(target_process)
     stub = nil
 
+
     if client.platform == 'windows' && [ARCH_X86, ARCH_X64].include?(client.arch)
       t = get_current_transport
 

lib/rex/post/meterpreter/packet.rb

@@ -102,7 +102,8 @@ module Meterpreter
 TLV_TYPE_TRANS_PROXY_PASS    = TLV_META_TYPE_STRING | 438
 TLV_TYPE_TRANS_RETRY_TOTAL   = TLV_META_TYPE_UINT   | 439
 TLV_TYPE_TRANS_RETRY_WAIT    = TLV_META_TYPE_UINT   | 440
-TLV_TYPE_TRANS_GROUP         = TLV_META_TYPE_GROUP  | 441
+TLV_TYPE_TRANS_HEADERS       = TLV_META_TYPE_STRING | 441
+TLV_TYPE_TRANS_GROUP         = TLV_META_TYPE_GROUP  | 442
 
 TLV_TYPE_MACHINE_ID          = TLV_META_TYPE_STRING | 460
 TLV_TYPE_UUID                = TLV_META_TYPE_RAW    | 461