Whitespace
parent
e41922853e
commit
1ce86b7adb
|
@ -169,7 +169,7 @@ class Client
|
||||||
#
|
#
|
||||||
# @return [Request]
|
# @return [Request]
|
||||||
def request_raw(opts={})
|
def request_raw(opts={})
|
||||||
opts['agent'] ||= config['agent']
|
opts['agent'] ||= config['agent']
|
||||||
opts['data'] ||= ''
|
opts['data'] ||= ''
|
||||||
opts['uri'] ||= '/'
|
opts['uri'] ||= '/'
|
||||||
opts['cookie'] ||= config['cookie']
|
opts['cookie'] ||= config['cookie']
|
||||||
|
@ -179,7 +179,7 @@ class Client
|
||||||
opts['method'] ||= 'GET'
|
opts['method'] ||= 'GET'
|
||||||
opts['proto'] ||= 'HTTP'
|
opts['proto'] ||= 'HTTP'
|
||||||
opts['query'] ||= ''
|
opts['query'] ||= ''
|
||||||
|
|
||||||
opts['cgi'] = false
|
opts['cgi'] = false
|
||||||
opts['port'] = self.port
|
opts['port'] = self.port
|
||||||
opts['basic_auth'] = opts['basic_auth'] || config['basic_auth'] || ''
|
opts['basic_auth'] = opts['basic_auth'] || config['basic_auth'] || ''
|
||||||
|
@ -221,12 +221,12 @@ class Client
|
||||||
opts['ctype'] ||= 'application/x-www-form-urlencoded'
|
opts['ctype'] ||= 'application/x-www-form-urlencoded'
|
||||||
opts['vars_get'] ||= {}
|
opts['vars_get'] ||= {}
|
||||||
opts['vars_post'] ||= {}
|
opts['vars_post'] ||= {}
|
||||||
|
|
||||||
opts['cgi'] = true
|
opts['cgi'] = true
|
||||||
opts['port'] = self.port
|
opts['port'] = self.port
|
||||||
opts['basic_auth'] = opts['basic_auth'] || config['basic_auth'] || ''
|
opts['basic_auth'] = opts['basic_auth'] || config['basic_auth'] || ''
|
||||||
opts['raw_headers'] = opts['raw_headers'] || config['raw_headers'] || ''
|
opts['raw_headers'] = opts['raw_headers'] || config['raw_headers'] || ''
|
||||||
opts['version'] = opts['version'] || config['version'] || '1.1'
|
opts['version'] = opts['version'] || config['version'] || '1.1'
|
||||||
|
|
||||||
opts['client_config'] = self.config
|
opts['client_config'] = self.config
|
||||||
|
|
||||||
|
|
|
@ -118,9 +118,9 @@ class ClientRequest
|
||||||
if encode
|
if encode
|
||||||
req << set_encode_uri(uri_str)
|
req << set_encode_uri(uri_str)
|
||||||
else
|
else
|
||||||
req << uri_str
|
req << uri_str
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
if (qstr.length > 0)
|
if (qstr.length > 0)
|
||||||
req << '?'
|
req << '?'
|
||||||
|
@ -456,4 +456,4 @@ end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -116,10 +116,10 @@ class Metasploit3 < Msf::Auxiliary
|
||||||
|
|
||||||
def do_login(user='admin', pass='admin')
|
def do_login(user='admin', pass='admin')
|
||||||
vprint_status("#{target_url} - Trying username:'#{user}' with password:'#{pass}'")
|
vprint_status("#{target_url} - Trying username:'#{user}' with password:'#{pass}'")
|
||||||
|
|
||||||
response = do_http_login(user,pass)
|
response = do_http_login(user,pass)
|
||||||
result = determine_result(response)
|
result = determine_result(response)
|
||||||
|
|
||||||
if result == :success
|
if result == :success
|
||||||
print_good("#{target_url} - Successful login '#{user}' : '#{pass}'")
|
print_good("#{target_url} - Successful login '#{user}' : '#{pass}'")
|
||||||
|
|
||||||
|
|
|
@ -132,7 +132,7 @@ describe Rex::Proto::Http::Client do
|
||||||
# These set_ methods all exercise the evasion opts, looks like
|
# These set_ methods all exercise the evasion opts, looks like
|
||||||
|
|
||||||
it "should set and return the URI", :pending => excuse_lazy(:set_uri) do
|
it "should set and return the URI", :pending => excuse_lazy(:set_uri) do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should set and return the CGI", :pending => excuse_lazy(:set_cgi) do
|
it "should set and return the CGI", :pending => excuse_lazy(:set_cgi) do
|
||||||
|
|
Loading…
Reference in New Issue