Remove redundant params now provided by the mixin helper
parent
8e8a366889
commit
ea54696d99
|
@ -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'],
|
||||
|
|
|
@ -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'],
|
||||
|
|
|
@ -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'],
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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'],
|
||||
|
|
|
@ -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'],
|
||||
|
|
|
@ -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!(
|
||||
|
|
|
@ -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'],
|
||||
|
|
|
@ -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'],
|
||||
|
|
|
@ -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
|
||||
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue