Lands rapid7#1730, adds a VERBOSE option checker

Also removes VERBOSE options from extant modules. There were only 5 of
them, and one was a commented option.

Author: todb

modules/auxiliary/scanner/http/squiz_matrix_user_enum.rb

@@ -44,7 +44,6 @@ def initialize(info={})
 				OptString.new('URI', [true, 'The path to users Squiz Matrix installation', '/']),
 				OptInt.new('ASSETBEGIN',  [ true, "Asset ID to start at", 1]),
 				OptInt.new('ASSETEND',  [ true, "Asset ID to stop at", 100]),
-				OptBool.new('VERBOSE', [ true, "Display all attempts", true ]),
 			], self.class)
 	end
 

modules/auxiliary/spoof/arp/arp_poisoning.rb

@@ -37,7 +37,6 @@ def initialize
 			OptString.new('INTERFACE', 	[false, 'The name of the interface']),
 			OptBool.new(  'BIDIRECTIONAL',	[true, 'Spoof also the source with the dest',false]),
 			OptBool.new(  'AUTO_ADD',	[true, 'Auto add new host when discovered by the listener',false]),
-			#OptBool.new(  'VERBOSE',	[true, 'Display more output on screen',false]),
 			OptBool.new(  'LISTENER',    	[true, 'Use an additionnal thread that will listen to arp request and try to relply as fast as possible', true])
 		], self.class)
 

modules/exploits/windows/email/ms10_045_outlook_ref_resolve.rb

@@ -67,8 +67,6 @@ def initialize(info = {})
 					[false, 'Message Class value', 'IPM.Document.txtfile']),
 				OptString.new('EXTENSION',
 					[false, 'The extension used in the fake file name', 'jpg']),
-				OptString.new('VERBOSE',
-					[ false, 'Display verbose information', "true"]),
 				#
 				# WebDAV options
 				#

modules/exploits/windows/http/sap_mgmt_con_osexec_payload.rb

@@ -56,7 +56,6 @@ def initialize(info = {})
 		register_options(
 			[
 				Opt::RPORT(50013),
-				OptBool.new('VERBOSE', [ false, 'Enable verbose output', false ]),
 				OptString.new('URI', [false, 'Path to the SAP Management Console ', '/']),
 				OptString.new('USERNAME', [true, 'Username to use', '']),
 				OptString.new('PASSWORD', [true, 'Password to use', '']),

modules/post/windows/manage/mssql_local_auth_bypass.rb

@@ -41,8 +41,7 @@ def initialize(info={})
 				OptString.new('DB_USERNAME',  [true, 'New sysadmin login', '']),
 				OptString.new('DB_PASSWORD',  [true, 'Password for new sysadmin login', '']),
 				OptString.new('INSTANCE',  [false, 'Name of target SQL Server instance', '']),
-				OptBool.new('REMOVE_LOGIN',  [false, 'Remove DB_USERNAME login from database', 'false']),
-				OptBool.new('VERBOSE',  [false, 'Set how verbose the output should be', 'false']),
+				OptBool.new('REMOVE_LOGIN',  [false, 'Remove DB_USERNAME login from database', 'false'])
 			], self.class)
 	end
 

tools/msftidy.rb

@@ -145,6 +145,12 @@ def check_old_keywords
 		end
 	end
 
+	def check_verbose_option
+		if @source =~ /Opt(Bool|String).new\([[:space:]]*('|")VERBOSE('|")[[:space:]]*,[[:space:]]*\[[[:space:]]*/
+			warn("VERBOSE Option is already part of advanced settings, no need to add it manually.")
+		end
+	end
+
 	def check_badchars
 		badchars = %Q|&<=>|
 
@@ -390,6 +396,7 @@ def run_checks(f_rel)
 	tidy = Msftidy.new(f_rel)
 	tidy.check_ref_identifiers
 	tidy.check_old_keywords
+	tidy.check_verbose_option
 	tidy.check_badchars
 	tidy.check_extname
 	tidy.test_old_rubies(f_rel)