librex 0.0.68 → 0.0.70

data/lib/rex/script.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: binary -*-
 
 module Rex
@@ -11,27 +10,27 @@ module Rex
 ###
 module Script
 
-	class Completed < ::RuntimeError
-	end
-
-	#
-	# Reads the contents of the supplied file and exeutes them.
-	#
-	def self.execute_file(file, in_binding = nil)
-		str = ''
-		buf = ::File.read(file, ::File.size(file))
-		execute(buf, in_binding)
-	end
-
-	#
-	# Executes arbitrary ruby from the supplied string.
-	#
-	def self.execute(str, in_binding = nil)
-		begin
-			eval(str, in_binding)
-		rescue Completed
-		end
-	end
+  class Completed < ::RuntimeError
+  end
+
+  #
+  # Reads the contents of the supplied file and exeutes them.
+  #
+  def self.execute_file(file, in_binding = nil)
+    str = ''
+    buf = ::File.read(file, ::File.size(file))
+    execute(buf, in_binding)
+  end
+
+  #
+  # Executes arbitrary ruby from the supplied string.
+  #
+  def self.execute(str, in_binding = nil)
+    begin
+      eval(str, in_binding)
+    rescue Completed
+    end
+  end
 
 end
 

data/lib/rex/script/base.rb

@@ -3,56 +3,57 @@ module Rex
 module Script
 class Base
 
-	class OutputSink
-		def print(msg); end
-		def print_line(msg); end
-		def print_status(msg); end
-		def print_good(msg); end
-		def print_error(msg); end
-	end
-
-	attr_accessor :client, :framework, :path, :error, :args
-	attr_accessor :session, :sink, :workspace
-
-	def initialize(client, path)
-		self.client    = client
-		self.framework = client.framework
-		self.path      = path
-		self.sink      = OutputSink.new
-
-		if(client.framework.db and client.framework.db.active)
-			self.workspace = client.framework.db.find_workspace( client.workspace.to_s ) || client.framework.db.workspace
-		end
-
-		# Convenience aliases
-		self.session   = self.client
-	end
-
-	def output
-		client.user_output || self.sink
-	end
-
-	def completed
-		raise Rex::Script::Completed
-	end
-
-	def run(args=[])
-		self.args = args = args.flatten
-		begin
-			eval(::File.read(self.path, ::File.size(self.path)), binding )
-		rescue ::Interrupt
-		rescue ::Rex::Script::Completed
-		rescue ::Exception => e
-			self.error = e
-			raise e
-		end
-	end
-
-	def print(*args);         output.print(*args);          end
-	def print_status(*args);  output.print_status(*args);   end
-	def print_error(*args);   output.print_error(*args);    end
-	def print_good(*args);    output.print_good(*args);     end
-	def print_line(*args);    output.print_line(*args);     end
+  class OutputSink
+    def print(msg); end
+    def print_line(msg); end
+    def print_status(msg); end
+    def print_good(msg); end
+    def print_error(msg); end
+    def print_warning(msg); end
+  end
+
+  attr_accessor :client, :framework, :path, :error, :args
+  attr_accessor :session, :sink, :workspace
+
+  def initialize(client, path)
+    self.client    = client
+    self.framework = client.framework
+    self.path      = path
+    self.sink      = OutputSink.new
+
+    if(client.framework.db and client.framework.db.active)
+      self.workspace = client.framework.db.find_workspace( client.workspace.to_s ) || client.framework.db.workspace
+    end
+
+    # Convenience aliases
+    self.session   = self.client
+  end
+
+  def output
+    client.user_output || self.sink
+  end
+
+  def completed
+    raise Rex::Script::Completed
+  end
+
+  def run(args=[])
+    self.args = args = args.flatten
+    begin
+      eval(::File.read(self.path, ::File.size(self.path)), binding )
+    rescue ::Interrupt
+    rescue ::Rex::Script::Completed
+    rescue ::Exception => e
+      self.error = e
+      raise e
+    end
+  end
+
+  def print(*args);         output.print(*args);          end
+  def print_status(*args);  output.print_status(*args);   end
+  def print_error(*args);   output.print_error(*args);    end
+  def print_good(*args);    output.print_good(*args);     end
+  def print_line(*args);    output.print_line(*args);     end
 
 end
 end

data/lib/rex/script/meterpreter.rb

@@ -5,8 +5,8 @@ module Script
 class Meterpreter < Base
 
 begin
-	require 'msf/scripts/meterpreter'
-	include Msf::Scripts::Meterpreter::Common
+  require 'msf/scripts/meterpreter'
+  include Msf::Scripts::Meterpreter::Common
 rescue ::LoadError
 end
 

data/lib/rex/service.rb

@@ -12,37 +12,37 @@ module Rex
 #
 ###
 module Service
-	include Ref
+  include Ref
 
-	require 'rex/services/local_relay'
+  require 'rex/services/local_relay'
 
-	#
-	# Returns the hardcore, as in porno, alias for this service.  This is used
-	# by the service manager to manage singleton services.
-	#
-	def self.hardcore_alias(*args)
-		return "__#{args}"
-	end
+  #
+  # Returns the hardcore, as in porno, alias for this service.  This is used
+  # by the service manager to manage singleton services.
+  #
+  def self.hardcore_alias(*args)
+    return "__#{args}"
+  end
 
-	def deref
-		rv = super
+  def deref
+    rv = super
 
-		# If there's only one reference, then it's the service managers.
-		if @_references == 1
-			Rex::ServiceManager.stop_service(self)
-		end
+    # If there's only one reference, then it's the service managers.
+    if @_references == 1
+      Rex::ServiceManager.stop_service(self)
+    end
 
-		rv
-	end
+    rv
+  end
 
-	#
-	# Calls stop on the service once the ref count drops.
-	#
-	def cleanup
-		stop
-	end
+  #
+  # Calls stop on the service once the ref count drops.
+  #
+  def cleanup
+    stop
+  end
 
-	attr_accessor :alias
+  attr_accessor :alias
 
 end
 

data/lib/rex/service_manager.rb

@@ -13,141 +13,141 @@ module Rex
 ###
 class ServiceManager < Hash
 
-	#
-	# This class is a singleton.
-	#
-	include Singleton
-
-	#
-	# Calls the instance method to start a service.
-	#
-	def self.start(klass, *args)
-		self.instance.start(klass, *args)
-	end
-
-	#
-	# Calls the instance method to stop a service.
-	#
-	def self.stop(klass, *args)
-		self.instance.stop(klass, *args)
-	end
-
-	#
-	# Stop a service using the alias that's associated with it.
-	#
-	def self.stop_by_alias(als)
-		self.instance.stop_by_alias(als)
-	end
-
-	#
-	# Stop the supplied service instance.
-	#
-	def self.stop_service(service)
-		self.instance.stop_service(service)
-	end
-
-	#
-	# Starts a service and assigns it a unique name in the service hash.
-	#
-	def start(klass, *args)
-		# Get the hardcore alias.
-		hals = "#{klass}" + klass.hardcore_alias(*args)
-
-		# Has a service already been constructed for this guy?  If so, increment
-		# its reference count like it aint no thang.
-		if (inst = self[hals])
-			inst.ref
-			return inst
-		end
-
-		inst = klass.new(*args)
-		als  = inst.alias
-
-		# Find an alias that isn't taken.
-		if (self[als])
-			cnt  = 1
-			cnt += 1 while (self[als + " #{cnt}"])
-			als  = inst.alias + " #{cnt}"
-		end
-
-		# Extend the instance as a service.
-		inst.extend(Rex::Service)
-
-		# Re-aliases the instance.
-		inst.alias = als
-
-		# Fire up the engines.  If an error occurs an exception will be
-		# raised.
-		inst.start
-
-		# Alias associate and initialize reference counting
-		self[als] = self[hals] = inst.refinit
-
-		# Pass the caller a reference
-		inst.ref
-
-		inst
-	end
-
-	#
-	# Stop a service using a given klass and arguments.  These should mirror
-	# what was originally passed to start exactly.  If the reference count of
-	# the service drops to zero the service will be destroyed.
-	#
-	def stop(klass, *args)
-		stop_service(hals[hardcore_alias(klass, *args)])
-	end
-
-	#
-	# Stops a service using the provided alias.
-	#
-	def stop_by_alias(als)
-		stop_service(self[als])
-	end
-
-	#
-	# Stops a service instance.
-	#
-	def stop_service(inst)
-		# Stop the service and be done wif it, but only if the number of
-		# references has dropped to zero
-		if (inst)
-			# Since the instance may have multiple aliases, scan through
-			# all the pairs for matching stuff.
-			self.each_pair { |cals, cinst|
-				self.delete(cals) if (inst == cinst)
-			}
-
-			# Lose the list-held reference to the instance
-			inst.deref
-
-			return true
-		end
-
-		# Return false if the service isn't there
-		return false
-	end
-
-	#
-	# Overrides the builtin 'each' operator to avoid the following exception on Ruby 1.9.2+
-	#    "can't add a new key into hash during iteration"
-	#
-	def each(&block)
-		list = []
-		self.keys.sort.each do |sidx|
-			list << [sidx, self[sidx]]
-		end
-		list.each(&block)
-	end
+  #
+  # This class is a singleton.
+  #
+  include Singleton
+
+  #
+  # Calls the instance method to start a service.
+  #
+  def self.start(klass, *args)
+    self.instance.start(klass, *args)
+  end
+
+  #
+  # Calls the instance method to stop a service.
+  #
+  def self.stop(klass, *args)
+    self.instance.stop(klass, *args)
+  end
+
+  #
+  # Stop a service using the alias that's associated with it.
+  #
+  def self.stop_by_alias(als)
+    self.instance.stop_by_alias(als)
+  end
+
+  #
+  # Stop the supplied service instance.
+  #
+  def self.stop_service(service)
+    self.instance.stop_service(service)
+  end
+
+  #
+  # Starts a service and assigns it a unique name in the service hash.
+  #
+  def start(klass, *args)
+    # Get the hardcore alias.
+    hals = "#{klass}" + klass.hardcore_alias(*args)
+
+    # Has a service already been constructed for this guy?  If so, increment
+    # its reference count like it aint no thang.
+    if (inst = self[hals])
+      inst.ref
+      return inst
+    end
+
+    inst = klass.new(*args)
+    als  = inst.alias
+
+    # Find an alias that isn't taken.
+    if (self[als])
+      cnt  = 1
+      cnt += 1 while (self[als + " #{cnt}"])
+      als  = inst.alias + " #{cnt}"
+    end
+
+    # Extend the instance as a service.
+    inst.extend(Rex::Service)
+
+    # Re-aliases the instance.
+    inst.alias = als
+
+    # Fire up the engines.  If an error occurs an exception will be
+    # raised.
+    inst.start
+
+    # Alias associate and initialize reference counting
+    self[als] = self[hals] = inst.refinit
+
+    # Pass the caller a reference
+    inst.ref
+
+    inst
+  end
+
+  #
+  # Stop a service using a given klass and arguments.  These should mirror
+  # what was originally passed to start exactly.  If the reference count of
+  # the service drops to zero the service will be destroyed.
+  #
+  def stop(klass, *args)
+    stop_service(hals[hardcore_alias(klass, *args)])
+  end
+
+  #
+  # Stops a service using the provided alias.
+  #
+  def stop_by_alias(als)
+    stop_service(self[als])
+  end
+
+  #
+  # Stops a service instance.
+  #
+  def stop_service(inst)
+    # Stop the service and be done wif it, but only if the number of
+    # references has dropped to zero
+    if (inst)
+      # Since the instance may have multiple aliases, scan through
+      # all the pairs for matching stuff.
+      self.each_pair { |cals, cinst|
+        self.delete(cals) if (inst == cinst)
+      }
+
+      # Lose the list-held reference to the instance
+      inst.deref
+
+      return true
+    end
+
+    # Return false if the service isn't there
+    return false
+  end
+
+  #
+  # Overrides the builtin 'each' operator to avoid the following exception on Ruby 1.9.2+
+  #    "can't add a new key into hash during iteration"
+  #
+  def each(&block)
+    list = []
+    self.keys.sort.each do |sidx|
+      list << [sidx, self[sidx]]
+    end
+    list.each(&block)
+  end
 
 protected
 
-	#
-	# Returns the alias for a given service instance.
-	#
-	def hardcore_alias(klass, *args)
-		"__#{klass.name}#{args}"
-	end
+  #
+  # Returns the alias for a given service instance.
+  #
+  def hardcore_alias(klass, *args)
+    "__#{klass.name}#{args}"
+  end
 
 end