Remove redundant params now provided by the mixin helper

Author: HD Moore

modules/auxiliary/scanner/http/appletv_login.rb

@@ -76,8 +76,6 @@ def run_host(ip)
 
     scanner = Metasploit::Framework::LoginScanner::HTTP.new(
       configure_http_login_scanner(
-        host: ip,
-        port: rport,
         uri: "/stop",
         cred_details: cred_collection,
         stop_on_success: datastore['STOP_ON_SUCCESS'],

modules/auxiliary/scanner/http/axis_login.rb

@@ -80,8 +80,6 @@ def run_host(ip)
 
     scanner = Metasploit::Framework::LoginScanner::Axis2.new(
       configure_http_login_scanner(
-        host: ip,
-        port: rport,
         uri: uri,
         cred_details: cred_collection,
         stop_on_success: datastore['STOP_ON_SUCCESS'],

modules/auxiliary/scanner/http/buffalo_login.rb

@@ -45,8 +45,6 @@ def run_host(ip)
 
     scanner = Metasploit::Framework::LoginScanner::Buffalo.new(
       configure_http_login_scanner(
-        host: ip,
-        port: rport,
         cred_details: cred_collection,
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],

modules/auxiliary/scanner/http/chef_webui_login.rb

@@ -143,18 +143,13 @@ def init_loginscanner(ip)
 
     @scanner = Metasploit::Framework::LoginScanner::ChefWebUI.new(
       configure_http_login_scanner(
-        host:               ip,
-        port:               rport,
         uri:                datastore['TARGETURI'],
         cred_details:       @cred_collection,
         stop_on_success:    datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5
       )
     )
-
-    @scanner.ssl         = datastore['SSL']
-    @scanner.ssl_version = datastore['SSLVERSION']
   end
 
 end

modules/auxiliary/scanner/http/glassfish_login.rb

@@ -52,11 +52,6 @@ def initialize
   # the LoginScanner class so the authentication can proceed properly
   #
 
-  # Overrides the ssl method from HttpClient
-  def ssl
-    @scanner.ssl || datastore['SSL']
-  end
-
   #
   # For a while, older versions of Glassfish didn't need to set a password for admin,
   # but looks like no longer the case anymore, which means this method is getting useless
@@ -96,17 +91,12 @@ def init_loginscanner(ip)
 
     @scanner = Metasploit::Framework::LoginScanner::Glassfish.new(
       configure_http_login_scanner(
-        host:               ip,
-        port:               rport,
         cred_details:       @cred_collection,
         stop_on_success:    datastore['STOP_ON_SUCCESS'],
         bruteforce_speed:   datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5
       )
     )
-
-    @scanner.ssl         = datastore['SSL']
-    @scanner.ssl_version = datastore['SSLVERSION']
   end
 
   def do_report(ip, port, result)

modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb

@@ -77,18 +77,13 @@ def init_loginscanner(ip)
 
     @scanner = Metasploit::Framework::LoginScanner::Smh.new(
       configure_http_login_scanner(
-        host:               ip,
-        port:               rport,
         uri:                datastore['URI'],
         cred_details:       @cred_collection,
         stop_on_success:    datastore['STOP_ON_SUCCESS'],
         bruteforce_speed:   datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 5
       )
     )
-
-    @scanner.ssl         = datastore['SSL']
-    @scanner.ssl_version = datastore['SSLVERSION']
   end
 
  def do_report(ip, port, result)

modules/auxiliary/scanner/http/http_login.rb

@@ -154,8 +154,6 @@ def run_host(ip)
 
     scanner = Metasploit::Framework::LoginScanner::HTTP.new(
       configure_http_login_scanner(
-        host: ip,
-        port: rport,
         uri: @uri,
         method: datastore['REQUESTTYPE'],
         cred_details: cred_collection,

modules/auxiliary/scanner/http/ipboard_login.rb

@@ -39,8 +39,6 @@ def run_host(ip)
 
     scanner = Metasploit::Framework::LoginScanner::IPBoard.new(
       configure_http_login_scanner(
-        host: ip,
-        port: rport,
         uri: normalize_uri(target_uri.path),
         cred_details: cred_collection,
         stop_on_success: datastore['STOP_ON_SUCCESS'],

modules/auxiliary/scanner/http/jenkins_login.rb

@@ -33,19 +33,17 @@ def initialize
 
   def run_host(ip)
     cred_collection = Metasploit::Framework::CredentialCollection.new(
-            blank_passwords: datastore['BLANK_PASSWORDS'],
-            pass_file: datastore['PASS_FILE'],
-            password: datastore['PASSWORD'],
-            user_file: datastore['USER_FILE'],
-            userpass_file: datastore['USERPASS_FILE'],
-            username: datastore['USERNAME'],
-            user_as_pass: datastore['USER_AS_PASS']
+      blank_passwords: datastore['BLANK_PASSWORDS'],
+      pass_file: datastore['PASS_FILE'],
+      password: datastore['PASSWORD'],
+      user_file: datastore['USER_FILE'],
+      userpass_file: datastore['USERPASS_FILE'],
+      username: datastore['USERNAME'],
+      user_as_pass: datastore['USER_AS_PASS']
     )
 
     scanner = Metasploit::Framework::LoginScanner::Jenkins.new(
       configure_http_login_scanner(
-        host: ip,
-        port: rport,
         cred_details: cred_collection,
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],

modules/auxiliary/scanner/http/mybook_live_login.rb

@@ -56,20 +56,13 @@ def run_host(ip)
 
     scanner = Metasploit::Framework::LoginScanner::MyBookLive.new(
       configure_http_login_scanner(
-        host: ip,
-        port: rport,
         cred_details: cred_collection,
         stop_on_success: datastore['STOP_ON_SUCCESS'],
         bruteforce_speed: datastore['BRUTEFORCE_SPEED'],
         connection_timeout: 10,
       )
     )
 
-    if ssl
-      scanner.ssl = datastore['SSL']
-      scanner.ssl_version = datastore['SSLVERSION']
-    end
-
     scanner.scan! do |result|
       credential_data = result.to_h
       credential_data.merge!(