Merge branch 'master' into bug/module-load-cache-update

Author: limhoff-r7

lib/msf/base/sessions/command_shell.rb.ut.rb

@@ -92,6 +92,39 @@ def run_simple(opts = {}, &block)
 		Msf::Simple::Auxiliary.run_simple(self, opts, &block)
 	end
 
+	#
+	# Initiates a check, setting up the exploit to be used.  The following
+	# options can be specified:
+	#
+	# LocalInput
+	#
+	# 	The local input handle that data can be read in from.
+	#
+	# LocalOutput
+	#
+	# 	The local output through which data can be displayed.
+	#
+	def self.check_simple(mod, opts)
+		if opts['LocalInput']
+			mod.init_ui(opts['LocalInput'], opts['LocalOutput'])
+		end
+
+		# Validate the option container state so that options will
+		# be normalized
+		mod.validate
+
+		# Run check
+		mod.check
+	end
+
+	#
+	# Calls the class method.
+	#
+	def check_simple(opts)
+		Msf::Simple::Auxiliary.check_simple(self, opts)
+	end
+
+
 protected
 
 	#

lib/msf/base/simple/auxiliary.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