infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change datastore name

unstable
wchen-r7 2015-05-21 10:15:03 -05:00
parent 93900087c7
commit c29bb35e28
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/msf/core/exploit/http/client.rb
View File

@ -53,7 +53,7 @@ module Exploit::Remote::HttpClient
OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'Auto', ['Auto', 'SSL2', 'SSL3', 'TLS1']]), OptEnum.new('SSLVersion', [ false, 'Specify the version of SSL that should be used', 'Auto', ['Auto', 'SSL2', 'SSL3', 'TLS1']]),
OptBool.new('FingerprintCheck', [ false, 'Conduct a pre-exploit fingerprint verification', true]), OptBool.new('FingerprintCheck', [ false, 'Conduct a pre-exploit fingerprint verification', true]),
OptString.new('DOMAIN', [ true, 'The domain to use for windows authentification', 'WORKSTATION']), OptString.new('DOMAIN', [ true, 'The domain to use for windows authentification', 'WORKSTATION']),
OptInt.new('HttpTimeout', [false, 'HTTP connection and receive timeout', 20]) OptInt.new('HttpRequestTimeout', [false, 'HTTP connection and receive timeout', 20])
], self.class ], self.class
) )
@ -308,7 +308,7 @@ module Exploit::Remote::HttpClient
# Passes +opts+ through directly to Rex::Proto::Http::Client#request_raw. # Passes +opts+ through directly to Rex::Proto::Http::Client#request_raw.
# #
def send_request_raw(opts={}, timeout = 20) def send_request_raw(opts={}, timeout = 20)
actual_timeout = datastore['HttpTimeout'] || opts[:timeout] || timeout actual_timeout = datastore['HttpRequestTimeout'] || opts[:timeout] || timeout
begin begin
c = connect(opts) c = connect(opts)
r = c.request_raw(opts) r = c.request_raw(opts)
@ -325,7 +325,7 @@ module Exploit::Remote::HttpClient
# Passes +opts+ through directly to Rex::Proto::Http::Client#request_cgi. # Passes +opts+ through directly to Rex::Proto::Http::Client#request_cgi.
# #
def send_request_cgi(opts={}, timeout = 20) def send_request_cgi(opts={}, timeout = 20)
actual_timeout = datastore['HttpTimeout'] || opts[:timeout] || timeout actual_timeout = datastore['HttpRequestTimeout'] || opts[:timeout] || timeout
begin begin
c = connect(opts) c = connect(opts)
r = c.request_cgi(opts) r = c.request_cgi(opts)
@ -344,7 +344,7 @@ module Exploit::Remote::HttpClient
# will contain the full URI. # will contain the full URI.
# #
def send_request_cgi!(opts={}, timeout = 20, redirect_depth = 1) def send_request_cgi!(opts={}, timeout = 20, redirect_depth = 1)
actual_timeout = datastore['HttpTimeout'] || opts[:timeout] || timeout actual_timeout = datastore['HttpRequestTimeout'] || opts[:timeout] || timeout
res = send_request_cgi(opts, actual_timeout) res = send_request_cgi(opts, actual_timeout)
return res unless res && res.redirect? && redirect_depth > 0 return res unless res && res.redirect? && redirect_depth > 0