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

Land #6069

bug/bundler_fix
Jon Hart 2015-10-09 10:14:19 -07:00
parent 3dd7fdfd95 b95d5790f6
commit 7a16f28969
No known key found for this signature in database
GPG Key ID: 2FA9F0A3AFA8E9D3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/auxiliary/scanner/imap/imap_version.rb
View File

@ -22,13 +22,15 @@ class Metasploit3 < Msf::Auxiliary
def run_host(ip) def run_host(ip)
begin begin
res = connect connect
banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s) banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s)
print_status("#{ip}:#{rport} IMAP #{banner_sanitized}") print_status("#{ip}:#{rport} IMAP #{banner_sanitized}")
report_service(:host => rhost, :port => rport, :name => "imap", :info => banner) report_service(:host => rhost, :port => rport, :name => "imap", :info => banner)
rescue ::Rex::ConnectionError rescue ::Rex::ConnectionError
rescue ::EOFError
print_error("#{ip}:#{rport} - The service failed to respond")
rescue ::Exception => e rescue ::Exception => e
print_error("#{rhost}:#{rport} #{e} #{e.backtrace}") print_error("#{ip}:#{rport} - #{e} #{e.backtrace}")
end end
end end

6
modules/auxiliary/scanner/pop3/pop3_version.rb
View File

@ -25,14 +25,16 @@ class Metasploit3 < Msf::Auxiliary
def run_host(ip) def run_host(ip)
begin begin
res = connect connect
banner = sock.get_once(-1, 30) banner = sock.get_once(-1, 30)
banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s) banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s)
print_status("#{ip}:#{rport} POP3 #{banner_sanitized}") print_status("#{ip}:#{rport} POP3 #{banner_sanitized}")
report_service(:host => rhost, :port => rport, :name => "pop3", :info => banner) report_service(:host => rhost, :port => rport, :name => "pop3", :info => banner)
rescue ::Rex::ConnectionError rescue ::Rex::ConnectionError
rescue ::EOFError
print_error("#{ip}:#{rport} - The service failed to respond")
rescue ::Exception => e rescue ::Exception => e
print_error("#{rhost}:#{rport} #{e} #{e.backtrace}") print_error("#{ip}:#{rport} - #{e} #{e.backtrace}")
end end
end end