enhanced logging a bit, added a few badchars to ie obj type, improving job support

git-svn-id: file:///home/svn/incoming/trunk@2868 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/core/encoded_payload.rb

@@ -97,7 +97,7 @@ class EncodedPayload
 					self.encoded = self.encoder.encode(self.raw, reqs['BadChars'])
 				rescue
 					wlog("#{pinst.refname}: Failed to encode payload with encoder #{encoder.refname}: #{$!}",
-						'core', LEV_1)
+						'core', LEV_2)
 					next
 				end
 

lib/msf/core/encoder.rb

@@ -167,7 +167,7 @@ class Encoder < Module
 		# Last but not least, do one last badchar pass to see if the stub +
 		# encoded payload leads to any bad char issues...
 		if ((badchar_idx = has_badchars?(state.encoded, badchars)) != nil)
-			raise BadcharError.new(state.encoded, badchar_idx, stub.length, badchars[badchar_idx]), 
+			raise BadcharError.new(state.encoded, badchar_idx, stub.length, state.encoded[badchar_idx]), 
 					"The #{self.name} encoder failed to encode without bad characters.", 
 					caller
 		end

lib/msf/core/exploit/http.rb

@@ -167,12 +167,12 @@ protected
 		# provided.
 		uopts = {
 			'Proc' => Proc.new { |cli, req|
-				on_request_uri(cli, req)
+					on_request_uri(cli, req)
 				},
 			'Path' => random_uri
 		}.update(opts['Uri'] || {})
 
-		print_status("HTTP Server URL: http://#{opts['ServerHost']}:#{opts['ServerPort']}#{uopts['Path']}")
+		print_status("Using URL: http://#{opts['ServerHost']}:#{opts['ServerPort']}#{uopts['Path']}")
 
 		add_resource(uopts)
 	end

lib/msf/core/exploit/tcp.rb

@@ -140,8 +140,6 @@ module Exploit::Remote::TcpServer
 	# service that corresponds with what the client has requested.
 	#
 	def exploit
-		print_status("Server starting...");
-
 		start_service
 
 		print_status("Server started.");

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

@@ -140,7 +140,7 @@ class Core
 	#
 	def cmd_jobs(*args)
 		if (args.length == 0)
-			args.unshift("-h")
+			args.unshift("-l")
 		end
 
 		# Parse the command options

lib/rex/io/stream_server.rb

@@ -141,6 +141,7 @@ protected
 			end
 		rescue
 			elog("Error in stream server listener monitor: #{$!}")
+			rlog(ExceptionCallStack)
 		end while true
 
 	end
@@ -162,6 +163,7 @@ protected
 			}
 		rescue
 			elog("Error in stream server client monitor: #{$!}")
+			rlog(ExceptionCallStack)
 		end while true
 	end
 

lib/rex/logging/log_dispatcher.rb

@@ -95,6 +95,8 @@ end
 # still be directed at the correct log file.
 #
 ###
+ExceptionCallStack = "__EXCEPTCALLSTACK__"
+
 def dlog(msg, src = 'core', level = 0, from = caller)
 	$dispatcher.log(LOG_DEBUG, src, level, msg, from)
 end
@@ -112,6 +114,10 @@ def ilog(msg, src = 'core', level = 0, from = caller)
 end
 
 def rlog(msg, src = 'core', level = 0, from = caller)
+	if (msg == ExceptionCallStack)
+		msg = "\nCall stack:\n" + $@.join("\n") + "\n"
+	end
+
 	$dispatcher.log(LOG_RAW, src, level, msg, from)
 end
 
@@ -125,3 +131,4 @@ end
 
 # Creates the global log dispatcher
 $dispatcher = Rex::Logging::LogDispatcher.new
+

lib/rex/logging/sinks/flatfile.rb

@@ -38,6 +38,7 @@ class Flatfile
 					code = 'i'
 			end
 			fd.write("[#{get_current_timestamp}] [#{code}(#{level})] #{src}: #{msg}\n")
+			fd.flush
 		end
 	end
 

lib/rex/sync/thread_safe.rb

@@ -25,19 +25,17 @@ module ThreadSafe
 	def self.select(rfd = nil, wfd = nil, efd = nil, t = nil)
 		left = t
 
-		callcc { |ctx|
-			begin
-				# Poll the set supplied to us at least once.
-				rv = ::IO.select(rfd, wfd, efd, DefaultCycle)
+		begin
+			# Poll the set supplied to us at least once.
+			rv = ::IO.select(rfd, wfd, efd, DefaultCycle)
 
-				ctx.call(rv) if (rv)
+			return rv if (rv)
 
-				# Decrement the amount of time left by the polling cycle
-				left -= DefaultCycle if (left)
+			# Decrement the amount of time left by the polling cycle
+			left -= DefaultCycle if (left)
 
-				# Keep chugging until we run out of time, if time was supplied.
-			end while ((left == nil) or (left > 0))
-		}
+			# Keep chugging until we run out of time, if time was supplied.
+		end while ((left == nil) or (left > 0))
 	end
 
 	#

modules/exploits/windows/ms03_020_ie_objecttype.rb

@@ -29,6 +29,7 @@ class Exploits::Windows::MS03_020_Ie_ObjectType < Msf::Exploit::Remote
 				{
 					'Space'    => 1000,
 					'MaxNops'  => 0,
+					'BadChars' => "\x8b\xe2", # Prevent UTF-8-ification
 				},
 			'Targets'        =>
 				[
@@ -39,7 +40,7 @@ class Exploits::Windows::MS03_020_Ie_ObjectType < Msf::Exploit::Remote
 							'Platform' => 'win',
 							'Rets'     =>
 								[
-									0x7ffdec50, # Windows NT: samlib jmp esp
+									0x777e85ab, # Windows NT: samlib jmp esp
 									0x71ab1d54, # Windows XP: ws2_32 push esp/ret SP0/1
 									0x77d1f92f, # Windows 2003: user32 jmp esp SP0/1
 								],