Remove patch and old stageless stuff

Author: OJ

lib/msf/core/handler/reverse_hop_http.rb

@@ -90,7 +90,7 @@ def start_handler
     ReverseHopHttp.hop_handlers[full_uri] = self
     self.monitor_thread = Rex::ThreadFactory.spawn('ReverseHopHTTP', false, uri,
         self) do |uri, hop_http|
-      hop_http.send_new_stage # send stage to hop
+      hop_http.send_new_stage(uri) # send stage to hop
       delay = 1 # poll delay
       # Continue to loop as long as at least one handler or one session is depending on us
       until hop_http.refs < 1 && hop_http.handlers.empty?
@@ -138,7 +138,7 @@ def start_handler
               :ssl                => false,
             })
             # send new stage to hop so next inbound session will get a unique ID.
-            hop_http.send_new_stage
+            hop_http.send_new_stage(uri)
           else
             hop_http.lock.unlock
           end
@@ -241,34 +241,27 @@ def initialize(info = {})
   #
   # Generates and sends a stage up to the hop point to be ready for the next client
   #
-  def send_new_stage
-    conn_id = generate_uri_checksum(URI_CHECKSUM_CONN) + "_" + Rex::Text.rand_text_alphanumeric(16)
+  def send_new_stage(uri)
+    # try to get the UUID out of the existing URI
+    info = process_uri_resource(uri)
+    uuid = info[:uuid] || Msf::Payload::UUID.new
+
+    # generate a new connect
+    sum = uri_checksum_lookup(:connect)
+    conn_id = generate_uri_uuid(sum, uuid)
     url = full_uri + conn_id + "/\x00"
 
     print_status("Preparing stage for next session #{conn_id}")
-    blob = stage_payload
-    #
-    # Patch options into the payload
-    #
-    Rex::Payloads::Meterpreter::Patch.patch_passive_service!(blob,
-      :ssl            => ssl?,
-      :url            => url,
-      :expiration     => datastore['SessionExpirationTimeout'],
-      :comm_timeout   => datastore['SessionCommunicationTimeout'],
-      :ua             => datastore['MeterpreterUserAgent'],
-      :proxy_host     => datastore['PayloadProxyHost'],
-      :proxy_port     => datastore['PayloadProxyPort'],
-      :proxy_type     => datastore['PayloadProxyType'],
-      :proxy_user     => datastore['PayloadProxyUser'],
-      :proxy_pass     => datastore['PayloadProxyPass'])
-
-    blob = encode_stage(blob)
+    blob = stage_payload({
+      :uuid => uuid,
+      :uri  => conn_id
+    })
 
     #send up
     crequest = mclient.request_raw(
         'method' => 'POST',
         'uri' => control,
-        'data' => blob,
+        'data' => encode_stage(blob),
         'headers' => {'X-init' => 'true'}
     )
     res = mclient.send_recv(crequest)

lib/msf/core/handler/reverse_http/stageless.rb

@@ -6,7 +6,6 @@
 require 'msf/core'
 require 'msf/core/transport_config'
 require 'msf/core/handler/reverse_http'
-require 'msf/core/handler/reverse_http/stageless'
 require 'msf/core/payload/windows/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
@@ -19,7 +18,6 @@ module Metasploit4
   include Msf::Payload::Windows
   include Msf::Payload::Single
   include Msf::Payload::Windows::MeterpreterLoader
-  include Msf::Handler::ReverseHttp::Stageless
   include Msf::Sessions::MeterpreterOptions
 
   def initialize(info = {})
@@ -35,7 +33,9 @@ def initialize(info = {})
       'Session'     => Msf::Sessions::Meterpreter_x86_Win
       ))
 
-    initialize_stageless
+    register_options([
+      OptString.new('EXTENSIONS', [false, "Comma-separate list of extensions to load"]),
+    ], self.class)
   end
 
   def generate

modules/payloads/singles/windows/meterpreter_reverse_http.rb

@@ -6,7 +6,6 @@
 require 'msf/core'
 require 'msf/core/transport_config'
 require 'msf/core/handler/reverse_https'
-require 'msf/core/handler/reverse_http/stageless'
 require 'msf/core/payload/windows/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
@@ -19,7 +18,6 @@ module Metasploit4
   include Msf::Payload::Windows
   include Msf::Payload::Single
   include Msf::Payload::Windows::MeterpreterLoader
-  include Msf::Handler::ReverseHttp::Stageless
   include Msf::Sessions::MeterpreterOptions
 
   def initialize(info = {})
@@ -35,7 +33,9 @@ def initialize(info = {})
       'Session'     => Msf::Sessions::Meterpreter_x86_Win
       ))
 
-    initialize_stageless
+    register_options([
+      OptString.new('EXTENSIONS', [false, "Comma-separate list of extensions to load"]),
+    ], self.class)
   end
 
   def generate

modules/payloads/singles/windows/meterpreter_reverse_https.rb

@@ -5,7 +5,6 @@
 
 require 'msf/core'
 require 'msf/core/handler/reverse_http'
-require 'msf/core/handler/reverse_http/stageless'
 require 'msf/core/payload/windows/x64/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x64_win'
 require 'msf/base/sessions/meterpreter_options'
@@ -18,7 +17,6 @@ module Metasploit4
   include Msf::Payload::Windows
   include Msf::Payload::Single
   include Msf::Payload::Windows::MeterpreterLoader_x64
-  include Msf::Handler::ReverseHttp::Stageless
   include Msf::Sessions::MeterpreterOptions
 
   def initialize(info = {})
@@ -34,7 +32,9 @@ def initialize(info = {})
       'Session'     => Msf::Sessions::Meterpreter_x64_Win
       ))
 
-    initialize_stageless
+    register_options([
+      OptString.new('EXTENSIONS', [false, "Comma-separate list of extensions to load"]),
+    ], self.class)
   end
 
   def generate

modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb

@@ -6,7 +6,6 @@
 require 'msf/core'
 require 'msf/core/transport_config'
 require 'msf/core/handler/reverse_https'
-require 'msf/core/handler/reverse_http/stageless'
 require 'msf/core/payload/windows/x64/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x64_win'
 require 'msf/base/sessions/meterpreter_options'
@@ -19,7 +18,6 @@ module Metasploit4
   include Msf::Payload::Windows
   include Msf::Payload::Single
   include Msf::Payload::Windows::MeterpreterLoader_x64
-  include Msf::Handler::ReverseHttp::Stageless
   include Msf::Sessions::MeterpreterOptions
 
   def initialize(info = {})
@@ -35,7 +33,9 @@ def initialize(info = {})
       'Session'     => Msf::Sessions::Meterpreter_x64_Win
       ))
 
-    initialize_stageless
+    register_options([
+      OptString.new('EXTENSIONS', [false, "Comma-separate list of extensions to load"]),
+    ], self.class)
   end
 
   def generate