move tab completion setup out of init_ui. fixes #1180

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

lib/msf/base/sessions/meterpreter_options.rb

@@ -31,12 +31,10 @@ module MeterpreterOptions
 	# advanced option is set to true.
 	#
 	def on_session(session)
-		# Don't initialize the UI here since it will clobber any existing tab
-		# completion routines prematurely.  Instead, wait for the user to
-		# interact.  See bug 1180
-
 		super
 
+		session.init_ui(self.user_input, self.user_output)
+
 		if (datastore['AutoLoadStdapi'] == true)
 			session.load_stdapi
 			mod = framework.modules.create(session.via_exploit)

lib/msf/ui/console/driver.rb

@@ -91,6 +91,7 @@ class Driver < Msf::Ui::Driver
 		else
 			init_ui(Rex::Ui::Text::Input::Stdio.new, Rex::Ui::Text::Output::Stdio.new)
 		end
+		init_tab_complete
 
 		# Add the core command dispatcher as the root of the dispatcher
 		# stack

lib/rex/post/meterpreter/ui/console.rb

@@ -53,6 +53,8 @@ class Console
 	# assumed that init_ui has been called prior.
 	#
 	def interact(&block)
+		init_tab_complete
+
 		# Run queued commands
 		commands.delete_if { |ent|
 			run_single(ent)

lib/rex/ui/text/shell.rb

@@ -37,10 +37,6 @@ module Shell
 	# Initializes a shell that has a prompt and can be interacted with.
 	#
 	def initialize(prompt, prompt_char = '>', histfile = nil)
-		# Don't initialize the UI here since it will clobber any existing tab
-		# completion routines prematurely.  Instead, wait for the user to
-		# interact.  See bug 1180
-
 		# Set the stop flag to false
 		self.stop_flag      = false
 		self.disable_output = false
@@ -53,28 +49,28 @@ module Shell
 		self.histfile = histfile
 	end
 
+	def init_tab_complete
+		if (self.input and self.input.supports_readline)
+			self.input = Input::Readline.new(lambda { |str| tab_complete(str) })
+			if histfile and File.exists?(histfile)
+				File.readlines(histfile).each { |e| 
+					Readline::HISTORY << e.chomp 
+				} 
+			end
+			self.input.output = self.output
+			update_prompt(input.prompt)
+		end
+	end
+
 	#
 	# Initializes the user interface input/output classes.
 	#
 	def init_ui(in_input = nil, in_output = nil)
-
 		# Initialize the input and output methods
 		self.input  = in_input
 		self.output = in_output
 
 		if (self.input)
-			begin
-				if (self.input.supports_readline)
-					self.input = Input::Readline.new(lambda { |str| tab_complete(str) })
-					if histfile and File.exists?(histfile)
-						File.readlines(histfile).each { |e| 
-							Readline::HISTORY << e.chomp 
-						} 
-					end
-				end
-			rescue
-			end
-
 			# Extend the input medium as an input shell if the input medium
 			# isn't intrinsicly a shell.
 			if (self.input.intrinsic_shell? == false)
@@ -83,7 +79,6 @@ module Shell
 
 			self.input.output = self.output
 		end
-
 		update_prompt('')
 	end
 
@@ -126,6 +121,7 @@ module Shell
 				# If the stop flag was set or we've hit EOF, break out
 				break if (self.stop_flag or self.stop_count > 1)
 
+				init_tab_complete
 				line = input.pgets
 				log_output(input.prompt)