Remove silly cases of print_good

git-svn-id: file:///home/svn/framework3/trunk@9021 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2010-04-05 23:34:10 +00:00
parent 1836649937
commit 7af2fdf42e
10 changed files with 20 additions and 16 deletions

View File

@ -292,12 +292,12 @@ class Metasploit3 < Msf::Exploit::Remote
# LsarLookupSids # LsarLookupSids
dcerpc.call(0x0f, stub) dcerpc.call(0x0f, stub)
rescue Rex::Proto::DCERPC::Exceptions::NoResponse, Rex::Proto::SMB::Exceptions::NoReply, ::EOFError rescue Rex::Proto::DCERPC::Exceptions::NoResponse, Rex::Proto::SMB::Exceptions::NoReply, ::EOFError
print_good('Server did not respond, this is expected') print_status('Server did not respond, this is expected')
rescue Rex::Proto::DCERPC::Exceptions::Fault rescue Rex::Proto::DCERPC::Exceptions::Fault
print_error('Server is most likely patched...') print_error('Server is most likely patched...')
rescue => e rescue => e
if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ if e.to_s =~ /STATUS_PIPE_DISCONNECTED/
print_good('Server disconnected, this is expected') print_status('Server disconnected, this is expected')
else else
print_error("Error: #{e.class}: #{e}") print_error("Error: #{e.class}: #{e}")
end end

View File

@ -91,6 +91,9 @@ class Metasploit3 < Msf::Exploit::Remote
def auto_target def auto_target
print_status("Attempting to automatically select a target...") print_status("Attempting to automatically select a target...")
# /cognos_express/manager/ for Cognos Express (19300)
path = datastore['PATH'] + '/serverinfo' path = datastore['PATH'] + '/serverinfo'
res = send_request_raw( res = send_request_raw(
{ {
@ -242,3 +245,4 @@ class Metasploit3 < Msf::Exploit::Remote
end end
end end

View File

@ -305,12 +305,12 @@ class Metasploit3 < Msf::Exploit::Remote
# LsarLookupSids # LsarLookupSids
dcerpc.call(0x0f, stub) dcerpc.call(0x0f, stub)
rescue Rex::Proto::DCERPC::Exceptions::NoResponse, Rex::Proto::SMB::Exceptions::NoReply, ::EOFError rescue Rex::Proto::DCERPC::Exceptions::NoResponse, Rex::Proto::SMB::Exceptions::NoReply, ::EOFError
print_good('Server did not respond, this is expected') print_status('Server did not respond, this is expected')
rescue Rex::Proto::DCERPC::Exceptions::Fault rescue Rex::Proto::DCERPC::Exceptions::Fault
print_error('Server is most likely patched...') print_error('Server is most likely patched...')
rescue => e rescue => e
if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ if e.to_s =~ /STATUS_PIPE_DISCONNECTED/
print_good('Server disconnected, this is expected') print_status('Server disconnected, this is expected')
else else
print_error("Error: #{e.class}: #{e}") print_error("Error: #{e.class}: #{e}")
end end

View File

@ -180,12 +180,12 @@ class Metasploit3 < Msf::Exploit::Remote
# LsarLookupSids # LsarLookupSids
dcerpc.call(0x0f, stub) dcerpc.call(0x0f, stub)
rescue Rex::Proto::DCERPC::Exceptions::NoResponse, Rex::Proto::SMB::Exceptions::NoReply, ::EOFError rescue Rex::Proto::DCERPC::Exceptions::NoResponse, Rex::Proto::SMB::Exceptions::NoReply, ::EOFError
print_good('Server did not respond, this is expected') print_status('Server did not respond, this is expected')
rescue Rex::Proto::DCERPC::Exceptions::Fault rescue Rex::Proto::DCERPC::Exceptions::Fault
print_error('Server is most likely patched...') print_error('Server is most likely patched...')
rescue => e rescue => e
if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ if e.to_s =~ /STATUS_PIPE_DISCONNECTED/
print_good('Server disconnected, this is expected') print_status('Server disconnected, this is expected')
else else
print_error("Error: #{e.class}: #{e}") print_error("Error: #{e.class}: #{e}")
end end

View File

@ -152,7 +152,7 @@ class Metasploit3 < Msf::Exploit::Remote
# two seconds timeout for brute force # two seconds timeout for brute force
sunrpc_call(1, request, 2) sunrpc_call(1, request, 2)
rescue Rex::Proto::SunRPC::RPCTimeout rescue Rex::Proto::SunRPC::RPCTimeout
print_good('Server did not respond, this is expected') print_status('Server did not respond, this is expected')
end end
sunrpc_destroy sunrpc_destroy

View File

@ -99,7 +99,7 @@ class Metasploit3 < Msf::Exploit::Remote
print_error('exploit failed') print_error('exploit failed')
return return
else else
print_good('exploit did not give us an error, this is good...') print_status('exploit did not give us an error, this is good...')
sleep(1) sleep(1)
handler handler
end end

View File

@ -73,7 +73,7 @@ class Metasploit3 < Msf::Exploit::Remote
sunrpc_destroy sunrpc_destroy
print_good 'No Errors, appears to have succeeded!' print_status 'No Errors, appears to have succeeded!'
rescue ::Rex::Proto::SunRPC::RPCTimeout rescue ::Rex::Proto::SunRPC::RPCTimeout
print_status 'Warning: ' + $! print_status 'Warning: ' + $!
print_status 'Exploit may or may not have succeeded.' print_status 'Exploit may or may not have succeeded.'

View File

@ -154,10 +154,10 @@ class Metasploit3 < Msf::Exploit::Remote
begin begin
dcerpc.call(0x36, stubdata) dcerpc.call(0x36, stubdata)
rescue Rex::Proto::DCERPC::Exceptions::NoResponse rescue Rex::Proto::DCERPC::Exceptions::NoResponse
print_good('Server did not respond, this is expected') print_status('Server did not respond, this is expected')
rescue => e rescue => e
if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ if e.to_s =~ /STATUS_PIPE_DISCONNECTED/
print_good('Server disconnected, this is expected') print_status('Server disconnected, this is expected')
else else
raise e raise e
end end

View File

@ -126,10 +126,10 @@ class Metasploit3 < Msf::Exploit::Remote
begin begin
dcerpc.call(0x09, stubdata) dcerpc.call(0x09, stubdata)
rescue Rex::Proto::DCERPC::Exceptions::NoResponse rescue Rex::Proto::DCERPC::Exceptions::NoResponse
print_good('Server did not respond, this is expected') print_status('Server did not respond, this is expected')
rescue => e rescue => e
if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ if e.to_s =~ /STATUS_PIPE_DISCONNECTED/
print_good('Server disconnected, this is expected') print_status('Server disconnected, this is expected')
else else
raise e raise e
end end

View File

@ -109,10 +109,10 @@ class Metasploit3 < Msf::Exploit::Remote
begin begin
dcerpc.call(0x01, stubdata) dcerpc.call(0x01, stubdata)
rescue Rex::Proto::DCERPC::Exceptions::NoResponse rescue Rex::Proto::DCERPC::Exceptions::NoResponse
print_good('Server did not respond, this is expected') print_status('Server did not respond, this is expected')
rescue => e rescue => e
if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ if e.to_s =~ /STATUS_PIPE_DISCONNECTED/
print_good('Server disconnected, this is expected') print_status('Server disconnected, this is expected')
else else
raise e raise e
end end