Land rapid7#5663 : Avoid generating small URIs by default

Fixes rapid7#5662

Author: OJ

lib/msf/core/payload/uuid/options.rb

@@ -36,7 +36,7 @@ def generate_uri_uuid_mode(mode,len=nil)
     # The URI length may not have room for an embedded UUID
     if len && len < URI_CHECKSUM_UUID_MIN_LEN
       # Throw an error if the user set a seed, but there is no room for it
-      if datastore['PayloadUUIDSeed'].to_s.length > 0 ||datastore['PayloadUUIDRaw'].to_s.length > 0
+      if datastore['PayloadUUIDSeed'].to_s.length > 0 || datastore['PayloadUUIDRaw'].to_s.length > 0
         raise ArgumentError, "A PayloadUUIDSeed or PayloadUUIDRaw value was specified, but this payload doesn't have enough room for a UUID"
       end
       return "/" + generate_uri_checksum(sum, len, prefix="")

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

@@ -46,20 +46,21 @@ def generate(opts={})
       ssl:         opts[:ssl] || false,
       host:        datastore['LHOST'],
       port:        datastore['LPORT'],
-      url:         generate_small_uri,
       retry_count: datastore['StagerRetryCount']
     }
 
     # Add extra options if we have enough space
     unless self.available_space.nil? || required_space > self.available_space
-      conf[:url]        = generate_uri
       conf[:exitfunk]   = datastore['EXITFUNC']
       conf[:ua]         = datastore['MeterpreterUserAgent']
       conf[:proxy_host] = datastore['PayloadProxyHost']
       conf[:proxy_port] = datastore['PayloadProxyPort']
       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/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)