dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrapping up the whole timeout sequence in a timeout to avoid getting stuck. 

git-svn-id: file:///home/svn/framework3/trunk@8643 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
Tod Beardsley 2010-02-25 21:35:55 +00:00
parent 138d45d095
commit bd35a70017
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/auxiliary/scanner/telnet/telnet_login.rb
View File

@ -50,6 +50,11 @@ class Metasploit3 < Msf::Auxiliary
OptBool.new('VERBOSE', [ true, 'Verbose output', false])
], Msf::Exploit::Remote::Telnet
)
register_advanced_options(
[
OptInt.new('TIMEOUT', [ true, 'Default timeout for telnet connections. The greatest value of TelnetTimeout, TelnetBannerTimeout, or this option will be used as an overall timeout.', 0])
], self.class
)
@no_pass_prompt = []
end
@ -58,14 +63,21 @@ class Metasploit3 < Msf::Auxiliary
attr_accessor :password_only
def run_host(ip)
overall_timeout ||= [
datastore['TIMEOUT'].to_i,
datastore['TelnetBannerTimeout'].to_i,
datastore['TelnetTimeout'].to_i
].sort.last
self.password_only = []
begin
each_user_pass do |user, pass|
try_user_pass(user, pass)
Timeout.timeout(overall_timeout) do
try_user_pass(user, pass)
end
end
rescue ::Rex::ConnectionError, ::EOFError
rescue ::Rex::ConnectionError, ::EOFError, ::Timeout::Error
return
end
end