Skip to content

Commit 103373a

Browse files
David MaloneyDavid Maloney
authored andcommitted
add back accidentally remvoed error
accidentally dropped Errno::ETIMEDOUT from the exception handling MSP-12389
1 parent 441feec commit 103373a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lib/metasploit/framework/login_scanner/gitlab.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def attempt_login(credential)
8383
else
8484
result_opts.merge!(status: Metasploit::Model::Login::Status::INCORRECT, proof: res)
8585
end
86-
rescue ::EOFError, Errno::ECONNRESET, Rex::ConnectionError, OpenSSL::SSL::SSLError, ::Timeout::Error => e
86+
rescue ::EOFError, Errno::ETIMEDOUT ,Errno::ECONNRESET, Rex::ConnectionError, OpenSSL::SSL::SSLError, ::Timeout::Error => e
8787
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
8888
ensure
8989
cli.close

lib/metasploit/framework/login_scanner/http.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def send_request(opts)
231231
cli.connect
232232
req = cli.request_cgi(opts)
233233
res = cli.send_recv(req)
234-
rescue ::EOFError, Errno::ECONNRESET, Rex::ConnectionError, OpenSSL::SSL::SSLError, ::Timeout::Error => e
234+
rescue ::EOFError, Errno::ETIMEDOUT ,Errno::ECONNRESET, Rex::ConnectionError, OpenSSL::SSL::SSLError, ::Timeout::Error => e
235235
raise Rex::ConnectionError, e.message
236236
ensure
237237
cli.close

lib/metasploit/framework/login_scanner/jenkins.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def attempt_login(credential)
5050
else
5151
result_opts.merge!(status: Metasploit::Model::Login::Status::INCORRECT, proof: res)
5252
end
53-
rescue ::EOFError, Errno::ECONNRESET, Rex::ConnectionError, OpenSSL::SSL::SSLError, ::Timeout::Error => e
53+
rescue ::EOFError, Errno::ETIMEDOUT ,Errno::ECONNRESET, Rex::ConnectionError, OpenSSL::SSL::SSLError, ::Timeout::Error => e
5454
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
5555
end
5656
Result.new(result_opts)

0 commit comments

Comments
 (0)