Missed the HTTPUSERNAME fix

Author: wchen-r7

modules/auxiliary/admin/appletv/appletv_display_image.rb

@@ -27,7 +27,7 @@ def initialize(info = {})
         [
           ['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 @@ def run
     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 @@ def run_host(ip)
         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 @@ def initialize(info = {})
       ], 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 @@ def scanner(ip)
           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 @@ def init_loginscanner(ip)
         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 @@ def initialize
           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 @@ def initialize
           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 @@ def initialize(info={})
     '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 @@ def initialize
     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 @@ def run_host(ip)
       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 @@ def init_loginscanner(ip)
         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']
       )
     )