librex 0.0.68 → 0.0.70

data/lib/rex/image_source.rb

@@ -1,8 +1,5 @@
-#!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id: image_source.rb 15548 2012-06-29 06:08:20Z rapid7 $
-
 module Rex
 module ImageSource
 

data/lib/rex/image_source/disk.rb

@@ -1,8 +1,5 @@
-#!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id: disk.rb 15548 2012-06-29 06:08:20Z rapid7 $
-
 require 'rex/image_source/image_source'
 require 'rex/struct2'
 
@@ -10,51 +7,51 @@ module Rex
 module ImageSource
 class Disk < ImageSource
 
-	attr_accessor :file, :file_offset, :size
-
-	WINDOW_SIZE     = 4096
-	WINDOW_OVERLAP  = 64
-
-	def initialize(_file, _offset = 0, _len = nil)
-		_len = _file.stat.size if !_len
-
-		self.file         = _file
-		self.file_offset  = _offset
-		self.size         = _len
-	end
-
-	def read(offset, len)
-		if offset < 0 || offset+len > size
-			raise RangeError, "Offset #{offset} outside of image source", caller
-		end
-
-		file.seek(file_offset + offset)
-		file.read(len)
-	end
-	
-	def index(search, offset = 0)
-		# do a sliding window search across the disk
-		while offset < size
-
-			# get a full window size if we can, we
-			# don't want to read past our boundaries
-			wsize = size - offset
-			wsize = WINDOW_SIZE if wsize > WINDOW_SIZE
-
-			window = self.read(offset, wsize)
-			res = window.index(search)
-			return res + offset if res
-			offset += WINDOW_SIZE - WINDOW_OVERLAP
-		end
-	end
-
-	def subsource(offset, len)
-		self.class.new(file, file_offset+offset, len)
-	end
-
-	def close
-		file.close
-	end
+  attr_accessor :file, :file_offset, :size
+
+  WINDOW_SIZE     = 4096
+  WINDOW_OVERLAP  = 64
+
+  def initialize(_file, _offset = 0, _len = nil)
+    _len = _file.stat.size if !_len
+
+    self.file         = _file
+    self.file_offset  = _offset
+    self.size         = _len
+  end
+
+  def read(offset, len)
+    if offset < 0 || offset+len > size
+      raise RangeError, "Offset #{offset} outside of image source", caller
+    end
+
+    file.seek(file_offset + offset)
+    file.read(len)
+  end
+
+  def index(search, offset = 0)
+    # do a sliding window search across the disk
+    while offset < size
+
+      # get a full window size if we can, we
+      # don't want to read past our boundaries
+      wsize = size - offset
+      wsize = WINDOW_SIZE if wsize > WINDOW_SIZE
+
+      window = self.read(offset, wsize)
+      res = window.index(search)
+      return res + offset if res
+      offset += WINDOW_SIZE - WINDOW_OVERLAP
+    end
+  end
+
+  def subsource(offset, len)
+    self.class.new(file, file_offset+offset, len)
+  end
+
+  def close
+    file.close
+  end
 end
 
 end

data/lib/rex/image_source/image_source.rb

@@ -1,45 +1,42 @@
-#!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id: image_source.rb 15548 2012-06-29 06:08:20Z rapid7 $
-
 module Rex
 module ImageSource
 class ImageSource
 
-	#
-	# Um, just some abstract class stuff I guess, this is the interface
-	# that any image sources should subscribe to...
-	#
-
-	def subsource(offset, len)
-		raise "do something"
-	end
-
-	def size
-		raise "do something"
-	end
-
-	def file_offset
-		raise "do something"
-	end
-
-	def close
-		raise "do something"
-	end
-
-	def read_asciiz(offset)
-		# FIXME, make me better
-		string = ''
-		loop do
-			char = read(offset, 1)
-			break if char == "\x00"
-			offset += 1
-			string << char
-		end
-		return string
-	end
-		
+  #
+  # Um, just some abstract class stuff I guess, this is the interface
+  # that any image sources should subscribe to...
+  #
+
+  def subsource(offset, len)
+    raise "do something"
+  end
+
+  def size
+    raise "do something"
+  end
+
+  def file_offset
+    raise "do something"
+  end
+
+  def close
+    raise "do something"
+  end
+
+  def read_asciiz(offset)
+    # FIXME, make me better
+    string = ''
+    loop do
+      char = read(offset, 1)
+      break if char == "\x00"
+      offset += 1
+      string << char
+    end
+    return string
+  end
+
 
 end
 

data/lib/rex/image_source/memory.rb

@@ -1,8 +1,5 @@
-#!/usr/bin/env ruby
 # -*- coding: binary -*-
 
-# $Id: memory.rb 15548 2012-06-29 06:08:20Z rapid7 $
-
 require 'rex/image_source/image_source'
 require 'rex/struct2'
 
@@ -10,28 +7,28 @@ module Rex
 module ImageSource
 class Memory < ImageSource
 
-	attr_accessor :rawdata, :size, :file_offset
+  attr_accessor :rawdata, :size, :file_offset
 
-	def initialize(_rawdata, _file_offset = 0)
-		self.rawdata     = _rawdata
-		self.size        = _rawdata.length
-		self.file_offset = _file_offset
-	end
+  def initialize(_rawdata, _file_offset = 0)
+    self.rawdata     = _rawdata
+    self.size        = _rawdata.length
+    self.file_offset = _file_offset
+  end
 
-	def read(offset, len)
-		rawdata[offset, len]
-	end
+  def read(offset, len)
+    rawdata[offset, len]
+  end
 
-	def subsource(offset, len)
-		self.class.new(rawdata[offset, len], offset + file_offset)
-	end
+  def subsource(offset, len)
+    self.class.new(rawdata[offset, len], offset + file_offset)
+  end
 
-	def close
-	end
+  def close
+  end
 
-	def index(*args)
-		rawdata.index(*args)
-	end
+  def index(*args)
+    rawdata.index(*args)
+  end
 end
 
 end

data/lib/rex/io/bidirectional_pipe.rb

@@ -8,145 +8,149 @@ require 'rex/ui/text/input/buffer'
 
 class BidirectionalPipe < Rex::Ui::Text::Input
 
-	def initialize
-		@subscribers_out = {}
-		@subscribers_ref = {}
-		@subscribers_idx = 0
-		@pipe_input = Rex::Ui::Text::Input::Buffer.new
-
-		# We are the shell, the input, and the output
-		self.output = self
-		self.input  = self
-	end
-
-	def pipe_input
-		@pipe_input
-	end
-
-	def close
-		@pipe_input.close
-	end
-
-	def has_subscriber?(id)
-		@subscribers_out.has_key?(id)
-	end
-
-	def create_subscriber(id=nil)
-		id ||= (@subscribers_idx += 1).to_s
-		@subscribers_out[id] = Rex::Ui::Text::Output::Buffer.new
-		return id
-	end
-
-	def create_subscriber_proc(id=nil, &block)
-		id = create_subscriber(id)
-		@subscribers_ref[id] = block
-	end
-
-	def remove_subscriber(id)
-		@subscribers_out.delete(id)
-		@subscribers_ref.delete(id)
-	end
-
-	def write_input(buf)
-		@pipe_input.put(buf)
-	end
+  def initialize
+    @subscribers_out = {}
+    @subscribers_ref = {}
+    @subscribers_idx = 0
+    @pipe_input = Rex::Ui::Text::Input::Buffer.new
+
+    # We are the shell, the input, and the output
+    self.output = self
+    self.input  = self
+  end
+
+  def pipe_input
+    @pipe_input
+  end
+
+  def close
+    @pipe_input.close
+  end
+
+  def has_subscriber?(id)
+    @subscribers_out.has_key?(id)
+  end
+
+  def create_subscriber(id=nil)
+    id ||= (@subscribers_idx += 1).to_s
+    @subscribers_out[id] = Rex::Ui::Text::Output::Buffer.new
+    return id
+  end
+
+  def create_subscriber_proc(id=nil, &block)
+    id = create_subscriber(id)
+    @subscribers_ref[id] = block
+  end
+
+  def remove_subscriber(id)
+    @subscribers_out.delete(id)
+    @subscribers_ref.delete(id)
+  end
+
+  def write_input(buf)
+    @pipe_input.put(buf)
+  end
+
+  def read_subscriber(id)
+    output = @subscribers_out[id]
 
-	def read_subscriber(id)
-		output = @subscribers_out[id]
+    return '' if output.nil?
 
-		return '' if output.nil?
+    buf = output.buf
 
-		buf = output.buf
+    output.reset
 
-		output.reset
+    buf
+  end
 
-		buf
-	end
+  def print(msg='')
+    @subscribers_out.each_pair { |id, buf|
+      begin
+        @subscribers_ref[id] ? @subscribers_ref[id].call(msg) : buf.print(msg)
+      rescue ::Exception => e
+        # $stderr.puts "Error handling subscriber #{id}: #{e} #{e.backtrace.inspect}"
+        raise e
+      end
+    }
+    msg
+  end
 
-	def print(msg='')
-		@subscribers_out.each_pair { |id, buf|
-			begin
-				@subscribers_ref[id] ? @subscribers_ref[id].call(msg) : buf.print(msg)
-			rescue ::Exception => e
-				# $stderr.puts "Error handling subscriber #{id}: #{e} #{e.backtrace.inspect}"
-				raise e
-			end
-		}
-		msg
-	end
+  def print_error(msg='')
+    print_line('[-] ' + msg)
+  end
 
-	def print_error(msg='')
-		print_line('[-] ' + msg)
-	end
+  def print_line(msg='')
+    print(msg + "\n")
+  end
 
-	def print_line(msg='')
-		print(msg + "\n")
-	end
+  def print_good(msg='')
+    print_line('[+] ' + msg)
+  end
 
-	def print_good(msg='')
-		print_line('[+] ' + msg)
-	end
+  def print_debug(msg='')
+    print_line('[!] ' + msg)
+  end
 
-	def print_debug(msg='')
-		print_line('[!] ' + msg)
-	end
+  def flush
+  end
 
-	def flush
-	end
+  def print_status(msg='')
+    print_line('[*] ' + msg)
+  end
 
-	def print_status(msg='')
-		print_line('[*] ' + msg)
-	end
+  def print_warning(msg='')
+    print_line('[!] ' + msg)
+  end
 
-	#
-	# Wrappers for the pipe_input methods
-	#
+  #
+  # Wrappers for the pipe_input methods
+  #
 
-	def close
-		@pipe_input.close
-	end
+  def close
+    @pipe_input.close
+  end
 
-	def sysread(len = 1)
-		@pipe_input.sysread(len)
-	end
+  def sysread(len = 1)
+    @pipe_input.sysread(len)
+  end
 
-	def put(msg)
-		@pipe_input.put(msg)
-	end
+  def put(msg)
+    @pipe_input.put(msg)
+  end
 
-	def gets
-		@pipe_input.gets
-	end
+  def gets
+    @pipe_input.gets
+  end
 
-	def eof?
-		@pipe_input.eof?
-	end
+  def eof?
+    @pipe_input.eof?
+  end
 
-	def fd
-		@pipe_input.fd
-	end
+  def fd
+    @pipe_input.fd
+  end
 
-	#
-	# Wrappers for shell methods
-	#
+  #
+  # Wrappers for shell methods
+  #
 
-	attr_accessor :output, :prompt, :input
+  attr_accessor :output, :prompt, :input
 
-	def intrinsic_shell?
-		true
-	end
+  def intrinsic_shell?
+    true
+  end
 
-	def supports_readline
-		false
-	end
+  def supports_readline
+    false
+  end
 
-	def supports_color?
-		false
-	end
+  def supports_color?
+    false
+  end
 
-	def pgets
-		gets
-	end
+  def pgets
+    gets
+  end
 
 
 protected
@@ -155,4 +159,3 @@ end
 
 end
 end
-