From 7af2fdf42e8b898f2fa77668ee8d780fe7aff213 Mon Sep 17 00:00:00 2001 From: HD Moore Date: Mon, 5 Apr 2010 23:34:10 +0000 Subject: [PATCH] Remove silly cases of print_good git-svn-id: file:///home/svn/framework3/trunk@9021 4d416f70-5f16-0410-b530-b9f4589650da --- modules/exploits/linux/samba/lsa_transnames_heap.rb | 4 ++-- modules/exploits/multi/http/tomcat_mgr_deploy.rb | 6 +++++- modules/exploits/osx/samba/lsa_transnames_heap.rb | 4 ++-- modules/exploits/solaris/samba/lsa_transnames_heap.rb | 4 ++-- modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb | 2 +- modules/exploits/solaris/sunrpc/sadmind_exec.rb | 2 +- modules/exploits/solaris/sunrpc/ypupdated_exec.rb | 2 +- modules/exploits/windows/smb/ms05_039_pnp.rb | 4 ++-- modules/exploits/windows/smb/ms06_066_nwapi.rb | 4 ++-- modules/exploits/windows/smb/ms06_066_nwwks.rb | 4 ++-- 10 files changed, 20 insertions(+), 16 deletions(-) diff --git a/modules/exploits/linux/samba/lsa_transnames_heap.rb b/modules/exploits/linux/samba/lsa_transnames_heap.rb index 1ea4e58323..095b369ecc 100644 --- a/modules/exploits/linux/samba/lsa_transnames_heap.rb +++ b/modules/exploits/linux/samba/lsa_transnames_heap.rb @@ -292,12 +292,12 @@ class Metasploit3 < Msf::Exploit::Remote # LsarLookupSids dcerpc.call(0x0f, stub) 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 print_error('Server is most likely patched...') rescue => e if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ - print_good('Server disconnected, this is expected') + print_status('Server disconnected, this is expected') else print_error("Error: #{e.class}: #{e}") end diff --git a/modules/exploits/multi/http/tomcat_mgr_deploy.rb b/modules/exploits/multi/http/tomcat_mgr_deploy.rb index aa918c2925..bb8c0f199c 100644 --- a/modules/exploits/multi/http/tomcat_mgr_deploy.rb +++ b/modules/exploits/multi/http/tomcat_mgr_deploy.rb @@ -74,7 +74,7 @@ class Metasploit3 < Msf::Exploit::Remote 'Platform' => 'linux' }, ], - + ], 'DefaultTarget' => 0)) @@ -91,6 +91,9 @@ class Metasploit3 < Msf::Exploit::Remote def auto_target print_status("Attempting to automatically select a target...") + + # /cognos_express/manager/ for Cognos Express (19300) + path = datastore['PATH'] + '/serverinfo' res = send_request_raw( { @@ -242,3 +245,4 @@ class Metasploit3 < Msf::Exploit::Remote end end + diff --git a/modules/exploits/osx/samba/lsa_transnames_heap.rb b/modules/exploits/osx/samba/lsa_transnames_heap.rb index 281cf4c5bc..d56919d456 100644 --- a/modules/exploits/osx/samba/lsa_transnames_heap.rb +++ b/modules/exploits/osx/samba/lsa_transnames_heap.rb @@ -305,12 +305,12 @@ class Metasploit3 < Msf::Exploit::Remote # LsarLookupSids dcerpc.call(0x0f, stub) 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 print_error('Server is most likely patched...') rescue => e if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ - print_good('Server disconnected, this is expected') + print_status('Server disconnected, this is expected') else print_error("Error: #{e.class}: #{e}") end diff --git a/modules/exploits/solaris/samba/lsa_transnames_heap.rb b/modules/exploits/solaris/samba/lsa_transnames_heap.rb index be8a76b6fb..cac69c5754 100644 --- a/modules/exploits/solaris/samba/lsa_transnames_heap.rb +++ b/modules/exploits/solaris/samba/lsa_transnames_heap.rb @@ -180,12 +180,12 @@ class Metasploit3 < Msf::Exploit::Remote # LsarLookupSids dcerpc.call(0x0f, stub) 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 print_error('Server is most likely patched...') rescue => e if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ - print_good('Server disconnected, this is expected') + print_status('Server disconnected, this is expected') else print_error("Error: #{e.class}: #{e}") end diff --git a/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb b/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb index dce2ac059f..ab1c6b248f 100644 --- a/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb +++ b/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb @@ -152,7 +152,7 @@ class Metasploit3 < Msf::Exploit::Remote # two seconds timeout for brute force sunrpc_call(1, request, 2) rescue Rex::Proto::SunRPC::RPCTimeout - print_good('Server did not respond, this is expected') + print_status('Server did not respond, this is expected') end sunrpc_destroy diff --git a/modules/exploits/solaris/sunrpc/sadmind_exec.rb b/modules/exploits/solaris/sunrpc/sadmind_exec.rb index 793e571c32..c5963cf2e6 100644 --- a/modules/exploits/solaris/sunrpc/sadmind_exec.rb +++ b/modules/exploits/solaris/sunrpc/sadmind_exec.rb @@ -99,7 +99,7 @@ class Metasploit3 < Msf::Exploit::Remote print_error('exploit failed') return 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) handler end diff --git a/modules/exploits/solaris/sunrpc/ypupdated_exec.rb b/modules/exploits/solaris/sunrpc/ypupdated_exec.rb index 50680bf664..6ca9c96d60 100644 --- a/modules/exploits/solaris/sunrpc/ypupdated_exec.rb +++ b/modules/exploits/solaris/sunrpc/ypupdated_exec.rb @@ -73,7 +73,7 @@ class Metasploit3 < Msf::Exploit::Remote sunrpc_destroy - print_good 'No Errors, appears to have succeeded!' + print_status 'No Errors, appears to have succeeded!' rescue ::Rex::Proto::SunRPC::RPCTimeout print_status 'Warning: ' + $! print_status 'Exploit may or may not have succeeded.' diff --git a/modules/exploits/windows/smb/ms05_039_pnp.rb b/modules/exploits/windows/smb/ms05_039_pnp.rb index 6735583062..ab294c4d25 100644 --- a/modules/exploits/windows/smb/ms05_039_pnp.rb +++ b/modules/exploits/windows/smb/ms05_039_pnp.rb @@ -154,10 +154,10 @@ class Metasploit3 < Msf::Exploit::Remote begin dcerpc.call(0x36, stubdata) 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 if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ - print_good('Server disconnected, this is expected') + print_status('Server disconnected, this is expected') else raise e end diff --git a/modules/exploits/windows/smb/ms06_066_nwapi.rb b/modules/exploits/windows/smb/ms06_066_nwapi.rb index 8ca1bd428b..2f1851d7dd 100644 --- a/modules/exploits/windows/smb/ms06_066_nwapi.rb +++ b/modules/exploits/windows/smb/ms06_066_nwapi.rb @@ -126,10 +126,10 @@ class Metasploit3 < Msf::Exploit::Remote begin dcerpc.call(0x09, stubdata) 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 if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ - print_good('Server disconnected, this is expected') + print_status('Server disconnected, this is expected') else raise e end diff --git a/modules/exploits/windows/smb/ms06_066_nwwks.rb b/modules/exploits/windows/smb/ms06_066_nwwks.rb index 26e211c4ff..5dc0c5135f 100644 --- a/modules/exploits/windows/smb/ms06_066_nwwks.rb +++ b/modules/exploits/windows/smb/ms06_066_nwwks.rb @@ -109,10 +109,10 @@ class Metasploit3 < Msf::Exploit::Remote begin dcerpc.call(0x01, stubdata) 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 if e.to_s =~ /STATUS_PIPE_DISCONNECTED/ - print_good('Server disconnected, this is expected') + print_status('Server disconnected, this is expected') else raise e end