librex 0.0.68 → 0.0.70

data/lib/rex/post/meterpreter/packet_parser.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: binary -*-
 
 module Rex
@@ -13,80 +12,80 @@ module Meterpreter
 ###
 class PacketParser
 
-	#
-	# Initializes the packet parser context with an optional cipher.
-	#
-	def initialize(cipher = nil)
-		self.cipher = cipher
-
-		reset
-	end
-
-	#
-	# Resets the parser state so that a new packet can begin being parsed.
-	#
-	def reset
-		self.raw = ''
-		self.hdr_length_left = 8
-		self.payload_length_left = 0
-	end
-
-	#
-	# Reads data from the wire and parse as much of the packet as possible.
-	#
-	def recv(sock)
-		if (self.hdr_length_left > 0)
-			buf = sock.read(self.hdr_length_left)
-
-			if (buf)
-				self.raw << buf
-
-				self.hdr_length_left -= buf.length
-			else
-				raise EOFError
-			end
-
-			# If we've finished reading the header, set the
-			# payload length left to the number of bytes
-			# specified in the length
-			if (self.hdr_length_left == 0)
-				self.payload_length_left = raw.unpack("N")[0] - 8
-			end
-		elsif (self.payload_length_left > 0)
-			buf = sock.read(self.payload_length_left)
-
-			if (buf)
-				self.raw << buf
-
-				self.payload_length_left -= buf.length
-			else
-				raise EOFError
-			end
-		end
-
-		# If we've finished reading the entire packet
-		if ((self.hdr_length_left == 0) &&
-		    (self.payload_length_left == 0))
-
-			# Create a typeless packet
-			packet = Packet.new(0)
-
-			# TODO: cipher decryption
-			if (cipher)
-			end
-
-			# Serialize the packet from the raw buffer
-			packet.from_r(self.raw)
-
-			# Reset our state
-			reset
-
-			return packet
-		end
-	end
+  #
+  # Initializes the packet parser context with an optional cipher.
+  #
+  def initialize(cipher = nil)
+    self.cipher = cipher
+
+    reset
+  end
+
+  #
+  # Resets the parser state so that a new packet can begin being parsed.
+  #
+  def reset
+    self.raw = ''
+    self.hdr_length_left = 8
+    self.payload_length_left = 0
+  end
+
+  #
+  # Reads data from the wire and parse as much of the packet as possible.
+  #
+  def recv(sock)
+    if (self.hdr_length_left > 0)
+      buf = sock.read(self.hdr_length_left)
+
+      if (buf)
+        self.raw << buf
+
+        self.hdr_length_left -= buf.length
+      else
+        raise EOFError
+      end
+
+      # If we've finished reading the header, set the
+      # payload length left to the number of bytes
+      # specified in the length
+      if (self.hdr_length_left == 0)
+        self.payload_length_left = raw.unpack("N")[0] - 8
+      end
+    elsif (self.payload_length_left > 0)
+      buf = sock.read(self.payload_length_left)
+
+      if (buf)
+        self.raw << buf
+
+        self.payload_length_left -= buf.length
+      else
+        raise EOFError
+      end
+    end
+
+    # If we've finished reading the entire packet
+    if ((self.hdr_length_left == 0) &&
+        (self.payload_length_left == 0))
+
+      # Create a typeless packet
+      packet = Packet.new(0)
+
+      # TODO: cipher decryption
+      if (cipher)
+      end
+
+      # Serialize the packet from the raw buffer
+      packet.from_r(self.raw)
+
+      # Reset our state
+      reset
+
+      return packet
+    end
+  end
 
 protected
-	attr_accessor :cipher, :raw, :hdr_length_left, :payload_length_left  # :nodoc:
+  attr_accessor :cipher, :raw, :hdr_length_left, :payload_length_left  # :nodoc:
 
 end
 

data/lib/rex/post/meterpreter/packet_response_waiter.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: binary -*-
 
 require 'timeout'
@@ -16,68 +15,68 @@ module Meterpreter
 ###
 class PacketResponseWaiter
 
-	#
-	# Initializes a response waiter instance for the supplied request
-	# identifier.
-	#
-	def initialize(rid, completion_routine = nil, completion_param = nil)
-		self.rid      = rid.dup
-		self.response = nil
+  #
+  # Initializes a response waiter instance for the supplied request
+  # identifier.
+  #
+  def initialize(rid, completion_routine = nil, completion_param = nil)
+    self.rid      = rid.dup
+    self.response = nil
 
-		if (completion_routine)
-			self.completion_routine = completion_routine
-			self.completion_param   = completion_param
-		else
-			self.done  = false
-		end
-	end
+    if (completion_routine)
+      self.completion_routine = completion_routine
+      self.completion_param   = completion_param
+    else
+      self.done  = false
+    end
+  end
 
-	#
-	# Checks to see if this waiter instance is waiting for the supplied
-	# packet based on its request identifier.
-	#
-	def waiting_for?(packet)
-		return (packet.rid == rid)
-	end
+  #
+  # Checks to see if this waiter instance is waiting for the supplied
+  # packet based on its request identifier.
+  #
+  def waiting_for?(packet)
+    return (packet.rid == rid)
+  end
 
-	#
-	# Notifies the waiter that the supplied response packet has arrived.
-	#
-	def notify(response)
-		self.response = response
+  #
+  # Notifies the waiter that the supplied response packet has arrived.
+  #
+  def notify(response)
+    self.response = response
 
-		if (self.completion_routine)
-			self.completion_routine.call(response, self.completion_param)
-		else
-			self.done = true
-		end
-	end
+    if (self.completion_routine)
+      self.completion_routine.call(response, self.completion_param)
+    else
+      self.done = true
+    end
+  end
 
-	#
-	# Waits for a given time interval for the response packet to arrive.
-	# If the interval is -1 we can wait forever.
-	#
-	def wait(interval)
-		if( interval and interval == -1 )
-			while(not self.done)
-				::IO.select(nil, nil, nil, 0.1)
-			end
-		else
-			begin
-				Timeout.timeout(interval) {
-					while(not self.done)
-						::IO.select(nil, nil, nil, 0.1)
-					end
-				}
-			rescue Timeout::Error
-				self.response = nil
-			end
-		end
-		return self.response
-	end
+  #
+  # Waits for a given time interval for the response packet to arrive.
+  # If the interval is -1 we can wait forever.
+  #
+  def wait(interval)
+    if( interval and interval == -1 )
+      while(not self.done)
+        ::IO.select(nil, nil, nil, 0.1)
+      end
+    else
+      begin
+        Timeout.timeout(interval) {
+          while(not self.done)
+            ::IO.select(nil, nil, nil, 0.1)
+          end
+        }
+      rescue Timeout::Error
+        self.response = nil
+      end
+    end
+    return self.response
+  end
 
-	attr_accessor :rid, :done, :response # :nodoc:
-	attr_accessor :completion_routine, :completion_param # :nodoc:
+  attr_accessor :rid, :done, :response # :nodoc:
+  attr_accessor :completion_routine, :completion_param # :nodoc:
 end
 
 end; end; end

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

@@ -15,121 +15,121 @@ module Ui
 ###
 class Console
 
-	include Rex::Ui::Text::DispatcherShell
-
-	# Dispatchers
-	require 'rex/post/meterpreter/ui/console/interactive_channel'
-	require 'rex/post/meterpreter/ui/console/command_dispatcher'
-	require 'rex/post/meterpreter/ui/console/command_dispatcher/core'
-
-	#
-	# Initialize the meterpreter console.
-	#
-	def initialize(client)
-		if (Rex::Compat.is_windows())
-			super("meterpreter")
-		else
-			super("%undmeterpreter%clr")
-		end
-
-		# The meterpreter client context
-		self.client = client
-
-		# Queued commands array
-		self.commands = []
-
-		# Point the input/output handles elsewhere
-		reset_ui
-
-		enstack_dispatcher(Console::CommandDispatcher::Core)
-
-		# Set up logging to whatever logsink 'core' is using
-		if ! $dispatcher['meterpreter']
-			$dispatcher['meterpreter'] = $dispatcher['core']
-		end
-	end
-
-	#
-	# Called when someone wants to interact with the meterpreter client.  It's
-	# assumed that init_ui has been called prior.
-	#
-	def interact(&block)
-		init_tab_complete
-
-		# Run queued commands
-		commands.delete_if { |ent|
-			run_single(ent)
-			true
-		}
-
-		# Run the interactive loop
-		run { |line|
-			# Run the command
-			run_single(line)
-
-			# If a block was supplied, call it, otherwise return false
-			if (block)
-				block.call
-			else
-				false
-			end
-		}
-	end
-
-	#
-	# Interacts with the supplied channel.
-	#
-	def interact_with_channel(channel)
-		channel.extend(InteractiveChannel) unless (channel.kind_of?(InteractiveChannel) == true)
-		channel.on_command_proc = self.on_command_proc if self.on_command_proc
-		channel.on_print_proc   = self.on_print_proc if self.on_print_proc
-
-		channel.interact(input, output)
-		channel.reset_ui
-	end
-
-	#
-	# Queues a command to be run when the interactive loop is entered.
-	#
-	def queue_cmd(cmd)
-		self.commands << cmd
-	end
-
-	#
-	# Runs the specified command wrapper in something to catch meterpreter
-	# exceptions.
-	#
-	def run_command(dispatcher, method, arguments)
-		begin
-			super
-		rescue Timeout::Error
-			log_error("Operation timed out.")
-		rescue RequestError => info
-			log_error(info.to_s)
-		rescue ::Errno::EPIPE, ::OpenSSL::SSL::SSLError, ::IOError
-			self.client.kill
-		rescue  ::Exception => e
-			log_error("Error running command #{method}: #{e.class} #{e}")
-		end
-	end
-
-	#
-	# Logs that an error occurred and persists the callstack.
-	#
-	def log_error(msg)
-		print_error(msg)
-
-		elog(msg, 'meterpreter')
-
-		dlog("Call stack:\n#{$@.join("\n")}", 'meterpreter')
-	end
-
-	attr_reader :client # :nodoc:
+  include Rex::Ui::Text::DispatcherShell
+
+  # Dispatchers
+  require 'rex/post/meterpreter/ui/console/interactive_channel'
+  require 'rex/post/meterpreter/ui/console/command_dispatcher'
+  require 'rex/post/meterpreter/ui/console/command_dispatcher/core'
+
+  #
+  # Initialize the meterpreter console.
+  #
+  def initialize(client)
+    if (Rex::Compat.is_windows())
+      super("meterpreter")
+    else
+      super("%undmeterpreter%clr")
+    end
+
+    # The meterpreter client context
+    self.client = client
+
+    # Queued commands array
+    self.commands = []
+
+    # Point the input/output handles elsewhere
+    reset_ui
+
+    enstack_dispatcher(Console::CommandDispatcher::Core)
+
+    # Set up logging to whatever logsink 'core' is using
+    if ! $dispatcher['meterpreter']
+      $dispatcher['meterpreter'] = $dispatcher['core']
+    end
+  end
+
+  #
+  # Called when someone wants to interact with the meterpreter client.  It's
+  # assumed that init_ui has been called prior.
+  #
+  def interact(&block)
+    init_tab_complete
+
+    # Run queued commands
+    commands.delete_if { |ent|
+      run_single(ent)
+      true
+    }
+
+    # Run the interactive loop
+    run { |line|
+      # Run the command
+      run_single(line)
+
+      # If a block was supplied, call it, otherwise return false
+      if (block)
+        block.call
+      else
+        false
+      end
+    }
+  end
+
+  #
+  # Interacts with the supplied channel.
+  #
+  def interact_with_channel(channel)
+    channel.extend(InteractiveChannel) unless (channel.kind_of?(InteractiveChannel) == true)
+    channel.on_command_proc = self.on_command_proc if self.on_command_proc
+    channel.on_print_proc   = self.on_print_proc if self.on_print_proc
+
+    channel.interact(input, output)
+    channel.reset_ui
+  end
+
+  #
+  # Queues a command to be run when the interactive loop is entered.
+  #
+  def queue_cmd(cmd)
+    self.commands << cmd
+  end
+
+  #
+  # Runs the specified command wrapper in something to catch meterpreter
+  # exceptions.
+  #
+  def run_command(dispatcher, method, arguments)
+    begin
+      super
+    rescue Timeout::Error
+      log_error("Operation timed out.")
+    rescue RequestError => info
+      log_error(info.to_s)
+    rescue ::Errno::EPIPE, ::OpenSSL::SSL::SSLError, ::IOError
+      self.client.kill
+    rescue  ::Exception => e
+      log_error("Error running command #{method}: #{e.class} #{e}")
+    end
+  end
+
+  #
+  # Logs that an error occurred and persists the callstack.
+  #
+  def log_error(msg)
+    print_error(msg)
+
+    elog(msg, 'meterpreter')
+
+    dlog("Call stack:\n#{$@.join("\n")}", 'meterpreter')
+  end
+
+  attr_reader :client # :nodoc:
 
 protected
 
-	attr_writer :client # :nodoc:
-	attr_accessor :commands # :nodoc:
+  attr_writer :client # :nodoc:
+  attr_accessor :commands # :nodoc:
 
 end