Clean up exceptions
Of particular note is mysql, who was rescuing Rex::ConnectionTimeout *after* Rex::ConnectionError, which never would have fired anyway.bug/bundler_fix
parent
b7d69bec83
commit
3051b6c5ba
|
@ -49,8 +49,8 @@ module Metasploit
|
|||
else
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::INCORRECT, proof: response)
|
||||
end
|
||||
rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT)
|
||||
rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error => e
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
|
||||
end
|
||||
|
||||
Result.new(result_opts)
|
||||
|
|
|
@ -39,10 +39,10 @@ module Metasploit
|
|||
result_options[:status] = Metasploit::Model::Login::Status::INCORRECT
|
||||
end
|
||||
end
|
||||
rescue ::Rex::ConnectionError, ::Rex::ConnectionTimeout, ::Rex::Proto::DRDA::RespError,::Timeout::Error => e
|
||||
rescue ::Rex::ConnectionError, ::Rex::Proto::DRDA::RespError, ::Timeout::Error => e
|
||||
result_options.merge!({
|
||||
status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT,
|
||||
proof: e.message
|
||||
proof: e,
|
||||
})
|
||||
end
|
||||
|
||||
|
|
|
@ -182,8 +182,8 @@ module Metasploit
|
|||
status = try_glassfish_3(credential)
|
||||
result_opts.merge!(status)
|
||||
end
|
||||
rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT)
|
||||
rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error => e
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
|
||||
end
|
||||
|
||||
Result.new(result_opts)
|
||||
|
|
|
@ -116,8 +116,8 @@ module Metasploit
|
|||
if response && response.code == 200
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::SUCCESSFUL, proof: response.headers)
|
||||
end
|
||||
rescue ::EOFError, Errno::ETIMEDOUT, Rex::ConnectionError, ::Timeout::Error
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT)
|
||||
rescue ::EOFError, Errno::ETIMEDOUT, Rex::ConnectionError, ::Timeout::Error => e
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
|
||||
ensure
|
||||
http_client.close
|
||||
end
|
||||
|
|
|
@ -75,8 +75,8 @@ module Metasploit
|
|||
else
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: "Server nonce not present, potentially not an IP Board install or bad URI.")
|
||||
end
|
||||
rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT)
|
||||
rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error => e
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
|
||||
end
|
||||
|
||||
Result.new(result_opts)
|
||||
|
|
|
@ -49,8 +49,8 @@ module Metasploit
|
|||
else
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::INCORRECT, proof: res)
|
||||
end
|
||||
rescue ::EOFError, Errno::ETIMEDOUT, Rex::ConnectionError, ::Timeout::Error
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT)
|
||||
rescue ::EOFError, Errno::ETIMEDOUT, Rex::ConnectionError, ::Timeout::Error => e
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
|
||||
end
|
||||
Result.new(result_opts)
|
||||
end
|
||||
|
|
|
@ -46,40 +46,30 @@ module Metasploit
|
|||
:db => ''
|
||||
})
|
||||
|
||||
rescue Rex::HostUnreachable
|
||||
rescue ::SystemCallError, Rex::ConnectionError => e
|
||||
result_options.merge!({
|
||||
status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT,
|
||||
proof: "Host was unreachable"
|
||||
proof: e
|
||||
})
|
||||
rescue Errno::ECONNREFUSED, Rex::ConnectionRefused
|
||||
rescue RbMysql::ClientError => e
|
||||
result_options.merge!({
|
||||
status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT,
|
||||
proof: "Connection refused"
|
||||
proof: e
|
||||
})
|
||||
rescue RbMysql::ClientError
|
||||
rescue RbMysql::HostNotPrivileged => e
|
||||
result_options.merge!({
|
||||
status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT,
|
||||
proof: "Connection timeout"
|
||||
proof: e
|
||||
})
|
||||
rescue Errno::ETIMEDOUT, Rex::ConnectionTimeout
|
||||
result_options.merge!({
|
||||
status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT,
|
||||
proof: "Operation Timed out"
|
||||
})
|
||||
rescue RbMysql::HostNotPrivileged
|
||||
result_options.merge!({
|
||||
status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT,
|
||||
proof: "Unable to login from this host due to policy"
|
||||
})
|
||||
rescue RbMysql::AccessDeniedError
|
||||
rescue RbMysql::AccessDeniedError => e
|
||||
result_options.merge!({
|
||||
status: Metasploit::Model::Login::Status::INCORRECT,
|
||||
proof: "Access Denied"
|
||||
proof: e
|
||||
})
|
||||
rescue RbMysql::HostIsBlocked
|
||||
rescue RbMysql::HostIsBlocked => e
|
||||
result_options.merge!({
|
||||
status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT,
|
||||
proof: "Host blocked"
|
||||
proof: e
|
||||
})
|
||||
end
|
||||
|
||||
|
@ -103,4 +93,4 @@ module Metasploit
|
|||
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -63,7 +63,7 @@ module Metasploit
|
|||
|
||||
rescue Rex::ConnectionError, EOFError, Timeout::Error, Errno::EPIPE => e
|
||||
result_options.merge!(
|
||||
proof: e.message,
|
||||
proof: e,
|
||||
status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT
|
||||
)
|
||||
end
|
||||
|
|
|
@ -60,8 +60,8 @@ module Metasploit
|
|||
proof: e.message
|
||||
})
|
||||
end
|
||||
rescue Rex::ConnectionError, EOFError, Timeout::Error
|
||||
result_options.merge!({status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT })
|
||||
rescue Rex::ConnectionError, EOFError, Timeout::Error => e
|
||||
result_options.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
|
||||
end
|
||||
|
||||
if pg_conn
|
||||
|
|
|
@ -21,7 +21,7 @@ module Metasploit
|
|||
# @return [Fixnum] the port number of the service for this result
|
||||
attr_accessor :port
|
||||
# @!attribute proof
|
||||
# @return [String,nil] the proof that the login was successful
|
||||
# @return [#to_s] the proof of the login's success or failure
|
||||
attr_accessor :proof
|
||||
# @!attribute protocol
|
||||
# @return [String] the transport protocol used for this result (tcp/udp)
|
||||
|
|
|
@ -215,6 +215,7 @@ module Metasploit
|
|||
proof = e
|
||||
rescue ::Rex::ConnectionError
|
||||
status = Metasploit::Model::Login::Status::UNABLE_TO_CONNECT
|
||||
proof = e
|
||||
end
|
||||
|
||||
if status == Metasploit::Model::Login::Status::SUCCESSFUL && simple.client.auth_user.nil?
|
||||
|
|
|
@ -38,8 +38,8 @@ module Metasploit
|
|||
req = cli.request_cgi(req_opts)
|
||||
res = cli.send_recv(req)
|
||||
|
||||
rescue ::Rex::ConnectionError, Errno::ECONNREFUSED, ::EOFError, ::Timeout::Error
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT)
|
||||
rescue ::Rex::ConnectionError, Errno::ECONNREFUSED, ::EOFError, ::Timeout::Error => e
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
|
||||
return Result.new(result_opts)
|
||||
end
|
||||
|
||||
|
|
|
@ -72,7 +72,7 @@ module Metasploit
|
|||
status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT
|
||||
)
|
||||
end
|
||||
rescue ::EOFError, Errno::ENOTCONN, Rex::AddressInUse, Rex::ConnectionError, Rex::ConnectionTimeout, ::Timeout::Error => e
|
||||
rescue ::EOFError, Errno::ENOTCONN, Rex::ConnectionError, ::Timeout::Error => e
|
||||
result_options.merge!(
|
||||
proof: e.message,
|
||||
status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT
|
||||
|
|
|
@ -42,8 +42,8 @@ module Metasploit
|
|||
else
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::INCORRECT, proof: response)
|
||||
end
|
||||
rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT)
|
||||
rescue ::EOFError, Rex::ConnectionError, ::Timeout::Error => e
|
||||
result_opts.merge!(status: Metasploit::Model::Login::Status::UNABLE_TO_CONNECT, proof: e)
|
||||
end
|
||||
|
||||
Result.new(result_opts)
|
||||
|
|
|
@ -88,7 +88,7 @@ class Metasploit3 < Msf::Auxiliary
|
|||
next
|
||||
when Metasploit::Model::Login::Status::UNABLE_TO_CONNECT
|
||||
if datastore['VERBOSE']
|
||||
print_brute :level => :verror, :ip => ip, :msg => "Could not connect"
|
||||
print_brute :level => :verror, :ip => ip, :msg => "Could not connect: #{result.proof}"
|
||||
end
|
||||
when Metasploit::Model::Login::Status::INCORRECT
|
||||
if datastore['VERBOSE']
|
||||
|
|
Loading…
Reference in New Issue