Land #5618, fix unique session URIs for stageless http/s

lib/msf/core/payload/transport_config.rb

@@ -48,7 +48,8 @@ module Msf::Payload::TransportConfig
     # going up as part of the stage.
     uri = opts[:uri]
     unless uri
-      sum = uri_checksum_lookup(:connect)
+      type = opts[:stageless] == true ? :init_connect : :connect
+      sum = uri_checksum_lookup(type)
       uri = generate_uri_uuid(sum, opts[:uuid])
     end
 

modules/payloads/singles/windows/meterpreter_reverse_http.rb

@@ -45,6 +45,7 @@ module Metasploit4
 
   def generate_config(opts={})
     opts[:uuid] ||= generate_payload_uuid
+    opts[:stageless] = true
 
     # create the configuration block
     config_opts = {

modules/payloads/singles/windows/meterpreter_reverse_https.rb

@@ -45,6 +45,7 @@ module Metasploit4
 
   def generate_config(opts={})
     opts[:uuid] ||= generate_payload_uuid
+    opts[:stageless] = true
 
     # create the configuration block
     config_opts = {

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

@@ -45,6 +45,7 @@ module Metasploit4
 
   def generate_config(opts={})
     opts[:uuid] ||= generate_payload_uuid
+    opts[:stageless] = true
 
     # create the configuration block
     config_opts = {

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

@@ -45,6 +45,7 @@ module Metasploit4
 
   def generate_config(opts={})
     opts[:uuid] ||= generate_payload_uuid
+    opts[:stageless] = true
 
     # create the configuration block
     config_opts = {
@@ -52,7 +53,7 @@ module Metasploit4
       exitfunk:   datastore['EXITFUNC'],
       expiration: datastore['SessionExpirationTimeout'].to_i,
       uuid:       opts[:uuid],
-      transports: [transport_config_reverse_http(opts)],
+      transports: [transport_config_reverse_https(opts)],
       extensions: (datastore['EXTENSIONS'] || '').split(',')
     }