From 446f3fa675eb0e0fb7f23ab1e5b49dba4fa8651d Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 14 Nov 2017 20:21:38 -0600 Subject: [PATCH] more conversions --- lib/msf/base/serializer/readable_text.rb | 1 - lib/msf/core/handler.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/msf/base/serializer/readable_text.rb b/lib/msf/base/serializer/readable_text.rb index 00b39824a9..27fc80f110 100644 --- a/lib/msf/base/serializer/readable_text.rb +++ b/lib/msf/base/serializer/readable_text.rb @@ -634,7 +634,6 @@ class ReadableText sess_via = session.via_exploit.to_s sess_type = session.type.to_s sess_uuid = session.payload_uuid.to_s - sess_puid = session.payload_uuid.respond_to?(:puid_hex) ? session.payload_uuid.puid_hex : nil sess_luri = session.exploit_datastore['LURI'] || "" if session.exploit_datastore sess_enc = false if session.respond_to?(:tlv_enc_key) && session.tlv_enc_key && session.tlv_enc_key[:key] diff --git a/lib/msf/core/handler.rb b/lib/msf/core/handler.rb index 6f4e0a6888..96f3fe56b4 100644 --- a/lib/msf/core/handler.rb +++ b/lib/msf/core/handler.rb @@ -224,7 +224,7 @@ protected # Pass along any associated payload uuid if specified if opts[:payload_uuid] s.payload_uuid = opts[:payload_uuid] - if s.payload_uuid.respond_to?(:puid_hex) && (uuid_info = framework.uuid_db[sess_puid]) + if s.payload_uuid.respond_to?(:puid_hex) && (uuid_info = framework.uuid_db[session.payload_uuid.puid_hex]) s.payload_uuid.registered = true s.payload_uuid.name = uuid_info['name'] s.payload_uuid.timestamp = uuid_info['timestamp']