Fix additional copy-pasta cases of rapid7#5662

Author: HD Moore

lib/msf/core/payload/windows/reverse_http.rb

@@ -51,7 +51,7 @@ def generate(opts={})
 
     # Add extra options if we have enough space
     unless self.available_space.nil? || required_space > self.available_space
-      
+
       conf[:exitfunk]   = datastore['EXITFUNC']
       conf[:ua]         = datastore['MeterpreterUserAgent']
       conf[:proxy_host] = datastore['PayloadProxyHost']

lib/msf/core/payload/windows/reverse_winhttp.rb

@@ -27,7 +27,6 @@ def generate(opts={})
       ssl:         opts[:ssl] || false,
       host:        datastore['LHOST'],
       port:        datastore['LPORT'],
-      url:         generate_small_uri,
       retry_count: datastore['StagerRetryCount']
     }
 
@@ -42,6 +41,9 @@ def generate(opts={})
       conf[:proxy_pass]       = datastore['PayloadProxyPass']
       conf[:proxy_type]       = datastore['PayloadProxyType']
       conf[:retry_count]      = datastore['StagerRetryCount']
+    else
+    # Otherwise default to small URIs
+      conf[:url]              = generate_small_uri
     end
 
     generate_reverse_winhttp(conf)

lib/msf/core/payload/windows/x64/reverse_http.rb

@@ -50,7 +50,6 @@ def generate(opts={})
       ssl:         opts[:ssl] || false,
       host:        datastore['LHOST'],
       port:        datastore['LPORT'],
-      url:         generate_small_uri,
       retry_count: datastore['StagerRetryCount']
     }
 
@@ -64,6 +63,9 @@ def generate(opts={})
       conf[:proxy_user] = datastore['PayloadProxyUser']
       conf[:proxy_pass] = datastore['PayloadProxyPass']
       conf[:proxy_type] = datastore['PayloadProxyType']
+     else
+    # Otherwise default to small URIs
+      conf[:url]        = generate_small_uri
     end
 
     generate_reverse_http(conf)

lib/msf/core/payload/windows/x64/reverse_winhttp.rb

@@ -24,7 +24,6 @@ def generate(opts={})
       ssl:         opts[:ssl] || false,
       host:        datastore['LHOST'],
       port:        datastore['LPORT'],
-      url:         generate_small_uri,
       retry_count: datastore['StagerRetryCount']
     }
 
@@ -38,6 +37,9 @@ def generate(opts={})
       conf[:proxy_user]       = datastore['PayloadProxyUser']
       conf[:proxy_pass]       = datastore['PayloadProxyPass']
       conf[:proxy_type]       = datastore['PayloadProxyType']
+    else
+    # Otherwise default to small URIs
+      conf[:url]              = generate_small_uri
     end
 
     generate_reverse_winhttp(conf)