Merge branch 'warnings' of git://github.com/wchen-r7/metasploit-framework into wchen-r7-warnings

sinn3r · sinn3r · commit 320a23286aff · 2012-10-27T18:52:34.000-05:00
diff --git a/modules/auxiliary/admin/sunrpc/solaris_kcms_readfile.rb b/modules/auxiliary/admin/sunrpc/solaris_kcms_readfile.rb
@@ -135,8 +135,8 @@ def run
 		sunrpc_destroy
 
 	rescue ::Rex::Proto::SunRPC::RPCTimeout
-		print_status 'Warning: ' + $!
-		print_status 'Exploit may or may not have succeeded.'
+		print_warning 'Warning: ' + $!
+		print_warning 'Exploit may or may not have succeeded.'
 	end
 
 
diff --git a/modules/auxiliary/spoof/dns/bailiwicked_domain.rb b/modules/auxiliary/spoof/dns/bailiwicked_domain.rb
@@ -144,7 +144,7 @@ def cmd_check(*args)
 		end
 
 		if(reps < 30)
-			print_status("WARNING: This server did not reply to all of our requests")
+			print_warning("WARNING: This server did not reply to all of our requests")
 		end
 
 		if(random)
diff --git a/modules/auxiliary/spoof/dns/bailiwicked_host.rb b/modules/auxiliary/spoof/dns/bailiwicked_host.rb
@@ -134,7 +134,7 @@ def cmd_check(*args)
 		end
 
 		if(reps < 30)
-			print_status("WARNING: This server did not reply to all of our requests")
+			print_warning("WARNING: This server did not reply to all of our requests")
 		end
 
 		if(random)
diff --git a/modules/exploits/linux/http/symantec_web_gateway_file_upload.rb b/modules/exploits/linux/http/symantec_web_gateway_file_upload.rb
@@ -70,6 +70,7 @@ def check
 	end
 
 	def on_new_session(client)
+		print_warning("Deleting temp.php")
 		if client.type == "meterpreter"
 			client.core.use("stdapi") if not client.ext.aliases.include?("stdapi")
 			client.fs.file.rm("temp.php")
diff --git a/modules/exploits/linux/http/webid_converter.rb b/modules/exploits/linux/http/webid_converter.rb
@@ -109,7 +109,7 @@ def on_new_session(client)
 		res = client.fs.file.search(nil, "currencies.php", true, -1)
 		res.each do |hit|
 			filename = "#{hit['path']}/#{hit['name']}"
-			print_status("#{peer} - Restoring #{filename}")
+			print_warning("#{peer} - Restoring #{filename}")
 			client.fs.file.rm(filename)
 			fd = client.fs.file.new(filename, "wb")
 			fd.write(currencies_php)
diff --git a/modules/exploits/multi/http/jboss_bshdeployer.rb b/modules/exploits/multi/http/jboss_bshdeployer.rb
@@ -222,10 +222,10 @@ def exploit
 		print_status("Undeploying #{uri} by deleting the WAR file via BSHDeployer...")
 		res = invoke_bshscript(delete_script, @pkg)
 		if !res
-			print_error("WARNING: Unable to remove WAR [No Response]")
+			print_warning("WARNING: Unable to remove WAR [No Response]")
 		end
 		if (res.code < 200 || res.code >= 300)
-			print_error("WARNING: Unable to remove WAR [#{res.code} #{res.message}]")
+			print_warning("WARNING: Unable to remove WAR [#{res.code} #{res.message}]")
 		end
 
 		handler
@@ -307,7 +307,7 @@ def deploy_bsh(bsh_script)
 		if (res.code < 200 || res.code >= 300)
 			case res.code
 				when 401
-					print_error("Warning: The web site asked for authentication: #{res.headers['WWW-Authenticate'] || res.headers['Authentication']}")
+					print_warning("Warning: The web site asked for authentication: #{res.headers['WWW-Authenticate'] || res.headers['Authentication']}")
 					fail_with(Exploit::Failure::NoAccess, "Authentication requested: #{res.headers['WWW-Authenticate'] || res.headers['Authentication']}")
 				end
 
diff --git a/modules/exploits/multi/http/jboss_deploymentfilerepository.rb b/modules/exploits/multi/http/jboss_deploymentfilerepository.rb
@@ -248,9 +248,9 @@ def exploit
 			delete_res << delete_file('./', Rex::Text.uri_encode(app_base) + '.war', '')
 			delete_res.each do |res|
 				if !res
-					print_error("WARNING: Unable to remove WAR [No Response]")
+					print_warning("WARNING: Unable to remove WAR [No Response]")
 				elsif (res.code < 200 || res.code >= 300)
-					print_error("WARNING: Unable to remove WAR [#{res.code} #{res.message}]")
+					print_warning("WARNING: Unable to remove WAR [#{res.code} #{res.message}]")
 				end
 			end
 
diff --git a/modules/exploits/multi/http/jboss_maindeployer.rb b/modules/exploits/multi/http/jboss_maindeployer.rb
@@ -211,7 +211,7 @@ def exploit
 		if (res.code < 200 or res.code >= 300)
 			case res.code
 			when 401
-				print_error("Warning: The web site asked for authentication: #{res.headers['WWW-Authenticate'] || res.headers['Authentication']}")
+				print_warning("Warning: The web site asked for authentication: #{res.headers['WWW-Authenticate'] || res.headers['Authentication']}")
 			end
 			fail_with(Exploit::Failure::Unknown, "Upload to deploy WAR archive [#{res.code} #{res.message}]")
 		end
@@ -291,12 +291,12 @@ def exploit
 				}
 		}, 30)
 		if (! res)
-			print_error("WARNING: Undeployment failed on #{app_base} [No Response]")
+			print_warning("WARNING: Undeployment failed on #{app_base} [No Response]")
 		elsif (res.code == 500 and datastore['VERB'] == 'POST')
 			# POST requests result in a http 500 error, but the payload is removed..."
-			print_status("WARNING: Undeployment might have failed (unlikely)")
+			print_warning("WARNING: Undeployment might have failed (unlikely)")
 		elsif (res.code < 200 or res.code >= 300)
-			print_error("WARNING: Undeployment failed on #{app_base} [#{res.code} #{res.message}]")
+			print_warning("WARNING: Undeployment failed on #{app_base} [#{res.code} #{res.message}]")
 		end
 
 		handler
diff --git a/modules/exploits/multi/http/openfire_auth_bypass.rb b/modules/exploits/multi/http/openfire_auth_bypass.rb
@@ -195,7 +195,7 @@ def exploit
 		})
 
 
-		print_error("Warning: got no response from the upload, continuing...") if !res
+		print_warning("Warning: got no response from the upload, continuing...") if !res
 
 		# Delete the uploaded JAR file
 		if datastore['REMOVE_PLUGIN']
diff --git a/modules/exploits/multi/http/qdpm_upload_exec.rb b/modules/exploits/multi/http/qdpm_upload_exec.rb
@@ -94,7 +94,7 @@ def on_new_session(cli)
 		end
 
 		@clean_files.each do |f|
-			print_status("#{@peer} - Removing: #{f}")
+			print_warning("#{@peer} - Removing: #{f}")
 			begin
 				if cli.type == 'meterpreter'
 					cli.fs.file.rm(f)
diff --git a/modules/exploits/multi/http/struts_code_exec.rb b/modules/exploits/multi/http/struts_code_exec.rb
@@ -130,7 +130,7 @@ def linux_stager
 
 	def on_new_session(client)
 		if target['Platform'] == 'linux'
-			print_status("Deleting #{@payload_exe} payload file")
+			print_warning("Deleting #{@payload_exe} payload file")
 			execute_command("/bin/sh@-c@rm #{@payload_exe}")
 		else
 			print_status("Windows does not allow running executables to be deleted")
diff --git a/modules/exploits/multi/http/struts_code_exec_exception_delegator.rb b/modules/exploits/multi/http/struts_code_exec_exception_delegator.rb
@@ -182,7 +182,7 @@ def on_new_session(client)
 			return
 		end
 
-		print_status("Deleting the #{@payload_exe} file")
+		print_warning("Deleting the #{@payload_exe} file")
 		client.fs.file.rm(@payload_exe)
 
 	end
diff --git a/modules/exploits/multi/http/testlink_upload_exec.rb b/modules/exploits/multi/http/testlink_upload_exec.rb
@@ -140,6 +140,7 @@ def login(base, user, pass)
 	end
 
 	def on_new_session(client)
+		print_warning("Deleting #{@token}.php")
 		if client.type == "meterpreter"
 			client.core.use("stdapi") if not client.ext.aliases.include?("stdapi")
 			client.fs.file.rm("#{@token}.php")
diff --git a/modules/exploits/multi/http/tomcat_mgr_deploy.rb b/modules/exploits/multi/http/tomcat_mgr_deploy.rb
@@ -217,7 +217,7 @@ def exploit
 		if (res.code < 200 or res.code >= 300)
 			case res.code
 			when 401
-				print_error("Warning: The web site asked for authentication: #{res.headers['WWW-Authenticate'] || res.headers['Authentication']}")
+				print_warning("Warning: The web site asked for authentication: #{res.headers['WWW-Authenticate'] || res.headers['Authentication']}")
 			end
 			fail_with(Exploit::Failure::Unknown, "Upload failed on #{path_tmp} [#{res.code} #{res.message}]")
 		end
@@ -259,9 +259,9 @@ def exploit
 			'method'       => 'GET'
 		}, 20)
 		if (! res)
-			print_error("WARNING: Undeployment failed on #{path} [No Response]")
+			print_warning("WARNING: Undeployment failed on #{path} [No Response]")
 		elsif (res.code < 200 or res.code >= 300)
-			print_error("Deletion failed on #{path} [#{res.code} #{res.message}]")
+			print_warning("Deletion failed on #{path} [#{res.code} #{res.message}]")
 		end
 
 		handler
diff --git a/modules/exploits/multi/http/webpagetest_upload_exec.rb b/modules/exploits/multi/http/webpagetest_upload_exec.rb
@@ -80,8 +80,14 @@ def on_new_session(cli)
 			return
 		end
 		cli.core.use("stdapi") if not cli.ext.aliases.include?("stdapi")
-		cli.fs.file.rm(@target_path)
-		print_status("#{@target_path} removed")
+
+		begin
+			print_warning("Deleting: #{@target_path}")
+			cli.fs.file.rm(@target_path)
+			print_good("#{@target_path} removed")
+		rescue
+			print_error("Unable to delete: #{@target_path}")
+		end
 	end
 
 
diff --git a/modules/exploits/solaris/sunrpc/ypupdated_exec.rb b/modules/exploits/solaris/sunrpc/ypupdated_exec.rb
@@ -85,7 +85,7 @@ def exploit
 
 		print_status('No Errors, appears to have succeeded!')
 	rescue ::Rex::Proto::SunRPC::RPCTimeout
-		print_error('Warning: ' + $!)
+		print_warning('Warning: ' + $!)
 	end
 
 end
diff --git a/modules/exploits/unix/webapp/openx_banner_edit.rb b/modules/exploits/unix/webapp/openx_banner_edit.rb
@@ -157,9 +157,9 @@ def exploit
 
 		# Delete the banner :)
 		if (not openx_banner_delete(uri_base, cookie, adv_id, camp_id, ban_id))
-			print_error("WARNING: Unable to automatically delete the banner :-/")
+			print_warning("WARNING: Unable to automatically delete the banner :-/")
 		else
-			print_status("Successfully deleted banner # #{ban_id}")
+			print_good("Successfully deleted banner # #{ban_id}")
 		end
 
 		print_status("You should have a session now.")
diff --git a/modules/exploits/unix/webapp/sugarcrm_unserialize_exec.rb b/modules/exploits/unix/webapp/sugarcrm_unserialize_exec.rb
@@ -65,6 +65,7 @@ def on_new_session(client)
 			f = "pathCache.php"
 			client.core.use("stdapi") if not client.ext.aliases.include?("stdapi")
 			begin
+				print_warning("#{@peer} - Deleting #{f}")
 				client.fs.file.rm(f)
 				print_good("#{@peer} - #{f} removed to stay ninja")
 			rescue
diff --git a/modules/exploits/unix/webapp/tikiwiki_unserialize_exec.rb b/modules/exploits/unix/webapp/tikiwiki_unserialize_exec.rb
@@ -69,6 +69,7 @@ def on_new_session(client)
 		if client.type == "meterpreter"
 			client.core.use("stdapi") if not client.ext.aliases.include?("stdapi")
 			begin
+				print_warning("#{@peer} - Deleting #{@upload_php}")
 				client.fs.file.rm(@upload_php)
 				print_good("#{@peer} - #{@upload_php} removed to stay ninja")
 			rescue
diff --git a/modules/exploits/unix/webapp/twiki_history.rb b/modules/exploits/unix/webapp/twiki_history.rb
@@ -74,7 +74,7 @@ def check
 				'uri' => test_url
 			}, 25)
 		if (not res) or (res.code != 404)
-			print_error("WARNING: The test file exists already!")
+			print_warning("WARNING: The test file exists already!")
 			return Exploit::CheckCode::Safe
 		end
 
@@ -103,7 +103,7 @@ def check
 				'uri' => cmd_base + Rex::Text.uri_encode(rev)
 			}, 25)
 		if (not res) or (res.code != 200)
-			print_error("WARNING: unable to remove test file (#{test_file})")
+			print_warning("WARNING: unable to remove test file (#{test_file})")
 		end
 
 		return Exploit::CheckCode::Vulnerable
diff --git a/modules/exploits/unix/webapp/twiki_search.rb b/modules/exploits/unix/webapp/twiki_search.rb
@@ -69,7 +69,7 @@ def check
 				'uri' => test_url
 			}, 25)
 		if (not res) or (res.body.match(content))
-			print_error("WARNING: The test file exists already!")
+			print_warning("WARNING: The test file exists already!")
 			return Exploit::CheckCode::Safe
 		end
 
@@ -98,7 +98,7 @@ def check
 				'uri' => cmd_base + Rex::Text.uri_encode(search)
 			}, 25)
 		if (not res) or (res.code != 200)
-			print_error("WARNING: unable to remove test file (#{test_file})")
+			print_warning("WARNING: unable to remove test file (#{test_file})")
 		end
 
 		return Exploit::CheckCode::Vulnerable
diff --git a/modules/exploits/unix/webapp/xoda_file_upload.rb b/modules/exploits/unix/webapp/xoda_file_upload.rb
@@ -74,6 +74,7 @@ def check
 	end
 
 	def on_new_session(client)
+		print_warning("Deleting #{@payload_name}")
 		if client.type == "meterpreter"
 			client.core.use("stdapi") if not client.ext.aliases.include?("stdapi")
 			client.fs.file.rm(@payload_name)
diff --git a/modules/exploits/windows/browser/adobe_flash_otf_font.rb b/modules/exploits/windows/browser/adobe_flash_otf_font.rb
@@ -221,7 +221,7 @@ def exploit
 		datastore['URIPATH'] = datastore['URIPATH'] || random_uri
 		datastore['URIPATH'] = '/' + datastore['URIPATH'] if datastore['URIPATH'] !~ /^\//
 		datastore['URIPATH'] = datastore['URIPATH'][0,3] if datastore['URIPATH'].length > 3
-		print_debug("URIPATH set to #{datastore['URIPATH']}")
+		print_warning("URIPATH set to #{datastore['URIPATH']}")
 
 		super
 	end
diff --git a/modules/exploits/windows/browser/hp_easy_printer_care_xmlcachemgr.rb b/modules/exploits/windows/browser/hp_easy_printer_care_xmlcachemgr.rb
@@ -83,9 +83,9 @@ def on_new_session(client)
 		client.sys.process.execute(cmd, nil, {'Hidden' => true })
 
 		begin
-			print_status("Deleting the vbs payload \"#{@var_vbs_name}.vbs\" ...")
+			print_warning("Deleting the vbs payload \"#{@var_vbs_name}.vbs\" ...")
 			client.fs.file.rm("C:\\windows\\system32\\" + @var_vbs_name + ".vbs")
-			print_status("Deleting the mof file \"#{@var_mof_name}.mof\" ...")
+			print_warning("Deleting the mof file \"#{@var_mof_name}.mof\" ...")
 			client.fs.file.rm("C:\\windows\\system32\\wbem\\mof\\good\\" + @var_mof_name + ".mof")
 		rescue ::Exception => e
 			print_error("Exception: #{e.inspect}")
diff --git a/modules/exploits/windows/browser/hp_easy_printer_care_xmlsimpleaccessor.rb b/modules/exploits/windows/browser/hp_easy_printer_care_xmlsimpleaccessor.rb
@@ -88,9 +88,9 @@ def on_new_session(client)
 		client.sys.process.execute(cmd, nil, {'Hidden' => true })
 
 		begin
-			print_status("Deleting the vbs payload \"#{@var_vbs_name}.vbs\" ...")
+			print_warning("Deleting the vbs payload \"#{@var_vbs_name}.vbs\" ...")
 			client.fs.file.rm("C:\\windows\\system32\\" + @var_vbs_name + ".vbs")
-			print_status("Deleting the mof file \"#{@var_mof_name}.mof\" ...")
+			print_warning("Deleting the mof file \"#{@var_mof_name}.mof\" ...")
 			client.fs.file.rm("C:\\windows\\system32\\wbem\\mof\\good\\" + @var_mof_name + ".mof")
 		rescue ::Exception => e
 			print_error("Exception: #{e.inspect}")
diff --git a/modules/exploits/windows/browser/zenworks_helplauncher_exec.rb b/modules/exploits/windows/browser/zenworks_helplauncher_exec.rb
@@ -73,7 +73,7 @@ def on_new_session(client)
 		client.core.use("stdapi") if not client.ext.aliases.include?("stdapi")
 
 		begin
-			print_status("Deleting the vbs payload \"#{@stager_name}\" ...")
+			print_warning("Deleting the vbs payload \"#{@stager_name}\" ...")
 			client.fs.file.rm("#{@temp_folder}/#{@stager_name}")
 			print_good("The vbs stager has been deleted successfully")
 			print_status("The exe payload #{@temp_folder}/#{@payload_name}.exe must be removed manually")
diff --git a/modules/exploits/windows/fileformat/adobe_pdf_embedded_exe.rb b/modules/exploits/windows/fileformat/adobe_pdf_embedded_exe.rb
@@ -154,7 +154,7 @@ def js_payload(pdf_name,obj_num)
 		lines = []
 		launch_message.gsub(/.{1,80}(?:\s|\Z)/) { lines << $& }
 		if (lines.length > 2)
-			print_status("Warning: the LAUNCH_MESSAGE is more than 2 lines. It may not display correctly.")
+			print_warning("Warning: the LAUNCH_MESSAGE is more than 2 lines. It may not display correctly.")
 		end
 
 		output << "&"+
diff --git a/modules/exploits/windows/http/avaya_ccr_imageupload_exec.rb b/modules/exploits/windows/http/avaya_ccr_imageupload_exec.rb
@@ -65,6 +65,7 @@ def on_new_session(cli)
 		cli.core.use("stdapi") if not cli.ext.aliases.include?("stdapi")
 
 		begin
+			print_warning("#{@peer} - Removing #{@payload_path}")
 			cli.fs.file.rm(@payload_path)
 			print_good("#{@peer} - #{@payload_path} deleted")
 		rescue ::Exception => e
diff --git a/modules/exploits/windows/http/cyclope_ess_sqli.rb b/modules/exploits/windows/http/cyclope_ess_sqli.rb
@@ -96,14 +96,14 @@ def on_new_session(cli)
 		cli.core.use("stdapi") if not cli.ext.aliases.include?("stdapi")
 
 		begin
-			print_status("Deleting #{@php_fname}")
+			print_warning("Deleting #{@php_fname}")
 			cli.fs.file.rm(@php_fname)
 		rescue ::Exception => e
 			print_error("Please note: #{@php_fname} is stil on disk.")
 		end
 
 		begin
-			print_status("Deleting #{@exe_fname}")
+			print_warning("Deleting #{@exe_fname}")
 			cli.fs.file.rm(@exe_fname)
 		rescue ::Exception => e
 			print_error("Please note: #{@exe_fname} is still on disk.")
diff --git a/modules/exploits/windows/http/oracle_btm_writetofile.rb b/modules/exploits/windows/http/oracle_btm_writetofile.rb
@@ -102,9 +102,9 @@ def on_new_session(client)
 		client.sys.process.execute(cmd, nil, {'Hidden' => true })
 
 		begin
-			print_status("Deleting the vbs payload \"#{@var_vbs_name}.vbs\" ...")
+			print_warning("Deleting the vbs payload \"#{@var_vbs_name}.vbs\" ...")
 			client.fs.file.rm("C:\\windows\\system32\\" + @var_vbs_name + ".vbs")
-			print_status("Deleting the mof file \"#{@var_mof_name}.mof\" ...")
+			print_warning("Deleting the mof file \"#{@var_mof_name}.mof\" ...")
 			client.fs.file.rm("C:\\windows\\system32\\wbem\\mof\\good\\" + @var_mof_name + ".mof")
 		rescue ::Exception => e
 			print_error("Exception: #{e.inspect}")
diff --git a/modules/exploits/windows/http/solarwinds_storage_manager_sql.rb b/modules/exploits/windows/http/solarwinds_storage_manager_sql.rb
@@ -95,9 +95,9 @@ def on_new_session(cli)
 		begin
 			jsp = @outpath.gsub(/\//, "\\\\")
 			jsp = jsp.gsub(/"/, "")
-			vprint_status("#{rhost}:#{rport} - Deleting: #{jsp}")
+			print_warning("#{rhost}:#{rport} - Deleting: #{jsp}")
 			cli.fs.file.rm(jsp)
-			print_status("#{rhost}:#{rport} - #{@jsp_name + '.jsp'} deleted")
+			print_good("#{rhost}:#{rport} - #{@jsp_name + '.jsp'} deleted")
 		rescue ::Exception => e
 			print_error("Unable to delete #{@jsp_name + '.jsp'}: #{e.message}")
 		end
diff --git a/modules/exploits/windows/http/umbraco_upload_aspx.rb b/modules/exploits/windows/http/umbraco_upload_aspx.rb
@@ -79,10 +79,10 @@ def on_new_session(cli)
 			end
 
 			files.each { |f|
-				print_status("#{@peer} - Deleting: #{f['path'] + "\\" + f['name']}")
+				print_warning("#{@peer} - Deleting: #{f['path'] + "\\" + f['name']}")
 				cli.fs.file.rm(f['path'] + "\\" + f['name'])
 			}
-			print_status("#{@peer} - #{aspx} deleted")
+			print_good("#{@peer} - #{aspx} deleted")
 		rescue ::Exception => e
 			print_error("Unable to delete #{aspx}: #{e.message}")
 		end
diff --git a/modules/exploits/windows/iis/iis_webdav_upload_asp.rb b/modules/exploits/windows/iis/iis_webdav_upload_asp.rb
diff --git a/modules/exploits/windows/iis/ms01_026_dbldecode.rb b/modules/exploits/windows/iis/ms01_026_dbldecode.rb
diff --git a/modules/exploits/windows/iis/msadc.rb b/modules/exploits/windows/iis/msadc.rb
diff --git a/modules/exploits/windows/local/current_user_psexec.rb b/modules/exploits/windows/local/current_user_psexec.rb
diff --git a/modules/exploits/windows/mysql/scrutinizer_upload_exec.rb b/modules/exploits/windows/mysql/scrutinizer_upload_exec.rb
diff --git a/modules/exploits/windows/ssl/ms04_011_pct.rb b/modules/exploits/windows/ssl/ms04_011_pct.rb
diff --git a/modules/exploits/windows/wins/ms04_045_wins.rb b/modules/exploits/windows/wins/ms04_045_wins.rb
