infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix UUID code so that it always deals with 16 bytes 

Also re-add the payload ID to session validation now that the UUID stuff
is reliable.
unstable
OJ 2015-05-17 17:29:47 +10:00
parent 636d8151d0
commit d725554a87
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/msf/base/sessions/meterpreter.rb
View File

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

3
lib/rex/payloads/meterpreter/config.rb
View File

@ -8,7 +8,6 @@ class Rex::Payloads::Meterpreter::Config
include Msf::ReflectiveDLLLoader include Msf::ReflectiveDLLLoader
UUID_SIZE = 64
URL_SIZE = 512 URL_SIZE = 512
UA_SIZE = 256 UA_SIZE = 256
PROXY_HOST_SIZE = 128 PROXY_HOST_SIZE = 128
@ -48,7 +47,7 @@ private
end end
def session_block(opts) 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]] exit_func = Msf::Payload::Windows.exit_types[opts[:exitfunk]]
session_data = [ session_data = [

2
lib/rex/post/meterpreter/packet.rb
View File

@ -102,7 +102,7 @@ TLV_TYPE_TRANS_RETRY_WAIT = TLV_META_TYPE_UINT | 440
TLV_TYPE_TRANS_GROUP = TLV_META_TYPE_GROUP | 441 TLV_TYPE_TRANS_GROUP = TLV_META_TYPE_GROUP | 441
TLV_TYPE_MACHINE_ID = TLV_META_TYPE_STRING | 460 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_NAME = TLV_META_TYPE_STRING | 500
TLV_TYPE_CIPHER_PARAMETERS = TLV_META_TYPE_GROUP | 501 TLV_TYPE_CIPHER_PARAMETERS = TLV_META_TYPE_GROUP | 501