From ea54696d99c0c5eb2753ef2d18ab488ee17aa979 Mon Sep 17 00:00:00 2001
From: HD Moore <hd_moore@rapid7.com>
Date: Sun, 22 Feb 2015 02:32:28 -0600
Subject: [PATCH] Remove redundant params now provided by the mixin helper

---
 modules/auxiliary/scanner/http/appletv_login.rb  |  2 --
 modules/auxiliary/scanner/http/axis_login.rb     |  2 --
 modules/auxiliary/scanner/http/buffalo_login.rb  |  2 --
 .../auxiliary/scanner/http/chef_webui_login.rb   |  5 -----
 .../auxiliary/scanner/http/glassfish_login.rb    | 10 ----------
 .../auxiliary/scanner/http/hp_sys_mgmt_login.rb  |  5 -----
 modules/auxiliary/scanner/http/http_login.rb     |  2 --
 modules/auxiliary/scanner/http/ipboard_login.rb  |  2 --
 modules/auxiliary/scanner/http/jenkins_login.rb  | 16 +++++++---------
 .../auxiliary/scanner/http/mybook_live_login.rb  |  7 -------
 .../auxiliary/scanner/http/tomcat_mgr_login.rb   |  2 --
 .../scanner/http/wordpress_xmlrpc_login.rb       |  2 --
 modules/auxiliary/scanner/http/zabbix_login.rb   |  5 -----
 13 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/modules/auxiliary/scanner/http/appletv_login.rb b/modules/auxiliary/scanner/http/appletv_login.rb
index 62d444e7c4..d2c30f1bf1 100644
--- a/modules/auxiliary/scanner/http/appletv_login.rb
+++ b/modules/auxiliary/scanner/http/appletv_login.rb
@@ -76,8 +76,6 @@ class Metasploit3 < Msf::Auxiliary
 
     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'],
diff --git a/modules/auxiliary/scanner/http/axis_login.rb b/modules/auxiliary/scanner/http/axis_login.rb
index b122fb537b..28a2480f75 100644
--- a/modules/auxiliary/scanner/http/axis_login.rb
+++ b/modules/auxiliary/scanner/http/axis_login.rb
@@ -80,8 +80,6 @@ class Metasploit3 < Msf::Auxiliary
 
     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'],
diff --git a/modules/auxiliary/scanner/http/buffalo_login.rb b/modules/auxiliary/scanner/http/buffalo_login.rb
index 1b40bbc050..26d643853f 100644
--- a/modules/auxiliary/scanner/http/buffalo_login.rb
+++ b/modules/auxiliary/scanner/http/buffalo_login.rb
@@ -45,8 +45,6 @@ class Metasploit3 < Msf::Auxiliary
 
     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'],
diff --git a/modules/auxiliary/scanner/http/chef_webui_login.rb b/modules/auxiliary/scanner/http/chef_webui_login.rb
index b851538310..c5145c1507 100644
--- a/modules/auxiliary/scanner/http/chef_webui_login.rb
+++ b/modules/auxiliary/scanner/http/chef_webui_login.rb
@@ -143,8 +143,6 @@ class Metasploit3 < Msf::Auxiliary
 
     @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'],
@@ -152,9 +150,6 @@ class Metasploit3 < Msf::Auxiliary
         connection_timeout: 5
       )
     )
-
-    @scanner.ssl         = datastore['SSL']
-    @scanner.ssl_version = datastore['SSLVERSION']
   end
 
 end
diff --git a/modules/auxiliary/scanner/http/glassfish_login.rb b/modules/auxiliary/scanner/http/glassfish_login.rb
index 506d607e7d..a128699012 100644
--- a/modules/auxiliary/scanner/http/glassfish_login.rb
+++ b/modules/auxiliary/scanner/http/glassfish_login.rb
@@ -52,11 +52,6 @@ class Metasploit3 < Msf::Auxiliary
   # 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 @@ class Metasploit3 < Msf::Auxiliary
 
     @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)
diff --git a/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb b/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
index 267b5220df..64ddd63dba 100644
--- a/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
+++ b/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
@@ -77,8 +77,6 @@ class Metasploit3 < Msf::Auxiliary
 
     @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'],
@@ -86,9 +84,6 @@ class Metasploit3 < Msf::Auxiliary
         connection_timeout: 5
       )
     )
-
-    @scanner.ssl         = datastore['SSL']
-    @scanner.ssl_version = datastore['SSLVERSION']
   end
 
  def do_report(ip, port, result)
diff --git a/modules/auxiliary/scanner/http/http_login.rb b/modules/auxiliary/scanner/http/http_login.rb
index 5be9df39e0..336b308834 100644
--- a/modules/auxiliary/scanner/http/http_login.rb
+++ b/modules/auxiliary/scanner/http/http_login.rb
@@ -154,8 +154,6 @@ class Metasploit3 < Msf::Auxiliary
 
     scanner = Metasploit::Framework::LoginScanner::HTTP.new(
       configure_http_login_scanner(
-        host: ip,
-        port: rport,
         uri: @uri,
         method: datastore['REQUESTTYPE'],
         cred_details: cred_collection,
diff --git a/modules/auxiliary/scanner/http/ipboard_login.rb b/modules/auxiliary/scanner/http/ipboard_login.rb
index ab5ad9fcff..2e32e763ef 100644
--- a/modules/auxiliary/scanner/http/ipboard_login.rb
+++ b/modules/auxiliary/scanner/http/ipboard_login.rb
@@ -39,8 +39,6 @@ class Metasploit3 < Msf::Auxiliary
 
     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'],
diff --git a/modules/auxiliary/scanner/http/jenkins_login.rb b/modules/auxiliary/scanner/http/jenkins_login.rb
index 1fd1e183cb..515618d3a5 100644
--- a/modules/auxiliary/scanner/http/jenkins_login.rb
+++ b/modules/auxiliary/scanner/http/jenkins_login.rb
@@ -33,19 +33,17 @@ class Metasploit3 < Msf::Auxiliary
 
   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'],
diff --git a/modules/auxiliary/scanner/http/mybook_live_login.rb b/modules/auxiliary/scanner/http/mybook_live_login.rb
index e76e7209e7..caeca141c7 100644
--- a/modules/auxiliary/scanner/http/mybook_live_login.rb
+++ b/modules/auxiliary/scanner/http/mybook_live_login.rb
@@ -56,8 +56,6 @@ class Metasploit3 < Msf::Auxiliary
 
     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'],
@@ -65,11 +63,6 @@ class Metasploit3 < Msf::Auxiliary
       )
     )
 
-    if ssl
-      scanner.ssl = datastore['SSL']
-      scanner.ssl_version = datastore['SSLVERSION']
-    end
-
     scanner.scan! do |result|
       credential_data = result.to_h
       credential_data.merge!(
diff --git a/modules/auxiliary/scanner/http/tomcat_mgr_login.rb b/modules/auxiliary/scanner/http/tomcat_mgr_login.rb
index 55fb5a4bec..6847640f9c 100644
--- a/modules/auxiliary/scanner/http/tomcat_mgr_login.rb
+++ b/modules/auxiliary/scanner/http/tomcat_mgr_login.rb
@@ -107,8 +107,6 @@ class Metasploit3 < Msf::Auxiliary
 
     scanner = Metasploit::Framework::LoginScanner::Tomcat.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'],
diff --git a/modules/auxiliary/scanner/http/wordpress_xmlrpc_login.rb b/modules/auxiliary/scanner/http/wordpress_xmlrpc_login.rb
index 1a2bc2f63e..0c5ab06de1 100644
--- a/modules/auxiliary/scanner/http/wordpress_xmlrpc_login.rb
+++ b/modules/auxiliary/scanner/http/wordpress_xmlrpc_login.rb
@@ -65,8 +65,6 @@ class Metasploit3 < Msf::Auxiliary
 
     scanner = Metasploit::Framework::LoginScanner::WordpressRPC.new(
       configure_http_login_scanner(
-        host: ip,
-        port: rport,
         uri: wordpress_url_xmlrpc,
         cred_details: cred_collection,
         stop_on_success: datastore['STOP_ON_SUCCESS'],
diff --git a/modules/auxiliary/scanner/http/zabbix_login.rb b/modules/auxiliary/scanner/http/zabbix_login.rb
index 2a14d74307..22d103466d 100644
--- a/modules/auxiliary/scanner/http/zabbix_login.rb
+++ b/modules/auxiliary/scanner/http/zabbix_login.rb
@@ -150,8 +150,6 @@ class Metasploit3 < Msf::Auxiliary
 
     @scanner = Metasploit::Framework::LoginScanner::Zabbix.new(
       configure_http_login_scanner(
-        host:               ip,
-        port:               rport,
         uri:                datastore['TARGETURI'],
         cred_details:       @cred_collection,
         stop_on_success:    datastore['STOP_ON_SUCCESS'],
@@ -159,9 +157,6 @@ class Metasploit3 < Msf::Auxiliary
         connection_timeout: 5,
       )
     )
-
-    @scanner.ssl         = datastore['SSL']
-    @scanner.ssl_version = datastore['SSLVERSION']
   end
 
   #