use cooler names c/o @timwr, make options easier to grep

Author: busterb

lib/msf/core/opt.rb

@@ -59,23 +59,20 @@ def self.ssl_supported_options
 
     # @return [OptEnum]
     def self.SSLVersion
-      Msf::OptEnum.new(
-        'SSLVersion',
+      Msf::OptEnum.new('SSLVersion',
         'Specify the version of SSL/TLS to be used (Auto, TLS and SSL23 are auto-negotiate)',
         enums: self.ssl_supported_options
       )
     end
 
     def self.stager_retry_options
       [
-        OptInt.new(
-          'StagerRetryCount',
+        OptInt.new('StagerRetryCount',
           'The number of times the stager should retry if the first connect fails',
           default: 10,
           aliases: ['ReverseConnectRetries']
         ),
-        OptInt.new(
-          'StagerRetryWait',
+        OptInt.new('StagerRetryWait',
           'Number of seconds to wait for the stager between reconnect attempts',
           default: 5
         )
@@ -84,29 +81,19 @@ def self.stager_retry_options
 
     def self.http_proxy_options
       [
-        OptString.new(
-          'HttpProxyHost',
-          'An optional proxy server IP address or hostname',
+        OptString.new('HttpProxyHost', 'An optional proxy server IP address or hostname',
           aliases: ['PayloadProxyHost']
         ),
-        OptPort.new(
-          'HttpProxyPort',
-          'An optional proxy server port',
+        OptPort.new('HttpProxyPort', 'An optional proxy server port',
           aliases: ['PayloadProxyPort']
         ),
-        OptString.new(
-          'HttpProxyUser',
-          'An optional proxy server username',
+        OptString.new('HttpProxyUser', 'An optional proxy server username',
           aliases: ['PayloadProxyUser']
         ),
-        OptString.new(
-          'HttpProxyPass',
-          'An optional proxy server password',
+        OptString.new('HttpProxyPass', 'An optional proxy server password',
           aliases: ['PayloadProxyPass']
         ),
-        OptEnum.new(
-          'HttpProxyType',
-          'The type of HTTP proxy',
+        OptEnum.new('HttpProxyType', 'The type of HTTP proxy',
           enums: ['HTTP', 'SOCKS'],
           aliases: ['PayloadProxyType']
         )
@@ -115,18 +102,9 @@ def self.http_proxy_options
 
     def self.http_header_options
       [
-        OptString.new(
-          'HttpHeaderHost',
-          'An optional value to use for the Host HTTP header'
-        ),
-        OptString.new(
-          'HttpHeaderCookie',
-          'An optional value to use for the Cookie HTTP header'
-        ),
-        OptString.new(
-          'HttpHeaderReferer',
-          'An optional value to use for the Referer HTTP header'
-        )
+        OptString.new('HttpHostHeader', 'An optional value to use for the Host HTTP header'),
+        OptString.new('HttpCookie', 'An optional value to use for the Cookie HTTP header'),
+        OptString.new('HttpReferer', 'An optional value to use for the Referer HTTP header')
       ]
     end
 

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

@@ -68,9 +68,9 @@ def stager_config(opts={})
     c =  ''
     c << "Spawn=#{ds["Spawn"] || 2}\n"
     c << "HeaderUser-Agent=#{ds["HttpUserAgent"]}\n" if ds["HttpUserAgent"]
-    c << "HeaderHost=#{ds["HttpHeaderHost"]}\n" if ds["HttpHeaderHost"]
-    c << "HeaderReferer=#{ds["HttpHeaderReferer"]}\n" if ds["HttpHeaderReferer"]
-    c << "HeaderCookie=#{ds["HttpHeaderCookie"]}\n" if ds["HttpHeaderCookie"]
+    c << "HeaderHost=#{ds["HttpHostHeader"]}\n" if ds["HttpHostHeader"]
+    c << "HeaderReferer=#{ds["HttpReferer"]}\n" if ds["HttpReferer"]
+    c << "HeaderCookie=#{ds["HttpCookie"]}\n" if ds["HttpCookie"]
     c << "URL=#{scheme}://#{ds['LHOST']}"
     c << ":#{ds['LPORT']}" if ds['LPORT']
     c << luri

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

@@ -98,9 +98,9 @@ def stage_meterpreter(opts={})
     http_user_agent = opts[:http_user_agent] || ds['HttpUserAgent']
     http_proxy_host = opts[:http_proxy_host] || ds['HttpProxyHost'] || ds['PROXYHOST']
     http_proxy_port = opts[:http_proxy_port] || ds['HttpProxyPort'] || ds['PROXYPORT']
-    http_header_host = opts[:header_host] || ds['HttpHeaderHost']
-    http_header_cookie = opts[:header_cookie] || ds['HttpHeaderCookie']
-    http_header_referer = opts[:header_referer] || ds['HttpHeaderReferer']
+    http_header_host = opts[:header_host] || ds['HttpHostHeader']
+    http_header_cookie = opts[:header_cookie] || ds['HttpCookie']
+    http_header_referer = opts[:header_referer] || ds['HttpReferer']
 
     # The callback URL can be different to the one that we're receiving from the interface
     # so we need to generate it

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

@@ -28,9 +28,9 @@ def generate(opts={})
       proxy_host:     ds['HttpProxyHost'],
       proxy_port:     ds['HttpProxyPort'],
       user_agent:     ds['HttpUserAgent'],
-      header_host:    ds['HttpHeaderHost'],
-      header_cookie:  ds['HttpHeaderCookie'],
-      header_referer: ds['HttpHeaderReferer']
+      header_host:    ds['HttpHostHeader'],
+      header_cookie:  ds['HttpCookie'],
+      header_referer: ds['HttpReferer']
     })
     opts[:scheme] = 'http' if opts[:scheme].nil?
 

lib/msf/core/payload/transport_config.rb

@@ -83,9 +83,9 @@ def transport_config_reverse_named_pipe(opts={})
 
   def get_custom_headers(ds)
     headers = ""
-    headers << "Host: #{ds['HttpHeaderHost']}\r\n" if ds['HttpHeaderHost']
-    headers << "Cookie: #{ds['HttpHeaderCookie']}\r\n" if ds['HttpHeaderCookie']
-    headers << "Referer: #{ds['HttpHeaderReferer']}\r\n" if ds['HttpHeaderReferer']
+    headers << "Host: #{ds['HttpHostHeader']}\r\n" if ds['HttpHostHeader']
+    headers << "Cookie: #{ds['HttpCookie']}\r\n" if ds['HttpCookie']
+    headers << "Referer: #{ds['HttpReferer']}\r\n" if ds['HttpReferer']
 
     if headers.length > 0
       headers

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

@@ -72,9 +72,9 @@ def generate(opts={})
   #
   def get_custom_headers(ds)
     headers = ""
-    headers << "Host: #{ds['HttpHeaderHost']}\r\n" if ds['HttpHeaderHost']
-    headers << "Cookie: #{ds['HttpHeaderCookie']}\r\n" if ds['HttpHeaderCookie']
-    headers << "Referer: #{ds['HttpHeaderReferer']}\r\n" if ds['HttpHeaderReferer']
+    headers << "Host: #{ds['HttpHostHeader']}\r\n" if ds['HttpHostHeader']
+    headers << "Cookie: #{ds['HttpCookie']}\r\n" if ds['HttpCookie']
+    headers << "Referer: #{ds['HttpReferer']}\r\n" if ds['HttpReferer']
 
     if headers.length > 0
       headers

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

@@ -77,9 +77,9 @@ def generate(opts={})
   #
   def get_custom_headers(ds)
     headers = ""
-    headers << "Host: #{ds['HttpHeaderHost']}\r\n" if ds['HttpHeaderHost']
-    headers << "Cookie: #{ds['HttpHeaderCookie']}\r\n" if ds['HttpHeaderCookie']
-    headers << "Referer: #{ds['HttpHeaderReferer']}\r\n" if ds['HttpHeaderReferer']
+    headers << "Host: #{ds['HttpHostHeader']}\r\n" if ds['HttpHostHeader']
+    headers << "Cookie: #{ds['HttpCookie']}\r\n" if ds['HttpCookie']
+    headers << "Referer: #{ds['HttpReferer']}\r\n" if ds['HttpReferer']
 
     if headers.length > 0
       headers