DRY: Move check things to the common module level

While it makes lots of sense to bring check to all modules, of course
some modules will not be able to actually use it. Namely modules like
nop and payload modules. If you're feeling creative, you could probably
come up with semantically similar checks for those, too.

Author: Tod Beardsley

lib/msf/core/auxiliary.rb

@@ -44,16 +44,6 @@ def initialize(info = {})
 		self.queue   = Array.new
 	end
 
-	#
-	# Checks to see if the target is vulnerable, returning unsupported if it's
-	# not supported.
-	#
-	# This method is designed to be overriden by exploit modules.
-	#
-	def check
-		Msf::Exploit::CheckCode::Unsupported
-	end
-
 	#
 	# Creates a singleton instance of this auxiliary class
 	#

lib/msf/core/exploit.rb

@@ -415,16 +415,6 @@ def initialize(info = {})
 	#
 	##
 
-	#
-	# Checks to see if the target is vulnerable, returning unsupported if it's
-	# not supported.
-	#
-	# This method is designed to be overriden by exploit modules.
-	#
-	def check
-		CheckCode::Unsupported
-	end
-
 	#
 	# Kicks off the actual exploit.  Prior to this call, the framework will
 	# have validated the data store using the options associated with this

lib/msf/core/module.rb

@@ -355,6 +355,16 @@ def disclosure_date
 		date_str = Date.parse(module_info['DisclosureDate'].to_s) rescue nil
 	end
 
+	#
+	# Checks to see if the target is vulnerable, returning unsupported if it's
+	# not supported.
+	#
+	# This method is designed to be overriden by exploit modules.
+	#
+	def check
+		Msf::Exploit::CheckCode::Unsupported
+	end
+
 	#
 	# Returns the hash that describes this module's compatibilities.
 	#

lib/msf/ui/console/command_dispatcher/auxiliary.rb

@@ -27,7 +27,6 @@ class Auxiliary
 	#
 	def commands
 		super.update({
-			"check"    => "Check to see if a target is vulnerable",
 			"run"   => "Launches the auxiliary module",
 			"rerun" => "Reloads and launches the auxiliary module",
 			"exploit" => "This is an alias for the run command",
@@ -58,45 +57,6 @@ def name
 		"Auxiliary"
 	end
 
-	#
-	# Checks to see if a target is vulnerable.
-	#
-	def cmd_check(*args)
-		defanged?
-
-		begin
-
-			code = mod.check_simple(
-				'LocalInput'  => driver.input,
-				'LocalOutput' => driver.output)
-
-			if (code and code.kind_of?(Array) and code.length > 1)
-
-				if (code == Msf::Exploit::CheckCode::Vulnerable)
-					print_good(code[1])
-				else
-					print_status(code[1])
-				end
-
-			else
-				print_error("Check failed: The state could not be determined.")
-			end
-
-		rescue ::Interrupt
-			raise $!
-		rescue ::Exception => e
-			print_error("Module check failed: #{e.class} #{e}")
-			if(e.class.to_s != 'Msf::OptionValidateError')
-				print_error("Call stack:")
-				e.backtrace.each do |line|
-					break if line =~ /lib.msf.base.simple/
-					print_error("  #{line}")
-				end
-			end
-		end
-	end
-
-
 	#
 	# Reloads an auxiliary module and executes it
 	#

lib/msf/ui/console/command_dispatcher/exploit.rb

@@ -29,7 +29,6 @@ class Exploit
 	#
 	def commands
 		super.update({
-			"check"    => "Check to see if a target is vulnerable",
 			"exploit"  => "Launch an exploit attempt",
 			"rcheck"   => "Reloads the module and checks if the target is vulnerable",
 			"rexploit" => "Reloads the module and launches an exploit attempt",
@@ -46,44 +45,6 @@ def name
 		"Exploit"
 	end
 
-	#
-	# Checks to see if a target is vulnerable.
-	#
-	def cmd_check(*args)
-		defanged?
-
-		begin
-
-			code = mod.check_simple(
-				'LocalInput'  => driver.input,
-				'LocalOutput' => driver.output)
-
-			if (code and code.kind_of?(Array) and code.length > 1)
-
-				if (code == Msf::Exploit::CheckCode::Vulnerable)
-					print_good(code[1])
-				else
-					print_status(code[1])
-				end
-
-			else
-				print_error("Check failed: The state could not be determined.")
-			end
-
-		rescue ::Interrupt
-			raise $!
-		rescue ::Exception => e
-			print_error("Exploit check failed: #{e.class} #{e}")
-			if(e.class.to_s != 'Msf::OptionValidateError')
-				print_error("Call stack:")
-				e.backtrace.each do |line|
-					break if line =~ /lib.msf.base.simple/
-					print_error("  #{line}")
-				end
-			end
-		end
-	end
-
 	#
 	# Launches an exploitation attempt.
 	#

lib/msf/ui/console/module_command_dispatcher.rb

@@ -17,7 +17,8 @@ module ModuleCommandDispatcher
 	def commands
 		{
 			"pry"    => "Open a Pry session on the current module",
-			"reload" => "Reload the current module from disk"
+			"reload" => "Reload the current module from disk",
+			"check"  => "Check to see if a target is vulnerable"
 		}
 	end
 
@@ -35,6 +36,38 @@ def mod=(m)
 		self.driver.active_module = m
 	end
 
+	#
+	# Checks to see if a target is vulnerable.
+	#
+	def cmd_check(*args)
+		defanged?
+		begin
+			code = mod.check_simple(
+				'LocalInput'  => driver.input,
+				'LocalOutput' => driver.output)
+			if (code and code.kind_of?(Array) and code.length > 1)
+				if (code == Msf::Exploit::CheckCode::Vulnerable)
+					print_good(code[1])
+				else
+					print_status(code[1])
+				end
+			else
+				print_error("Check failed: The state could not be determined.")
+			end
+		rescue ::Interrupt
+			raise $!
+		rescue ::Exception => e
+			print_error("Exploit check failed: #{e.class} #{e}")
+			if(e.class.to_s != 'Msf::OptionValidateError')
+				print_error("Call stack:")
+				e.backtrace.each do |line|
+					break if line =~ /lib.msf.base.simple/
+					print_error("  #{line}")
+				end
+			end
+		end
+	end
+
 	def cmd_pry_help
 		print_line "Usage: pry"
 		print_line