Missed the HTTPUSERNAME fix

modules/auxiliary/admin/appletv/appletv_display_image.rb

@@ -27,7 +27,7 @@ class MetasploitModule < Msf::Auxiliary
         [
           ['URL', 'http://nto.github.io/AirPlay.html']
         ],
-      'DefaultOptions' => { 'HTTPUSERNAME' => 'AirPlay' },
+      'DefaultOptions' => { 'HttpUsername' => 'AirPlay' },
       'License'        => MSF_LICENSE
     ))
 

modules/auxiliary/admin/http/openbravo_xxe.rb

@@ -53,7 +53,7 @@ class MetasploitModule < Msf::Auxiliary
     users = send_request_raw({
       'method' => 'GET',
       'uri' => normalize_uri(datastore['TARGETURI'], "/ws/dal/#{datastore["ENDPOINT"]}"),
-      'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword'])
+      'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword'])
     }, 60)
 
     if !users or users.code != 200

modules/auxiliary/scanner/http/buffalo_login.rb

@@ -47,7 +47,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 10,
-        http_username: datastore['HTTPUSERNAME'],
+        http_username: datastore['HttpUsername'],
         http_password: datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/http/caidao_bruteforce_login.rb

@@ -39,7 +39,7 @@ class MetasploitModule < Msf::Auxiliary
       ], self.class)
 
     # caidao does not have an username, there's only password
-    deregister_options('HTTPUSERNAME', 'HttpPassword', 'USERNAME', 'USER_AS_PASS', 'USERPASS_FILE', 'USER_FILE', 'DB_ALL_USERS')
+    deregister_options('HttpUsername', 'HttpPassword', 'USERNAME', 'USER_AS_PASS', 'USERPASS_FILE', 'USER_FILE', 'DB_ALL_USERS')
   end
 
   def scanner(ip)
@@ -62,7 +62,7 @@ class MetasploitModule < Msf::Auxiliary
           stop_on_success:    datastore['STOP_ON_SUCCESS'],
           bruteforce_speed:   datastore['BRUTEFORCE_SPEED'],
           connection_timeout: 5,
-          http_username: datastore['HTTPUSERNAME'],
+          http_username: datastore['HttpUsername'],
           http_password: datastore['HttpPassword']
         ))
     }.call

modules/auxiliary/scanner/http/chef_webui_login.rb

@@ -152,7 +152,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success:    datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5,
-        http_username: datastore['HTTPUSERNAME'],
+        http_username: datastore['HttpUsername'],
         http_password: datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb

@@ -40,7 +40,7 @@ class MetasploitModule < Msf::Auxiliary
           File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
       ], self.class)
 
-    deregister_options('HTTPUSERNAME', 'HttpPassword')
+    deregister_options('HttpUsername', 'HttpPassword')
   end
 
   def target_url

modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb

@@ -43,7 +43,7 @@ class MetasploitModule < Msf::Auxiliary
           File.join(Msf::Config.data_directory, "wordlists", "http_default_pass.txt") ]),
       ], self.class)
 
-    deregister_options('HTTPUSERNAME', 'HttpPassword')
+    deregister_options('HttpUsername', 'HttpPassword')
   end
 
   def target_url

modules/auxiliary/scanner/http/etherpad_duo_login.rb

@@ -25,7 +25,7 @@ class MetasploitModule < Msf::Auxiliary
     'License'        => MSF_LICENSE
     ))
 
-    deregister_options('HTTPUSERNAME', 'HttpPassword')
+    deregister_options('HttpUsername', 'HttpPassword')
   end
 
   def run_host(ip)

modules/auxiliary/scanner/http/gitlab_login.rb

@@ -28,7 +28,7 @@ class MetasploitModule < Msf::Auxiliary
     register_options(
       [
         Opt::RPORT(80),
-        OptString.new('HTTPUSERNAME', [ true, 'The username to test', 'root' ]),
+        OptString.new('HttpUsername', [ true, 'The username to test', 'root' ]),
         OptString.new('HttpPassword', [ true, 'The password to test', '5iveL!fe' ]),
         OptString.new('TARGETURI', [true, 'The path to GitLab', '/'])
       ], self.class)
@@ -61,7 +61,7 @@ class MetasploitModule < Msf::Auxiliary
       password: datastore['HttpPassword'],
       user_file: datastore['USER_FILE'],
       userpass_file: datastore['USERPASS_FILE'],
-      username: datastore['HTTPUSERNAME'],
+      username: datastore['HttpUsername'],
       user_as_pass: datastore['USER_AS_PASS']
     )
 

modules/auxiliary/scanner/http/glassfish_login.rb

@@ -93,7 +93,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success:    datastore['STOP_ON_SUCCESS'],
         bruteforce_speed:   datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5,
-        http_username:      datastore['HTTPUSERNAME'],
+        http_username:      datastore['HttpUsername'],
         http_password:      datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb

@@ -77,7 +77,7 @@ class MetasploitModule < Msf::Auxiliary
       password:        datastore['HttpPassword'],
       user_file:       datastore['USER_FILE'],
       userpass_file:   datastore['USERPASS_FILE'],
-      username:        datastore['HTTPUSERNAME'],
+      username:        datastore['HttpUsername'],
       user_as_pass:    datastore['USER_AS_PASS']
     )
 
@@ -88,7 +88,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success:    datastore['STOP_ON_SUCCESS'],
         bruteforce_speed:   datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5,
-        http_username:      datastore['HTTPUSERNAME'],
+        http_username:      datastore['HttpUsername'],
         http_password:      datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/http/http_login.rb

@@ -151,7 +151,7 @@ class MetasploitModule < Msf::Auxiliary
       password: datastore['HttpPassword'],
       user_file: datastore['USER_FILE'],
       userpass_file: datastore['USERPASS_FILE'],
-      username: datastore['HTTPUSERNAME'],
+      username: datastore['HttpUsername'],
       user_as_pass: datastore['USER_AS_PASS'],
     )
 

modules/auxiliary/scanner/http/http_traversal.rb

@@ -166,7 +166,7 @@ class MetasploitModule < Msf::Auxiliary
     req['uri']        = this_path
     req['headers']    = {'Cookie'=>datastore['COOKIE']} if not datastore['COOKIE'].empty?
     req['data']       = data if not data.empty?
-    req['authorization'] = basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword'])
+    req['authorization'] = basic_auth(datastore['HttpUsername'], datastore['HttpPassword'])
 
     return req
   end

modules/auxiliary/scanner/http/ipboard_login.rb

@@ -44,7 +44,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5,
-        http_username: datastore['HTTPUSERNAME'],
+        http_username: datastore['HttpUsername'],
         http_password: datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/http/jenkins_login.rb

@@ -52,7 +52,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 10,
-        http_username: datastore['HTTPUSERNAME'],
+        http_username: datastore['HttpUsername'],
         http_password: datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/http/linksys_e1500_traversal.rb

@@ -33,7 +33,7 @@ class MetasploitModule < Msf::Auxiliary
       [
         OptPath.new('SENSITIVE_FILES',  [ true, "File containing senstive files, one per line",
           File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
-        OptString.new('HTTPUSERNAME',[ true, 'User to login with', 'admin']),
+        OptString.new('HttpUsername',[ true, 'User to login with', 'admin']),
         OptString.new('HttpPassword',[ true, 'Password to login with', 'password']),
 
       ], self.class)
@@ -91,7 +91,7 @@ class MetasploitModule < Msf::Auxiliary
   end
 
   def run_host(ip)
-    user = datastore['HTTPUSERNAME']
+    user = datastore['HttpUsername']
     pass = datastore['HttpPassword']
 
     vprint_status("#{rhost}:#{rport} - Trying to login with #{user} / #{pass}")

modules/auxiliary/scanner/http/manageengine_desktop_central_login.rb

@@ -47,7 +47,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success:    datastore['STOP_ON_SUCCESS'],
         bruteforce_speed:   datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5,
-        http_username:      datastore['HTTPUSERNAME'],
+        http_username:      datastore['HttpUsername'],
         http_password:      datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/http/mybook_live_login.rb

@@ -60,7 +60,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 10,
-        http_username: datastore['HTTPUSERNAME'],
+        http_username: datastore['HttpUsername'],
         http_password: datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb

@@ -31,7 +31,7 @@ class MetasploitModule < Msf::Auxiliary
       [
         OptPath.new('FILELIST',  [ true, "File containing sensitive files, one per line",
           File.join(Msf::Config.data_directory, "wordlists", "sensitive_files.txt") ]),
-        OptString.new('HTTPUSERNAME',[ true, 'User to login with', 'service']),
+        OptString.new('HttpUsername',[ true, 'User to login with', 'service']),
         OptString.new('HttpPassword',[ true, 'Password to login with', 'service'])
       ], self.class)
   end
@@ -82,7 +82,7 @@ class MetasploitModule < Msf::Auxiliary
   end
 
   def run_host(ip)
-    user = datastore['HTTPUSERNAME']
+    user = datastore['HttpUsername']
     pass = datastore['HttpPassword']
 
     vprint_status("Trying to login with #{user} / #{pass}")

modules/auxiliary/scanner/http/pocketpad_login.rb

@@ -26,7 +26,7 @@ class MetasploitModule < Msf::Auxiliary
     'License'        => MSF_LICENSE
     ))
 
-    deregister_options('HTTPUSERNAME', 'HttpPassword')
+    deregister_options('HttpUsername', 'HttpPassword')
   end
 
   def run_host(ip)

modules/auxiliary/scanner/http/radware_appdirector_enum.rb

@@ -39,7 +39,7 @@ class MetasploitModule < Msf::Auxiliary
         OptString.new('PASSWORD', [true, "A specific password to authenticate with, deault 'radware'", "radware"])
       ], self.class)
 
-    deregister_options('HTTPUSERNAME', 'HttpPassword')
+    deregister_options('HttpUsername', 'HttpPassword')
   end
 
   def run_host(ip)

modules/auxiliary/scanner/http/symantec_web_gateway_login.rb

@@ -57,7 +57,7 @@ class MetasploitModule < Msf::Auxiliary
           stop_on_success:    datastore['STOP_ON_SUCCESS'],
           bruteforce_speed:   datastore['BRUTEFORCE_SPEED'],
           connection_timeout: 5,
-          http_username:      datastore['HTTPUSERNAME'],
+          http_username:      datastore['HttpUsername'],
           http_password:      datastore['HttpPassword']
         ))
     }.call

modules/auxiliary/scanner/http/tomcat_mgr_login.rb

@@ -113,7 +113,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 10,
-        http_username: datastore['HTTPUSERNAME'],
+        http_username: datastore['HttpUsername'],
         http_password: datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/http/wordpress_multicall_creds.rb

@@ -116,7 +116,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5,
-        http_username: datastore['HTTPUSERNAME'],
+        http_username: datastore['HttpUsername'],
         http_password: datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/http/wordpress_xmlrpc_login.rb

@@ -70,7 +70,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5,
-        http_username: datastore['HTTPUSERNAME'],
+        http_username: datastore['HttpUsername'],
         http_password: datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/http/zabbix_login.rb

@@ -153,7 +153,7 @@ class MetasploitModule < Msf::Auxiliary
         stop_on_success:    datastore['STOP_ON_SUCCESS'],
         bruteforce_speed:   datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5,
-        http_username:      datastore['HTTPUSERNAME'],
+        http_username:      datastore['HttpUsername'],
         http_password:      datastore['HttpPassword']
       )
     )

modules/auxiliary/scanner/nessus/nessus_rest_login.rb

@@ -33,7 +33,7 @@ class MetasploitModule < Msf::Auxiliary
         OptString.new('TARGETURI', [ true,  'The path to the Nessus server login API', '/session']),
       ], self.class)
 
-    deregister_options('HTTPUSERNAME', 'HttpPassword')
+    deregister_options('HttpUsername', 'HttpPassword')
   end
 
 

modules/auxiliary/scanner/sap/sap_mgmt_con_brute_login.rb

@@ -40,7 +40,7 @@ class MetasploitModule < Msf::Auxiliary
       ], self.class)
     register_autofilter_ports([ 50013 ])
 
-    deregister_options('HTTPUSERNAME', 'HttpPassword')
+    deregister_options('HttpUsername', 'HttpPassword')
   end
 
   def run_host(rhost)

modules/auxiliary/scanner/sap/sap_smb_relay.rb

@@ -53,7 +53,7 @@ class MetasploitModule < Msf::Auxiliary
     register_options([
       Opt::RPORT(8000),
       OptString.new('CLIENT',   [true,  'SAP client', '001']),
-      OptString.new('HTTPUSERNAME', [false, 'Username (Ex SAP*)']),
+      OptString.new('HttpUsername', [false, 'Username (Ex SAP*)']),
       OptString.new('HttpPassword', [false, 'Password (Ex 06071992)']),
       OptAddress.new('LHOST',   [true,  'Server IP or hostname of the SMB Capture system']),
       OptEnum.new('ABUSE',      [true,  'SMB Relay abuse to use', "MMR",
@@ -69,7 +69,7 @@ class MetasploitModule < Msf::Auxiliary
   end
 
   def valid_credentials?
-    if datastore['HTTPUSERNAME'].blank?
+    if datastore['HttpUsername'].blank?
       return false
     end
 
@@ -98,7 +98,7 @@ class MetasploitModule < Msf::Auxiliary
       res = send_request_raw({
         'uri' => '/sap/bw/xml/soap/xmla?sap-client=' + datastore['CLIENT'] + '&sap-language=EN',
         'method' => 'POST',
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'data' => data,
         'ctype' => 'text/xml; charset=UTF-8',
         'cookie' => 'sap-usercontext=sap-language=EN&sap-client=' + datastore['CLIENT']
@@ -118,7 +118,7 @@ class MetasploitModule < Msf::Auxiliary
     begin
       smb_uri = "\\\\#{datastore['LHOST']}\\#{Rex::Text.rand_text_alpha_lower(7)}.#{Rex::Text.rand_text_alpha_lower(3)}"
 
-      if datastore['HTTPUSERNAME'].empty?
+      if datastore['HttpUsername'].empty?
         vprint_status("#{rhost}:#{rport} - Sending unauthenticated request for #{smb_uri}")
         res = send_request_cgi({
           'uri' => '/mmr/MMR',
@@ -137,7 +137,7 @@ class MetasploitModule < Msf::Auxiliary
         res = send_request_cgi({
           'uri' => '/mmr/MMR',
           'method' => 'GET',
-          'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+          'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
           'cookie' => 'sap-usercontext=sap-language=EN&sap-client=' + datastore['CLIENT'],
           'ctype' => 'text/xml; charset=UTF-8',
           'vars_get' => {
@@ -169,7 +169,7 @@ class MetasploitModule < Msf::Auxiliary
         'uri' => '/sap/bc/soap/rfc',
         'method' => 'POST',
         'data' => data,
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'cookie' => 'sap-usercontext=sap-language=EN&sap-client=' + datastore['CLIENT'],
         'ctype' => 'text/xml; charset=UTF-8',
         'headers' => {

modules/auxiliary/scanner/sap/sap_soap_bapi_user_create1.rb

@@ -43,7 +43,7 @@ class MetasploitModule < Msf::Auxiliary
     register_options([
       Opt::RPORT(8000),
       OptString.new('CLIENT', [true, 'SAP client', '001']),
-      OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+      OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
       OptString.new('HttpPassword', [true, 'Password', '06071992']),
       OptString.new('BAPI_FIRST',[true,'First name','John']),
       OptString.new('BAPI_LAST',[true,'Last name','Doe']),
@@ -103,7 +103,7 @@ class MetasploitModule < Msf::Auxiliary
         'data' => data,
         'cookie' => "sap-usercontext=sap-language=EN&sap-client=#{datastore['CLIENT']}",
         'ctype' => 'text/xml; charset=UTF-8',
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'headers' => {
           'SOAPAction' => 'urn:sap-com:document:sap:rfc:functions',
         },

modules/auxiliary/scanner/sap/sap_soap_rfc_brute_login.rb

@@ -50,7 +50,7 @@ class MetasploitModule < Msf::Auxiliary
           File.join(Msf::Config.data_directory, "wordlists", "sap_default.txt") ])
       ], self.class)
 
-    deregister_options('HTTPUSERNAME', 'HttpPassword')
+    deregister_options('HttpUsername', 'HttpPassword')
   end
 
   def run_host(rhost)

modules/auxiliary/scanner/sap/sap_soap_rfc_dbmcli_sxpg_call_system_command_exec.rb

@@ -43,7 +43,7 @@ class MetasploitModule < Msf::Auxiliary
     register_options(
       [
         OptString.new('CLIENT', [true, 'SAP Client', '001']),
-        OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+        OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
         OptString.new('HttpPassword', [true, 'Password', '06071992']),
         OptEnum.new('OS', [true, 'Target OS', "linux", ['linux','windows']]),
         OptString.new('CMD', [true, 'Command to run', "id"])
@@ -98,7 +98,7 @@ class MetasploitModule < Msf::Auxiliary
         'data' => data,
         'cookie' => "sap-usercontext=sap-language=EN&sap-client=#{datastore['CLIENT']}",
         'ctype' => 'text/xml; charset=UTF-8',
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'headers' => {
           'SOAPAction' => 'urn:sap-com:document:sap:rfc:functions',
         },

modules/auxiliary/scanner/sap/sap_soap_rfc_dbmcli_sxpg_command_exec.rb

@@ -44,7 +44,7 @@ class MetasploitModule < Msf::Auxiliary
       [
         Opt::RPORT(8000),
         OptString.new('CLIENT', [true, 'SAP Client', '001']),
-        OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+        OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
         OptString.new('HttpPassword', [true, 'Password', '06071992']),
         OptEnum.new('OS', [true, 'Target OS', "linux", ['linux','windows']]),
         OptString.new('CMD', [true, 'Command to run', "id"])
@@ -99,7 +99,7 @@ class MetasploitModule < Msf::Auxiliary
         'data' => data,
         'cookie' => "sap-usercontext=sap-language=EN&sap-client=#{datastore['CLIENT']}",
         'ctype' => 'text/xml; charset=UTF-8',
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'headers' => {
           'SOAPAction' => 'urn:sap-com:document:sap:rfc:functions',
         },

modules/auxiliary/scanner/sap/sap_soap_rfc_eps_get_directory_listing.rb

@@ -50,7 +50,7 @@ class MetasploitModule < Msf::Auxiliary
     register_options([
       Opt::RPORT(8000),
       OptString.new('CLIENT', [true, 'SAP Client', '001']),
-      OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+      OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
       OptString.new('HttpPassword', [true, 'Password', '06071992']),
       OptString.new('DIR',[true,'Directory path (e.g. /etc)','/etc'])
     ], self.class)
@@ -75,7 +75,7 @@ class MetasploitModule < Msf::Auxiliary
         'uri' => '/sap/bc/soap/rfc',
         'method' => 'POST',
         'data' => data,
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'cookie' => 'sap-usercontext=sap-language=EN&sap-client=' + datastore['CLIENT'],
         'ctype' => 'text/xml; charset=UTF-8',
         'headers' => {

modules/auxiliary/scanner/sap/sap_soap_rfc_pfl_check_os_file_existence.rb

@@ -52,7 +52,7 @@ class MetasploitModule < Msf::Auxiliary
 
     register_options([
       OptString.new('CLIENT', [true, 'SAP Client', '001']),
-      OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+      OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
       OptString.new('HttpPassword', [true, 'Password', '06071992']),
       OptString.new('FILEPATH',[true,'File Path to check for  (e.g. /etc)','/etc/passwd'])
     ], self.class)
@@ -77,7 +77,7 @@ class MetasploitModule < Msf::Auxiliary
         'uri' => '/sap/bc/soap/rfc',
         'method' => 'POST',
         'data' => data,
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'cookie' => 'sap-usercontext=sap-language=EN&sap-client=' + datastore['CLIENT'],
         'ctype' => 'text/xml; charset=UTF-8',
         'headers' => {

modules/auxiliary/scanner/sap/sap_soap_rfc_ping.rb

@@ -45,7 +45,7 @@ class MetasploitModule < Msf::Auxiliary
       [
         Opt::RPORT(8000),
         OptString.new('CLIENT', [true, 'Client', '001']),
-        OptString.new('HTTPUSERNAME', [true, 'Username ', 'SAP*']),
+        OptString.new('HttpUsername', [true, 'Username ', 'SAP*']),
         OptString.new('HttpPassword', [true, 'Password ', '06071992'])
       ], self.class)
   end
@@ -66,7 +66,7 @@ class MetasploitModule < Msf::Auxiliary
         'method' => 'POST',
         'cookie' => "sap-usercontext=sap-language=EN&sap-client=#{client}",
         'data' => data,
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'ctype'  => 'text/xml; charset=UTF-8',
         'headers' => {
           'SOAPAction' => 'urn:sap-com:document:sap:rfc:functions'

modules/auxiliary/scanner/sap/sap_soap_rfc_read_table.rb

@@ -45,7 +45,7 @@ class MetasploitModule < Msf::Auxiliary
       [
         Opt::RPORT(8000),
         OptString.new('CLIENT', [true, 'SAP client', '001']),
-        OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+        OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
         OptString.new('HttpPassword', [true, 'Password', '06071992']),
         OptString.new('TABLE', [true, 'Table to read', 'USR02']),
         OptString.new('FIELDS', [true, 'Fields to read', 'BNAME,BCODE'])
@@ -87,7 +87,7 @@ class MetasploitModule < Msf::Auxiliary
         'method' => 'POST',
         'data' => data,
         'cookie' => "sap-usercontext=sap-language=EN&sap-client=#{datastore['CLIENT']}",
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'ctype' => 'text/xml; charset=UTF-8',
         'encode_params' => false,
         'headers' => {

modules/auxiliary/scanner/sap/sap_soap_rfc_rzl_read_dir.rb

@@ -51,7 +51,7 @@ class MetasploitModule < Msf::Auxiliary
 
     register_options([
       OptString.new('CLIENT', [true, 'SAP Client', '001']),
-      OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+      OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
       OptString.new('HttpPassword', [true, 'Password', '06071992']),
       OptString.new('DIR',[true,'Directory path (e.g. /etc)','/etc'])
     ], self.class)
@@ -99,7 +99,7 @@ class MetasploitModule < Msf::Auxiliary
         'uri' => '/sap/bc/soap/rfc',
         'method' => 'POST',
         'data' => data,
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'cookie' => 'sap-usercontext=sap-language=EN&sap-client=' + datastore['CLIENT'],
         'ctype' => 'text/xml; charset=UTF-8',
         'headers' => {

modules/auxiliary/scanner/sap/sap_soap_rfc_susr_rfc_user_interface.rb

@@ -43,7 +43,7 @@ class MetasploitModule < Msf::Auxiliary
       [
         Opt::RPORT(8000),
         OptString.new('CLIENT', [true, 'SAP client', '001']),
-        OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+        OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
         OptString.new('HttpPassword', [true, 'Password', '06071992']),
         OptString.new('ABAP_PASSWORD',[false,'Password for the account (Default is msf1234)','msf1234']),
         OptString.new('ABAP_USER',[false,'Username for the account (Username in upper case only. Default is MSF)', 'MSF'])
@@ -76,7 +76,7 @@ class MetasploitModule < Msf::Auxiliary
         'cookie' => "sap-usercontext=sap-language=EN&sap-client=#{datastore['CLIENT']}",
         'ctype' => 'text/xml; charset=UTF-8',
         'encode_params' => false,
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'headers'  => {
           'SOAPAction' => 'urn:sap-com:document:sap:rfc:functions'
         },

modules/auxiliary/scanner/sap/sap_soap_rfc_sxpg_call_system_exec.rb

@@ -45,7 +45,7 @@ class MetasploitModule < Msf::Auxiliary
       [
         Opt::RPORT(8000),
         OptString.new('CLIENT', [true, 'SAP Client', '001']),
-        OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+        OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
         OptString.new('HttpPassword', [true, 'Password', '06071992']),
         OptString.new('CMD', [true, 'SM69 command to be executed', 'PING']),
         OptString.new('PARAM', [false, 'Additional parameters for the SM69 command', nil]),
@@ -79,7 +79,7 @@ class MetasploitModule < Msf::Auxiliary
         'cookie' => "sap-usercontext=sap-language=EN&sap-client=#{datastore['CLIENT']}",
         'ctype' => 'text/xml; charset=UTF-8',
         'encode_params' => false,
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'headers' => {
           'SOAPAction' => 'urn:sap-com:document:sap:rfc:functions',
         },

modules/auxiliary/scanner/sap/sap_soap_rfc_sxpg_command_exec.rb

@@ -45,7 +45,7 @@ class MetasploitModule < Msf::Auxiliary
       [
         Opt::RPORT(8000),
         OptString.new('CLIENT', [true, 'SAP Client', '001']),
-        OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+        OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
         OptString.new('HttpPassword', [true, 'Password', '06071992']),
         OptString.new('CMD', [true, 'SM69 command to be executed', 'PING']),
         OptString.new('PARAM', [false, 'Additional parameters for the SM69 command', nil]),
@@ -79,7 +79,7 @@ class MetasploitModule < Msf::Auxiliary
         'cookie' => "sap-usercontext=sap-language=EN&sap-client=#{datastore['CLIENT']}",
         'ctype' => 'text/xml; charset=UTF-8',
         'encode_params' => false,
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'headers' =>{
           'SOAPAction' => 'urn:sap-com:document:sap:rfc:functions',
         },

modules/auxiliary/scanner/sap/sap_soap_rfc_system_info.rb

@@ -47,7 +47,7 @@ class MetasploitModule < Msf::Auxiliary
       [
         Opt::RPORT(8000),
         OptString.new('CLIENT', [true, 'SAP Client ', '001']),
-        OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+        OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
         OptString.new('HttpPassword', [true, 'Password', '06071992']),
       ], self.class)
   end
@@ -95,7 +95,7 @@ class MetasploitModule < Msf::Auxiliary
         'cookie' => "sap-usercontext=sap-language=EN&sap-client=#{datastore['CLIENT']}",
         'ctype' => 'text/xml; charset=UTF-8',
         'encode_params' => false,
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'headers' =>{
           'SOAPAction' => 'urn:sap-com:document:sap:rfc:functions',
         },

modules/auxiliary/scanner/sap/sap_soap_th_saprel_disclosure.rb

@@ -45,7 +45,7 @@ class MetasploitModule < Msf::Auxiliary
       [
         Opt::RPORT(8000),
         OptString.new('CLIENT', [true, 'SAP Client', '001']),
-        OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+        OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
         OptString.new('HttpPassword', [true, 'Password', '06071992'])
       ], self.class)
   end
@@ -70,7 +70,7 @@ class MetasploitModule < Msf::Auxiliary
         'cookie' => "sap-usercontext=sap-language=EN&sap-client=#{datastore['CLIENT']}",
         'ctype' => 'text/xml; charset=UTF-8',
         'encode_params' => false,
-        'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+        'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
         'headers' => {
           'SOAPAction' => 'urn:sap-com:document:sap:rfc:functions',
         },

modules/exploits/linux/http/dlink_dcs931l_upload.rb

@@ -60,7 +60,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     register_options(
       [
-        OptString.new('HTTPUSERNAME',  [true, 'Camera username', 'admin']),
+        OptString.new('HttpUsername',  [true, 'Camera username', 'admin']),
         OptString.new('HttpPassword',  [false, 'Camera password (default: blank)', ''])
       ], self.class)
   end
@@ -68,7 +68,7 @@ class MetasploitModule < Msf::Exploit::Remote
   def check
     res = send_request_cgi(
       'uri' => normalize_uri('uploadfile.htm'),
-      'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword'])
+      'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword'])
     )
 
     unless res
@@ -126,7 +126,7 @@ class MetasploitModule < Msf::Exploit::Remote
     res = send_request_cgi(
       'method' => 'POST',
       'uri' => normalize_uri('setSystemAdmin'),
-      'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+      'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
       'vars_post' => Hash[{
         'ReplySuccessPage' => 'advanced.htm',
         'ReplyErrorPage' => 'errradv.htm',
@@ -203,7 +203,7 @@ EOF
     send_request_cgi(
       'method' => 'POST',
       'uri' => normalize_uri('setFileUpload'),
-      'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+      'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
       'ctype' => "multipart/form-data; boundary=#{boundary}",
       'data' => post_data)
   end

modules/exploits/linux/http/dlink_dcs_930l_authenticated_remote_command_execution.rb

@@ -46,7 +46,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     register_options(
       [
-        OptString.new('HTTPUSERNAME', [ true, 'User to login with', 'admin']),
+        OptString.new('HttpUsername', [ true, 'User to login with', 'admin']),
         OptString.new('HttpPassword', [ false, 'Password to login with', ''])
       ], self.class)
 
@@ -66,7 +66,7 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def exploit
-    user = datastore['HTTPUSERNAME']
+    user = datastore['HttpUsername']
     pass = datastore['HttpPassword'] || ''
 
     test_login(user, pass)

modules/exploits/linux/http/f5_icall_cmd.rb

@@ -55,7 +55,7 @@ class MetasploitModule < Msf::Exploit::Remote
         Opt::RPORT(443),
         OptBool.new('SSL', [true, 'Use SSL', true]),
         OptString.new('TARGETURI', [true, 'The base path to the iControl installation', '/iControl/iControlPortal.cgi']),
-        OptString.new('HTTPUSERNAME', [true, 'The username to authenticate with', 'admin']),
+        OptString.new('HttpUsername', [true, 'The username to authenticate with', 'admin']),
         OptString.new('HttpPassword', [true, 'The password to authenticate with', 'admin'])
       ])
     register_advanced_options(
@@ -103,7 +103,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'uri' => normalize_uri(target_uri.path),
       'method' => 'POST',
       'data' => pay,
-      'username' => datastore['HTTPUSERNAME'],
+      'username' => datastore['HttpUsername'],
       'password' => datastore['HttpPassword']
     )
     if res

modules/exploits/linux/http/f5_icontrol_exec.rb

@@ -43,7 +43,7 @@ class MetasploitModule < Msf::Exploit::Remote
           Opt::RPORT(443),
           OptBool.new('SSL', [true, 'Use SSL', true]),
           OptString.new('TARGETURI', [true, 'The base path to the iControl installation', '/']),
-          OptString.new('HTTPUSERNAME', [true, 'The username to authenticate with', 'admin']),
+          OptString.new('HttpUsername', [true, 'The username to authenticate with', 'admin']),
           OptString.new('HttpPassword', [true, 'The password to authenticate with', 'admin'])
         ], self.class)
   end
@@ -61,7 +61,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'uri' => normalize_uri(target_uri.path, 'iControl', 'iControlPortal.cgi'),
       'method' => 'POST',
       'data' => get_hostname,
-      'username' => datastore['HTTPUSERNAME'],
+      'username' => datastore['HttpUsername'],
       'password' => datastore['HttpPassword']
     })
 
@@ -73,7 +73,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'uri' => normalize_uri(target_uri.path, 'iControl', 'iControlPortal.cgi'),
       'method' => 'POST',
       'data' => get_hostname,
-      'username' => datastore['HTTPUSERNAME'],
+      'username' => datastore['HttpUsername'],
       'password' => datastore['HttpPassword']
     })
 
@@ -95,7 +95,7 @@ class MetasploitModule < Msf::Exploit::Remote
         'uri' => normalize_uri(target_uri.path, 'iControl', 'iControlPortal.cgi'),
         'method' => 'POST',
         'data' => pay,
-        'username' => datastore['HTTPUSERNAME'],
+        'username' => datastore['HttpUsername'],
         'password' => datastore['HttpPassword']
       })
 
@@ -120,7 +120,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'uri' => normalize_uri(target_uri.path, 'iControl', 'iControlPortal.cgi'),
       'method' => 'POST',
       'data' => pay,
-      'username' => datastore['HTTPUSERNAME'],
+      'username' => datastore['HttpUsername'],
       'password' => datastore['HttpPassword']
     })
   end

modules/exploits/linux/http/linksys_e1500_apply_exec.rb

@@ -63,7 +63,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     register_options(
       [
-        OptString.new('HTTPUSERNAME', [ true, 'The username to authenticate as', 'admin' ]),
+        OptString.new('HttpUsername', [ true, 'The username to authenticate as', 'admin' ]),
         OptString.new('HttpPassword', [ true, 'The password for the specified username', 'admin' ]),
         OptAddress.new('DOWNHOST', [ false, 'An alternative host to request the MIPS payload from' ]),
         OptString.new('DOWNFILE', [ false, 'Filename to download, (default: random)' ]),
@@ -100,7 +100,7 @@ class MetasploitModule < Msf::Exploit::Remote
   def exploit
     downfile = datastore['DOWNFILE'] || rand_text_alpha(8+rand(8))
     uri = '/apply.cgi'
-    user = datastore['HTTPUSERNAME']
+    user = datastore['HttpUsername']
     pass = datastore['HttpPassword']
     rhost = datastore['RHOST']
     rport = datastore['RPORT']

modules/exploits/linux/http/linksys_wrt110_cmd_exec.rb

@@ -43,7 +43,7 @@ class MetasploitModule < Msf::Exploit::Remote
       ))
 
     register_options([
-      OptString.new('HTTPUSERNAME', [ false, 'Valid router administrator username', 'admin']),
+      OptString.new('HttpUsername', [ false, 'Valid router administrator username', 'admin']),
       OptString.new('HttpPassword', [ false, 'Password to login with', 'admin']),
       OptAddress.new('RHOST', [true, 'The address of the router', '192.168.1.1']),
       OptInt.new('TIMEOUT', [false, 'The timeout to use in every request', 20])
@@ -106,7 +106,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
   # Helper methods
   def user
-    datastore['HTTPUSERNAME']
+    datastore['HttpUsername']
   end
 
   def pass

modules/exploits/linux/http/linksys_wrt160nv2_apply_exec.rb

@@ -65,7 +65,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     register_options(
       [
-        OptString.new('HTTPUSERNAME', [ true, 'The username to authenticate as', 'admin' ]),
+        OptString.new('HttpUsername', [ true, 'The username to authenticate as', 'admin' ]),
         OptString.new('HttpPassword', [ true, 'The password for the specified username', 'admin' ]),
         OptAddress.new('LHOST', [ true, 'The listen IP address from where the victim downloads the MIPS payload' ]),
         OptString.new('DOWNFILE', [ false, 'Filename to download, (default: random)' ]),
@@ -102,7 +102,7 @@ class MetasploitModule < Msf::Exploit::Remote
   def exploit
     downfile = datastore['DOWNFILE'] || rand_text_alpha(8+rand(4))
     uri = '/apply.cgi'
-    user = datastore['HTTPUSERNAME']
+    user = datastore['HttpUsername']
     pass = datastore['HttpPassword']
     lhost = datastore['LHOST']
 

modules/exploits/linux/http/linksys_wrt54gl_apply_exec.rb

@@ -65,7 +65,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     register_options(
       [
-        OptString.new('HTTPUSERNAME', [ true, 'The username to authenticate as', 'admin' ]),
+        OptString.new('HttpUsername', [ true, 'The username to authenticate as', 'admin' ]),
         OptString.new('HttpPassword', [ true, 'The password for the specified username', 'admin' ]),
         OptAddress.new('DOWNHOST', [ false, 'An alternative host to request the MIPS payload from' ]),
         OptString.new('DOWNFILE', [ false, 'Filename to download, (default: random)' ]),
@@ -243,7 +243,7 @@ class MetasploitModule < Msf::Exploit::Remote
   def exploit
     downfile = datastore['DOWNFILE'] || rand_text_alpha(8+rand(8))
     uri = '/apply.cgi'
-    user = datastore['HTTPUSERNAME']
+    user = datastore['HttpUsername']
     pass = datastore['HttpPassword']
     rhost = datastore['RHOST']
     rport = datastore['RPORT']

modules/exploits/linux/http/netgear_dgn1000b_setup_exec.rb

@@ -65,7 +65,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     register_options(
       [
-        OptString.new('HTTPUSERNAME', [ true, 'The username to authenticate as', 'admin' ]),
+        OptString.new('HttpUsername', [ true, 'The username to authenticate as', 'admin' ]),
         OptString.new('HttpPassword', [ true, 'The password for the specified username', 'password' ]),
         OptAddress.new('DOWNHOST', [ false, 'An alternative host to request the MIPS payload from' ]),
         OptString.new('DOWNFILE', [ false, 'Filename to download, (default: random)' ]),
@@ -104,7 +104,7 @@ class MetasploitModule < Msf::Exploit::Remote
   def exploit
     downfile = datastore['DOWNFILE'] || rand_text_alpha(8+rand(8))
     uri = '/setup.cgi'
-    user = datastore['HTTPUSERNAME']
+    user = datastore['HttpUsername']
     pass = datastore['HttpPassword']
     rhost = datastore['RHOST']
     rport = datastore['RPORT']

modules/exploits/linux/http/netgear_dgn2200b_pppoe_exec.rb

@@ -65,7 +65,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     register_options(
       [
-        OptString.new('HTTPUSERNAME', [ true, 'The username to authenticate as', 'admin' ]),
+        OptString.new('HttpUsername', [ true, 'The username to authenticate as', 'admin' ]),
         OptString.new('HttpPassword', [ true, 'The password for the specified username', 'password' ]),
         OptAddress.new('DOWNHOST', [ false, 'An alternative host to request the MIPS payload from' ]),
         OptString.new('DOWNFILE', [ false, 'Filename to download, (default: random)' ]),
@@ -217,7 +217,7 @@ class MetasploitModule < Msf::Exploit::Remote
   def exploit
     downfile = datastore['DOWNFILE'] || rand_text_alpha(8+rand(8))
     uri = '/pppoe.cgi'
-    user = datastore['HTTPUSERNAME']
+    user = datastore['HttpUsername']
     pass = datastore['HttpPassword']
     @timeout = datastore['RELOAD_CONF_DELAY']
 

modules/exploits/linux/http/piranha_passwd_exec.rb

@@ -70,7 +70,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     register_options(
       [
-        OptString.new('HTTPUSERNAME', [true, 'The HTTP username to specify for basic authentication', 'piranha']),
+        OptString.new('HttpUsername', [true, 'The HTTP username to specify for basic authentication', 'piranha']),
         OptString.new('HttpPassword', [true, 'The HTTP password to specify for basic authentication', 'q'])
       ], self.class)
   end

modules/exploits/linux/http/tp_link_sc2020n_authenticated_telnet_injection.rb

@@ -45,7 +45,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
         register_options(
           [
-            OptString.new('HTTPUSERNAME', [ true, 'User to login with', 'admin']),
+            OptString.new('HttpUsername', [ true, 'User to login with', 'admin']),
             OptString.new('HttpPassword', [ true, 'Password to login with', 'admin'])
           ], self.class)
 
@@ -66,7 +66,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     def exploit
       print_status('Exploiting')
-      user = datastore['HTTPUSERNAME']
+      user = datastore['HttpUsername']
       pass = datastore['HttpPassword']
       test_login(user, pass)
       exploit_telnet

modules/exploits/linux/http/zen_load_balancer_exec.rb

@@ -59,7 +59,7 @@ class MetasploitModule < Msf::Exploit::Remote
       [
         Opt::RPORT(444),
         OptBool.new('SSL', [true, 'Use SSL', true]),
-        OptString.new('HTTPUSERNAME', [true, 'The username for the application', 'admin']),
+        OptString.new('HttpUsername', [true, 'The username for the application', 'admin']),
         OptString.new('HttpPassword', [true, 'The password for the application', 'admin'])
       ], self.class)
   end
@@ -86,7 +86,7 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def exploit
-    user  = datastore['HTTPUSERNAME']
+    user  = datastore['HttpUsername']
     pass  = datastore['HttpPassword']
     cmd   = Rex::Text.uri_encode(";#{payload.encoded}&")
     lines = rand(100) + 1

modules/exploits/multi/http/cups_bash_env_exec.rb

@@ -59,7 +59,7 @@ class MetasploitModule < Msf::Exploit::Remote
     register_options([
       Opt::RPORT(631),
       OptBool.new('SSL', [ true, 'Use SSL', true ]),
-      OptString.new('HTTPUSERNAME', [ true, 'CUPS username', 'root']),
+      OptString.new('HttpUsername', [ true, 'CUPS username', 'root']),
       OptString.new('HttpPassword', [ true, 'CUPS user password', '']),
       OptEnum.new('CVE', [ true, 'CVE to exploit', 'CVE-2014-6271', ['CVE-2014-6271', 'CVE-2014-6278'] ]),
       OptString.new('RPATH', [ true, 'Target PATH for binaries', '/bin' ])
@@ -233,7 +233,7 @@ EOF
       'ctype' => "multipart/form-data; boundary=#{pd.bound}",
       'data' => data,
       'cookie' => "org.cups.sid=#{@cookie};",
-      'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword'])
+      'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword'])
     )
   end
 
@@ -245,7 +245,7 @@ EOF
     send_request_cgi(
       'method' => 'POST',
       'uri' => normalize_uri(target_uri.path, 'printers', printer_name),
-      'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+      'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
       'cookie' => "org.cups.sid=#{@cookie}",
       'vars_post' => {
         'org.cups.sid' => @cookie,
@@ -262,7 +262,7 @@ EOF
     send_request_cgi(
       'method' => 'POST',
       'uri' => normalize_uri(target_uri.path, 'admin'),
-      'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+      'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
       'cookie' => "org.cups.sid=#{@cookie}",
       'vars_post' => {
         'org.cups.sid' => @cookie,

modules/exploits/multi/http/gestioip_exec.rb

@@ -46,13 +46,13 @@ class MetasploitModule < Msf::Exploit::Remote
     register_options(
     [
       OptString.new('TARGETURI', [true, 'URI', '/gestioip/']),
-      OptString.new('HTTPUSERNAME', [false, 'The username to auth as', 'gipadmin']),
+      OptString.new('HttpUsername', [false, 'The username to auth as', 'gipadmin']),
       OptString.new('HttpPassword', [false, 'The password to auth with', nil])
     ], self.class)
   end
 
   def user
-    datastore['HTTPUSERNAME']
+    datastore['HttpUsername']
   end
 
   def pass

modules/exploits/multi/http/glassfish_deployer.rb

@@ -640,7 +640,7 @@ class MetasploitModule < Msf::Exploit::Remote
       configure_http_login_scanner(
         cred_details: @cred_collection,
         connection_timeout: 5,
-        http_username: datastore['HTTPUSERNAME'],
+        http_username: datastore['HttpUsername'],
         http_password: datastore['HttpPassword']
       )
     )

modules/exploits/multi/http/jboss_maindeployer.rb

@@ -82,7 +82,7 @@ class MetasploitModule < Msf::Exploit::Remote
     register_options(
       [
         Opt::RPORT(8080),
-        OptString.new('HTTPUSERNAME', [ false, 'The username to authenticate as' ]),
+        OptString.new('HttpUsername', [ false, 'The username to authenticate as' ]),
         OptString.new('HttpPassword', [ false, 'The password for the specified username' ]),
         OptString.new('JSP',      [ false, 'JSP name to use without .jsp extension (default: random)', nil ]),
         OptString.new('APPBASE',  [ false, 'Application base name, (default: random)', nil ]),

modules/exploits/multi/http/netwin_surgeftp_exec.rb

@@ -41,7 +41,7 @@ class MetasploitModule < Msf::Exploit::Remote
     register_options(
       [
         Opt::RPORT(7021),
-        OptString.new('HTTPUSERNAME', [ true, 'The username with admin role to authenticate as', 'admin' ]),
+        OptString.new('HttpUsername', [ true, 'The username with admin role to authenticate as', 'admin' ]),
         OptString.new('HttpPassword', [ true, 'The password for the specified username', 'password' ])
       ], self.class)
   end
@@ -64,7 +64,7 @@ class MetasploitModule < Msf::Exploit::Remote
     {
       'uri'     => '/cgi/surgeftpmgr.cgi',
       'method'  => 'POST',
-      'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+      'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
       'vars_post' =>
         {
           'global_smtp' => "",

modules/exploits/multi/http/tomcat_mgr_deploy.rb

@@ -102,7 +102,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     register_options(
       [
-        OptString.new('HTTPUSERNAME', [ false, 'The username to authenticate as' ]),
+        OptString.new('HttpUsername', [ false, 'The username to authenticate as' ]),
         OptString.new('HttpPassword', [ false, 'The password for the specified username' ]),
         # /cognos_express/manager/ for Cognos Express (19300)
         OptString.new('PATH', [ true,  "The URI path of the manager app (/deploy and /undeploy will be used)", '/manager'])
@@ -313,7 +313,7 @@ class MetasploitModule < Msf::Exploit::Remote
         module_fullname: self.fullname,
         private_type: :password,
         private_data: datastore['HttpPassword'].downcase,
-        username: datastore['HTTPUSERNAME']
+        username: datastore['HttpUsername']
     }
 
     credential_data.merge!(service_data)

modules/exploits/multi/http/tomcat_mgr_upload.rb

@@ -95,7 +95,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     register_options(
       [
-        OptString.new('HTTPUSERNAME', [false, 'The username to authenticate as']),
+        OptString.new('HttpUsername', [false, 'The username to authenticate as']),
         OptString.new('HttpPassword', [false, 'The password for the specified username']),
         # /cognos_express/manager/ for Cognos Express (19300)
         OptString.new('TARGETURI', [true, "The URI path of the manager app (/html/upload and /undeploy will be used)", '/manager'])
@@ -309,7 +309,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'uri'          => url,
       'method'       => 'POST',
       'ctype'        => 'multipart/form-data; boundary=---------------------------' + boundary_identifier,
-      'user'         => datastore['HTTPUSERNAME'],
+      'user'         => datastore['HttpUsername'],
       'password'     => datastore['HttpPassword'],
       'cookie'       => @session_id,
       'vars_get'     => vars_get,
@@ -324,7 +324,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'uri'          => url,
       'vars_get'     => vars_get,
       'method'       => 'POST',
-      'user'         => datastore['HTTPUSERNAME'],
+      'user'         => datastore['HttpUsername'],
       'password'     => datastore['HttpPassword'],
       'cookie'       => @session_id
     })
@@ -418,7 +418,7 @@ class MetasploitModule < Msf::Exploit::Remote
         module_fullname: self.fullname,
         private_type: :password,
         private_data: datastore['HttpPassword'].downcase,
-        username: datastore['HTTPUSERNAME']
+        username: datastore['HttpUsername']
     }
 
     credential_data.merge!(service_data)

modules/exploits/multi/http/visual_mining_netcharts_upload.rb

@@ -53,7 +53,7 @@ class MetasploitModule < Msf::Exploit::Remote
     register_options(
       [
         Opt::RPORT(8001),
-        OptString.new('HTTPUSERNAME', [false, "The username to authenticate with"]),
+        OptString.new('HttpUsername', [false, "The username to authenticate with"]),
         OptString.new('HttpPassword', [false, "The password to authenticate with"])
       ], self.class)
   end
@@ -123,7 +123,7 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def username
-    datastore['HTTPUSERNAME'].blank? ? DEFAULT_USERNAME : datastore['HTTPUSERNAME']
+    datastore['HttpUsername'].blank? ? DEFAULT_USERNAME : datastore['HttpUsername']
   end
 
   def password

modules/exploits/multi/sap/sap_soap_rfc_sxpg_call_system_exec.rb

@@ -83,7 +83,7 @@ class MetasploitModule < Msf::Exploit::Remote
       [
         Opt::RPORT(8000),
         OptString.new('CLIENT', [true, 'SAP Client', '001']),
-        OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+        OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
         OptString.new('HttpPassword', [true, 'Password', '06071992'])
       ], self.class)
     register_advanced_options(
@@ -97,7 +97,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'uri' => '/sap/bc/soap/rfc',
       'method' => 'POST',
       'data' => data,
-      'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+      'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
       'cookie' => 'sap-usercontext=sap-language=EN&sap-client=' + datastore['CLIENT'],
       'ctype' => 'text/xml; charset=UTF-8',
       'headers' => {

modules/exploits/multi/sap/sap_soap_rfc_sxpg_command_exec.rb

@@ -84,7 +84,7 @@ class MetasploitModule < Msf::Exploit::Remote
       [
         Opt::RPORT(8000),
         OptString.new('CLIENT', [true, 'SAP Client', '001']),
-        OptString.new('HTTPUSERNAME', [true, 'Username', 'SAP*']),
+        OptString.new('HttpUsername', [true, 'Username', 'SAP*']),
         OptString.new('HttpPassword', [true, 'Password', '06071992'])
       ], self.class)
     register_advanced_options(
@@ -98,7 +98,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'uri' => '/sap/bc/soap/rfc',
       'method' => 'POST',
       'data' => data,
-      'authorization' => basic_auth(datastore['HTTPUSERNAME'], datastore['HttpPassword']),
+      'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword']),
       'cookie' => 'sap-usercontext=sap-language=EN&sap-client=' + datastore['CLIENT'],
       'ctype' => 'text/xml; charset=UTF-8',
       'headers' => {

modules/exploits/unix/webapp/oracle_vm_agent_utl.rb

@@ -54,7 +54,7 @@ class MetasploitModule < Msf::Exploit::Remote
         Opt::RPORT(8899),
         OptBool.new('SSL', [ true, 'Use SSL', true ]),
         OptString.new('CMD', [ false,  "A single command to execute instead of the payload" ]),
-        OptString.new('HTTPUSERNAME', [ true,  "The user to authenticate as", 'oracle']),
+        OptString.new('HttpUsername', [ true,  "The user to authenticate as", 'oracle']),
         OptString.new('HttpPassword', [ true,  "The password to authenticate with" ])
       ], self.class)
 

modules/exploits/windows/http/easyftp_list.rb

@@ -70,7 +70,7 @@ class MetasploitModule < Msf::Exploit::Remote
     register_options(
       [
         Opt::RPORT(8080),
-        OptString.new('HTTPUSERNAME', [true, 'The HTTP username to specify for basic authentication', 'anonymous']),
+        OptString.new('HttpUsername', [true, 'The HTTP username to specify for basic authentication', 'anonymous']),
         OptString.new('HttpPassword', [true, 'The HTTP password to specify for basic authentication', 'mozilla@example.com'])
       ], self.class)
   end

modules/exploits/windows/iis/iis_webdav_upload_asp.rb

@@ -42,7 +42,7 @@ class MetasploitModule < Msf::Exploit::Remote
       [
       # The USERNAME and PASSWORD are registered again to make them more obvious they're
       # configurable.
-      OptString.new('HTTPUSERNAME',
+      OptString.new('HttpUsername',
         [false, 'The HTTP username to specify for authentication', '']),
       OptString.new('HttpPassword',
         [false, 'The HTTP password to specify for authentication', '']),