librex 0.0.68 → 0.0.70

data/lib/rex/ui/text/input/socket.rb

@@ -12,83 +12,83 @@ module Text
 ###
 class Input::Socket < Rex::Ui::Text::Input
 
-	def initialize(sock)
-		@sock = sock
-	end
-
-	#
-	# Sockets do not currently support readline.
-	#
-	def supports_readline
-		false
-	end
-
-	#
-	# Reads input from the raw socket.
-	#
-	def sysread(len = 1)
-		@sock.sysread(len)
-	end
-
-	#
-	# Wait for a line of input to be read from a socket.
-	#
-	def gets
-	
-		# Initialize the line buffer
-		line = ''
-		
-		# Read data one byte at a time until we see a LF
-		while (true)
-
-			break if line.include?("\n")
-			
-			# Read another character of input
-			char = @sock.getc
-			if char.nil?
-				@sock.close
-				return
-			end
-			
-			# Telnet sends 0x04 as EOF
-			if (char == 4)
-				@sock.write("[*] Caught ^D, closing the socket...\n")
-				@sock.close
-				return
-			end
-			
-			# Append this character to the string
-			line << char
-
-			# Handle telnet sequences
-			case line
-				when /\xff\xf4\xff\xfd\x06/
-					@sock.write("[*] Caught ^C, closing the socket...\n")
-					@sock.close
-					return
-					
-				when /\xff\xed\xff\xfd\x06/
-					@sock.write("[*] Caught ^Z\n")
-					return		
-			end
-		end
-		
-		return line
-	end
-
-	#
-	# Returns whether or not EOF has been reached on stdin.
-	#
-	def eof?
-		@sock.closed?
-	end
-
-	#
-	# Returns the file descriptor associated with a socket.
-	#
-	def fd
-		return @sock
-	end
+  def initialize(sock)
+    @sock = sock
+  end
+
+  #
+  # Sockets do not currently support readline.
+  #
+  def supports_readline
+    false
+  end
+
+  #
+  # Reads input from the raw socket.
+  #
+  def sysread(len = 1)
+    @sock.sysread(len)
+  end
+
+  #
+  # Wait for a line of input to be read from a socket.
+  #
+  def gets
+
+    # Initialize the line buffer
+    line = ''
+
+    # Read data one byte at a time until we see a LF
+    while (true)
+
+      break if line.include?("\n")
+
+      # Read another character of input
+      char = @sock.getc
+      if char.nil?
+        @sock.close
+        return
+      end
+
+      # Telnet sends 0x04 as EOF
+      if (char == 4)
+        @sock.write("[*] Caught ^D, closing the socket...\n")
+        @sock.close
+        return
+      end
+
+      # Append this character to the string
+      line << char
+
+      # Handle telnet sequences
+      case line
+        when /\xff\xf4\xff\xfd\x06/n
+          @sock.write("[*] Caught ^C, closing the socket...\n")
+          @sock.close
+          return
+
+        when /\xff\xed\xff\xfd\x06/n
+          @sock.write("[*] Caught ^Z\n")
+          return
+      end
+    end
+
+    return line
+  end
+
+  #
+  # Returns whether or not EOF has been reached on stdin.
+  #
+  def eof?
+    @sock.closed?
+  end
+
+  #
+  # Returns the file descriptor associated with a socket.
+  #
+  def fd
+    return @sock
+  end
 end
 
 end

data/lib/rex/ui/text/input/stdio.rb

@@ -12,33 +12,33 @@ module Text
 ###
 class Input::Stdio < Rex::Ui::Text::Input
 
-	#
-	# Reads text from standard input.
-	#
-	def sysread(len = 1)
-		$stdin.sysread(len)
-	end
+  #
+  # Reads text from standard input.
+  #
+  def sysread(len = 1)
+    $stdin.sysread(len)
+  end
 
-	#
-	# Wait for a line of input to be read from standard input.
-	#
-	def gets
-		return $stdin.gets
-	end
+  #
+  # Wait for a line of input to be read from standard input.
+  #
+  def gets
+    return $stdin.gets
+  end
 
-	#
-	# Returns whether or not EOF has been reached on stdin.
-	#
-	def eof?
-		$stdin.closed?
-	end
+  #
+  # Returns whether or not EOF has been reached on stdin.
+  #
+  def eof?
+    $stdin.closed?
+  end
 
-	#
-	# Returns the file descriptor associated with standard input.
-	#
-	def fd
-		return $stdin
-	end
+  #
+  # Returns the file descriptor associated with standard input.
+  #
+  def fd
+    return $stdin
+  end
 end
 
 end

data/lib/rex/ui/text/irb_shell.rb

@@ -10,47 +10,51 @@ module Text
 ###
 class IrbShell
 
-	@@IrbInitialized = false
-
-	def initialize(binding)
-		@binding_ctx = binding
-	end
-
-	#
-	# Runs the IRB shell until completion.  The binding parameter initializes
-	# IRB to the appropriate binding context.
-	#
-	def run
-		# Initialize IRB by setting up its internal configuration hash and
-		# stuff.
-		if (@@IrbInitialized == false)
-			load('irb.rb')
-
-			IRB.setup(nil)
-			IRB.conf[:PROMPT_MODE]  = :SIMPLE
-
-			@@IrbInitialized = true
-		end
-
-		# Create a new IRB instance
-		irb = IRB::Irb.new(IRB::WorkSpace.new(@binding_ctx))
-
-		# Set the primary irb context so that exit and other intrinsic
-		# commands will work.
-		IRB.conf[:MAIN_CONTEXT] = irb.context
-
-		# Trap interrupt
-		old_sigint = trap("SIGINT") do
-			irb.signal_handle
-		end
-
-		# Keep processing input until the cows come home...
-		catch(:IRB_EXIT) do
-			irb.eval_input
-		end
-
-		trap("SIGINT", old_sigint)
-	end
+  @@IrbInitialized = false
+
+  def initialize(binding)
+    @binding_ctx = binding
+  end
+
+  #
+  # Runs the IRB shell until completion.  The binding parameter initializes
+  # IRB to the appropriate binding context.
+  #
+  def run
+    # Initialize IRB by setting up its internal configuration hash and
+    # stuff.
+    if (@@IrbInitialized == false)
+      load('irb.rb')
+
+      IRB.setup(nil)
+      IRB.conf[:PROMPT_MODE]  = :SIMPLE
+
+      @@IrbInitialized = true
+    end
+
+    # Create a new IRB instance
+    irb = IRB::Irb.new(IRB::WorkSpace.new(@binding_ctx))
+
+    # Set the primary irb context so that exit and other intrinsic
+    # commands will work.
+    IRB.conf[:MAIN_CONTEXT] = irb.context
+
+    # Trap interrupt
+    old_sigint = trap("SIGINT") do
+      begin
+        irb.signal_handle
+      rescue RubyLex::TerminateLineInput
+        irb.eval_input
+      end
+    end
+
+    # Keep processing input until the cows come home...
+    catch(:IRB_EXIT) do
+      irb.eval_input
+    end
+
+    trap("SIGINT", old_sigint)
+  end
 
 end
 end

data/lib/rex/ui/text/output.rb

@@ -13,66 +13,70 @@ module Text
 ###
 class Output < Rex::Ui::Output
 
-	require 'rex/ui/text/output/stdio'
-	require 'rex/ui/text/output/socket'
-	require 'rex/ui/text/output/buffer'
-	require 'rex/ui/text/output/file'
-	require 'rex/ui/text/output/tee'
-	require 'rex/ui/text/color'
-
-	include Rex::Ui::Text::Color
-
-	def initialize
-		@config = {
-			:color => :auto, # true, false, :auto
-		}
-		super
-	end
-	attr_reader :config
-
-	def disable_color
-		@config[:color] = false
-	end
-
-	def enable_color
-		@config[:color] = true
-	end
-
-	def auto_color
-		@config[:color] = :auto
-	end
-
-	def update_prompt(prompt = nil)
-		return if prompt.nil?
-		substitute_colors(prompt, true)
-	end
-
-	def print_error(msg = '')
-		print_line("%bld%red[-]%clr #{msg}")
-	end
-
-	def print_good(msg = '')
-		print_line("%bld%grn[+]%clr #{msg}")
-	end
-
-	def print_debug(msg = '')
-		print_line("%bld%cya[!]%clr #{msg}")
-	end
-
-	def print_status(msg = '')
-		print_line("%bld%blu[*]%clr #{msg}")
-	end
-
-	def print_line(msg = '')
-		print(msg + "\n")
-	end
-
-	def print(msg = '')
-		print_raw(substitute_colors(msg))
-	end
-
-	def reset
-	end
+  require 'rex/ui/text/output/stdio'
+  require 'rex/ui/text/output/socket'
+  require 'rex/ui/text/output/buffer'
+  require 'rex/ui/text/output/file'
+  require 'rex/ui/text/output/tee'
+  require 'rex/ui/text/color'
+
+  include Rex::Ui::Text::Color
+
+  def initialize
+    @config = {
+      :color => :auto, # true, false, :auto
+    }
+    super
+  end
+  attr_reader :config
+
+  def disable_color
+    @config[:color] = false
+  end
+
+  def enable_color
+    @config[:color] = true
+  end
+
+  def auto_color
+    @config[:color] = :auto
+  end
+
+  def update_prompt(prompt = nil)
+    return if prompt.nil?
+    substitute_colors(prompt, true)
+  end
+
+  def print_error(msg = '')
+    print_line("%bld%red[-]%clr #{msg}")
+  end
+
+  def print_good(msg = '')
+    print_line("%bld%grn[+]%clr #{msg}")
+  end
+
+  def print_debug(msg = '')
+    print_line("%bld%cya[!]%clr #{msg}")
+  end
+
+  def print_status(msg = '')
+    print_line("%bld%blu[*]%clr #{msg}")
+  end
+
+  def print_line(msg = '')
+    print(msg + "\n")
+  end
+
+  def print_warning(msg = '')
+    print_line("%bld%yel[!]%clr #{msg}")
+  end
+
+  def print(msg = '')
+    print_raw(substitute_colors(msg))
+  end
+
+  def reset
+  end
 
 end
 

data/lib/rex/ui/text/output/buffer.rb

@@ -12,48 +12,48 @@ module Text
 ###
 class Output::Buffer < Rex::Ui::Text::Output
 
-	#
-	# Initializes an output buffer.
-	#
-	def initialize
-		self.buf = ''
-	end
-
-	def supports_color?
-		false
-	end
-
-	#
-	# Appends the supplied message to the output buffer.
-	#
-	def print_raw(msg = '')
-		self.buf += msg || ''
-
-		msg
-	end
-
-
-	#
-	# Read everything out of the buffer and reset it
-	#
-	def dump_buffer
-		self.buf ||= ''
-		buffer = self.buf.dup
-		reset()
-		buffer
-	end
-
-	#
-	# Reset the buffer to an empty string.
-	#
-	def reset
-		self.buf = ''
-	end
-
-	#
-	# The underlying buffer state.
-	#
-	attr_accessor :buf
+  #
+  # Initializes an output buffer.
+  #
+  def initialize
+    self.buf = ''
+  end
+
+  def supports_color?
+    false
+  end
+
+  #
+  # Appends the supplied message to the output buffer.
+  #
+  def print_raw(msg = '')
+    self.buf += msg || ''
+
+    msg
+  end
+
+
+  #
+  # Read everything out of the buffer and reset it
+  #
+  def dump_buffer
+    self.buf ||= ''
+    buffer = self.buf.dup
+    reset()
+    buffer
+  end
+
+  #
+  # Reset the buffer to an empty string.
+  #
+  def reset
+    self.buf = ''
+  end
+
+  #
+  # The underlying buffer state.
+  #
+  attr_accessor :buf
 
 end