Land rapid7#5357, switch UUID to be binary rather than string

Author: Brent Cook

Gemfile.lock

@@ -9,7 +9,7 @@ PATH
       json
       metasploit-concern (~> 1.0)
       metasploit-model (~> 1.0)
-      metasploit-payloads (= 0.0.6)
+      metasploit-payloads (= 0.0.7)
       msgpack
       nokogiri
       packetfu (= 1.1.9)
@@ -123,7 +123,7 @@ GEM
       activemodel (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
       railties (>= 4.0.9, < 4.1.0)
-    metasploit-payloads (0.0.6)
+    metasploit-payloads (0.0.7)
     metasploit_data_models (1.0.1)
       activerecord (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)

lib/msf/base/sessions/meterpreter.rb

@@ -307,9 +307,7 @@ def is_valid_session?(timeout=10)
 
     begin
       self.machine_id = self.core.machine_id(timeout)
-      # This is causing breakages thanks to Meterpeter not doing what it should
-      # be doing with the uuid.
-      #self.payload_uuid ||= self.core.uuid(timeout)
+      self.payload_uuid ||= self.core.uuid(timeout)
 
       return true
     rescue ::Rex::Post::Meterpreter::RequestError

lib/rex/payloads/meterpreter/config.rb

@@ -8,7 +8,6 @@ class Rex::Payloads::Meterpreter::Config
 
   include Msf::ReflectiveDLLLoader
 
-  UUID_SIZE = 64
   URL_SIZE = 512
   UA_SIZE = 256
   PROXY_HOST_SIZE = 128
@@ -48,7 +47,7 @@ def to_ascii(item, size)
   end
 
   def session_block(opts)
-    uuid = to_str(opts[:uuid].to_raw, UUID_SIZE)
+    uuid = opts[:uuid].to_raw
     exit_func = Msf::Payload::Windows.exit_types[opts[:exitfunk]]
 
     session_data = [

lib/rex/post/meterpreter/packet.rb

@@ -102,7 +102,7 @@ module Meterpreter
 TLV_TYPE_TRANS_GROUP         = TLV_META_TYPE_GROUP  | 441
 
 TLV_TYPE_MACHINE_ID          = TLV_META_TYPE_STRING | 460
-TLV_TYPE_UUID                = TLV_META_TYPE_STRING | 461
+TLV_TYPE_UUID                = TLV_META_TYPE_RAW    | 461
 
 TLV_TYPE_CIPHER_NAME         = TLV_META_TYPE_STRING | 500
 TLV_TYPE_CIPHER_PARAMETERS   = TLV_META_TYPE_GROUP  | 501

metasploit-framework.gemspec

@@ -64,7 +64,7 @@ Gem::Specification.new do |spec|
   # are needed when there's no database
   spec.add_runtime_dependency 'metasploit-model', '~> 1.0'
   # Needed for Meterpreter on Windows, soon others.
-  spec.add_runtime_dependency 'metasploit-payloads', '0.0.6'
+  spec.add_runtime_dependency 'metasploit-payloads', '0.0.7'
   # Needed by msfgui and other rpc components
   spec.add_runtime_dependency 'msgpack'
   # Needed by anemone crawler

modules/payloads/singles/windows/meterpreter_bind_tcp.rb

@@ -13,7 +13,7 @@
 
 module Metasploit4
 
-  CachedSize = 884382
+  CachedSize = 884270
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

modules/payloads/singles/windows/meterpreter_reverse_http.rb

@@ -13,7 +13,7 @@
 
 module Metasploit4
 
-  CachedSize = 885426
+  CachedSize = 885314
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

modules/payloads/singles/windows/meterpreter_reverse_https.rb

@@ -13,7 +13,7 @@
 
 module Metasploit4
 
-  CachedSize = 885426
+  CachedSize = 885314
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb

@@ -13,7 +13,7 @@
 
 module Metasploit4
 
-  CachedSize = 884382
+  CachedSize = 884270
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows

modules/payloads/singles/windows/meterpreter_reverse_tcp.rb

@@ -13,7 +13,7 @@
 
 module Metasploit3
 
-  CachedSize = 884382
+  CachedSize = 884270
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows