librex 0.0.65 → 0.0.66

data/lib/rex/exploitation/jsobfu.rb

@@ -1,5 +1,6 @@
+# -*- coding: binary -*-
 ##
-# $Id: jsobfu.rb 13761 2011-09-19 23:01:26Z jduck $
+# $Id: jsobfu.rb 15548 2012-06-29 06:08:20Z rapid7 $
 ##
 
 require 'rex/text'

data/lib/rex/exploitation/obfuscatejs.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/text'
 module Rex
 module Exploitation

data/lib/rex/exploitation/omelet.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/text'
 require 'rex/arch'
 require 'metasm'

data/lib/rex/exploitation/omelet.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 

data/lib/rex/exploitation/opcodedb.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rexml/rexml'
 require 'rexml/source'
 require 'rexml/document'
@@ -43,7 +44,7 @@ module Cachable
 end
 
 ###
-# 
+#
 # This class provides a general interface to items that come from that opcode
 # database that have a symbolic entry identifier and name.
 #
@@ -183,9 +184,9 @@ class ImageModule
 	class <<self
 		include Cachable
 		def hash_key(hash) # :nodoc:
-			(hash['id'] || '') + 
-			(hash['segments'] || '').to_s + 
-			(hash['exports'] || '').to_s + 
+			(hash['id'] || '') +
+			(hash['segments'] || '').to_s +
+			(hash['exports'] || '').to_s +
 			(hash['imports'] || '').to_s
 		end
 	end
@@ -718,16 +719,16 @@ protected
 		client  = Rex::Proto::Http::Client.new(server_host, server_port)
 
 		begin
-		
+
 			# Create the CGI parameter list
 			vars = { 'method' => method }
-			
+
 			opts.each_pair do |k, v|
 				vars[k] = xlate_param(v)
 			end
 
 			client.set_config('uri_encode_mode' => 'none')
-			
+
 			# Initialize the request with the POST body.
 			request = client.request_cgi(
 				'method'    => 'POST',
@@ -761,7 +762,7 @@ protected
 				xlate_param(ent)
 			}.join(',,')
 		elsif (v.kind_of?(Hash))
-			v.map { |k,v| 
+			v.map { |k,v|
 				"#{URI.escape(k)}:#{xlate_param(v)}" if (v)
 			}.join(',,')
 		else
@@ -778,9 +779,9 @@ protected
 		if (!@disable_parse)
 			source = REXML::Source.new(xml)
 			doc    = REXML::Document.new
-			
+
 			REXML::Parsers::TreeParser.new(source, doc).parse
-	
+
 			translate_element(doc.root)
 		end
 	end
@@ -801,7 +802,7 @@ protected
 					else
 						v = child.text
 					end
-						
+
 					hsh[child.attributes['name']] = v
 				}
 

data/lib/rex/exploitation/opcodedb.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -276,4 +277,4 @@ protected
 		}
 	end
 
-end
+end

data/lib/rex/exploitation/seh.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/text'
 require 'rex/arch/x86'
 
@@ -41,7 +42,7 @@ class Seh
 	# Generates a fake SEH registration record with the supplied handler
 	# address for the handler, and a nop generator to use when generating
 	# padding inside the next pointer.  The NOP generator must implement the
-	# 'generate_sled' method that takes a length and a list of bad 
+	# 'generate_sled' method that takes a length and a list of bad
 	# characters.
 	#
 	def generate_dynamic_seh_record(handler)
@@ -89,4 +90,4 @@ protected
 end
 
 end
-end
+end

data/lib/rex/exploitation/seh.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -16,4 +17,4 @@ class Rex::Exploitation::Seh::UnitTest < Test::Unit::TestCase
 		assert_equal("\x41\x41\x41\x41", record[4, 4])
 	end
 
-end
+end

data/lib/rex/file.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'find'
 require 'rex/compat'
 require 'tempfile'
@@ -32,12 +33,12 @@ module FileUtils
 	# a fully qualified path to the supplied file name.
 	#
 	def self.find_full_path(file_name)
-	
+
 		# Check for the absolute fast first
 		if (file_name[0,1] == "/" and ::File.exists?(file_name) and ::File::Stat.new(file_name))
 			return file_name
 		end
-	
+
 		path = Rex::Compat.getenv('PATH')
 		if (path)
 			path.split(::File::PATH_SEPARATOR).each { |base|
@@ -63,7 +64,7 @@ class Quickfile < ::Tempfile
 	def initialize(*args)
 		super(*args)
 		self.binmode
-		ObjectSpace.undefine_finalizer(self)	
+		ObjectSpace.undefine_finalizer(self)
 	end
 end
 

data/lib/rex/file.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..'))
 
@@ -13,4 +14,4 @@ class Rex::FileUtils::UnitTest < ::Test::Unit::TestCase
 		assert_nil(Klass.find_full_path("cookie monster cake"))
 	end
 		
-end
+end

data/lib/rex/image_source.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
-# $Id: image_source.rb 5413 2008-02-13 02:43:56Z ramon $
+# $Id: image_source.rb 15548 2012-06-29 06:08:20Z rapid7 $
 
 module Rex
 module ImageSource
@@ -9,4 +10,4 @@ end
 end
 
 require 'rex/image_source/disk'
-require 'rex/image_source/memory'
+require 'rex/image_source/memory'

data/lib/rex/image_source/disk.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
-# $Id: disk.rb 5401 2008-02-09 04:35:21Z ramon $
+# $Id: disk.rb 15548 2012-06-29 06:08:20Z rapid7 $
 
 require 'rex/image_source/image_source'
 require 'rex/struct2'
@@ -57,4 +58,4 @@ class Disk < ImageSource
 end
 
 end
-end
+end

data/lib/rex/image_source/image_source.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
-# $Id: image_source.rb 5401 2008-02-09 04:35:21Z ramon $
+# $Id: image_source.rb 15548 2012-06-29 06:08:20Z rapid7 $
 
 module Rex
 module ImageSource
@@ -43,4 +44,4 @@ class ImageSource
 end
 
 end
-end
+end

data/lib/rex/image_source/memory.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
-# $Id: memory.rb 5401 2008-02-09 04:35:21Z ramon $
+# $Id: memory.rb 15548 2012-06-29 06:08:20Z rapid7 $
 
 require 'rex/image_source/image_source'
 require 'rex/struct2'
@@ -34,4 +35,4 @@ class Memory < ImageSource
 end
 
 end
-end
+end

data/lib/rex/io/bidirectional_pipe.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module IO
 

data/lib/rex/io/datagram_abstraction.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'socket'
 
@@ -32,4 +33,4 @@ protected
 
 end
 
-end; end
+end; end

data/lib/rex/io/ring_buffer.rb

@@ -1,9 +1,10 @@
+# -*- coding: binary -*-
 #
 # This class implements a ring buffer with "cursors" in the form of sequence numbers.
 # To use this class, pass in a file descriptor and a ring size, the class will read
 # data from the file descriptor and store it in the ring. If the ring becomes full,
 # the oldest item will be overwritten. To emulate a stream interface, call read_data
-# to grab the last sequence number and any buffered data, call read_data again, 
+# to grab the last sequence number and any buffered data, call read_data again,
 # passing in the sequence number and all data newer than that sequence will be
 # returned, along with a new sequence to read from.
 #
@@ -12,7 +13,7 @@ require 'rex/socket'
 
 module Rex
 module IO
-	
+
 class RingBuffer
 
 	attr_accessor :queue     # The data queue, essentially an array of two-element arrays, containing a sequence and data buffer
@@ -24,7 +25,7 @@ class RingBuffer
 	attr_accessor :cur       # The sequence number of the earliest data fragment in the ring
 	attr_accessor :monitor   # The thread handle of the built-in monitor when used
 	attr_accessor :monitor_thread_error  # :nodoc: #
-	
+
 	#
 	# Create a new ring buffer
 	#
@@ -37,14 +38,18 @@ class RingBuffer
 		self.queue = Array.new( self.size )
 		self.mutex = Mutex.new
 	end
-	
+
+	def inspect
+		"#<Rex::IO::RingBuffer @size=#{size} @fd=#{fd} @seq=#{seq} @beg=#{beg} @cur=#{cur}>"
+	end
+
 	#
 	# Start the built-in monitor, not called when used in a larger framework
 	#
 	def start_monitor
 		self.monitor = monitor_thread if not self.monitor
 	end
-	
+
 	#
 	# Stop the built-in monitor
 	#
@@ -52,12 +57,12 @@ class RingBuffer
 		self.monitor.kill if self.monitor
 		self.monitor = nil
 	end
-	
+
 	#
 	# The built-in monitor thread (normally unused with Metasploit)
 	#
 	def monitor_thread
-		Thread.new do 
+		Thread.new do
 			begin
 			while self.fd
 				buff = self.fd.get_once(-1, 1.0)
@@ -69,7 +74,7 @@ class RingBuffer
 			end
 		end
 	end
-	
+
 	#
 	# Push data back into the associated stream socket. Logging must occur
 	# elsewhere, this function is simply a passthrough.
@@ -77,7 +82,7 @@ class RingBuffer
 	def put(data, opts={})
 		self.fd.put(data, opts={})
 	end
-	
+
 	#
 	# The clear_data method wipes the ring buffer
 	#
@@ -89,55 +94,55 @@ class RingBuffer
 			self.queue = Array.new( self.size )
 		end
 	end
-	
+
 	#
-	# The store_data method is used to insert data into the ring buffer. 
+	# The store_data method is used to insert data into the ring buffer.
 	#
 	def store_data(data)
-		self.mutex.synchronize do 
+		self.mutex.synchronize do
 			# self.cur points to the array index of queue containing the last item
 			# adding data will result in cur + 1 being used to store said data
 			# if cur is larger than size - 1, it will wrap back around. If cur
 			# is *smaller* beg, beg is increemnted to cur + 1 (and wrapped if
 			# necessary
-		
-			loc = 0		
+
+			loc = 0
 			if self.seq > 0
 				loc = ( self.cur + 1 ) % self.size
-			
+
 				if loc <= self.beg
 					self.beg = (self.beg + 1) % self.size
 				end
 			end
-			
+
 			self.queue[loc] = [self.seq += 1, data]
 			self.cur = loc
 		end
 	end
-	
+
 	#
 	# The read_data method returns a two element array with the new reader cursor (a sequence number)
 	# and the returned data buffer (if any). A result of nil/nil indicates that no data is available
 	#
 	def read_data(ptr=nil)
 		self.mutex.synchronize do
-		
+
 		# Verify that there is data in the queue
 		return [nil,nil] if not self.queue[self.beg]
-		
+
 		# Configure the beginning read pointer (sequence number, not index)
 		ptr ||= self.queue[self.beg][0]
 		return [nil,nil] if not ptr
-		
+
 		# If the pointer is below our baseline, we lost some data, so jump forward
 		if ptr < self.queue[self.beg][0]
 			ptr = self.queue[self.beg][0]
 		end
-		
+
 		# Calculate how many blocks exist between the current sequence number
 		# and the requested pointer, this becomes the number of blocks we will
 		# need to read to satisfy the result. Due to the mutex block, we do
-		# not need to scan to find the sequence of the starting block or 
+		# not need to scan to find the sequence of the starting block or
 		# check the sequence of the ending block.
 		dis = self.seq - ptr
 
@@ -148,8 +153,8 @@ class RingBuffer
 		# Calculate the beginning block index and number of blocks to read
 		off = ptr - self.queue[self.beg][0]
 		set = (self.beg + off) % self.size
-		
-		
+
+
 		# Build the buffer by reading forward by the number of blocks needed
 		# and return the last read sequence number, plus one, as the new read
 		# pointer.
@@ -162,12 +167,12 @@ class RingBuffer
 			buff += data
 			cnt += 1
 		end
-		
+
 		return [lst + 1, buff]
-		
+
 		end
 	end
-	
+
 	#
 	# The base_sequence method returns the earliest sequence number in the queue. This is zero until
 	# all slots are filled and the ring rotates.
@@ -178,22 +183,22 @@ class RingBuffer
 			return self.queue[self.beg][0]
 		end
 	end
-	
+
 	#
 	# The last_sequence method returns the "next" sequence number where new data will be
-	# available. 
+	# available.
 	#
 	def last_sequence
 		self.seq
 	end
-	
+
 	#
 	# The create_steam method assigns a IO::Socket compatible object to the ringer buffer
 	#
 	def create_stream
 		Stream.new(self)
 	end
-	
+
 	#
 	# The select method returns when there is a chance of new data
 	# XXX: This is mostly useless and requires a rewrite to use a
@@ -202,7 +207,7 @@ class RingBuffer
 	def select
 		::IO.select([ self.fd ], nil, [ self.fd ], 0.10)
 	end
-	
+
 	#
 	# The wait method blocks until new data is available
 	#
@@ -213,7 +218,7 @@ class RingBuffer
 			select
 		end
 	end
-	
+
 	#
 	# The wait_for method blocks until new data is available or the timeout is reached
 	#
@@ -225,7 +230,7 @@ class RingBuffer
 		rescue ::Timeout::Error
 		end
 	end
-	
+
 	#
 	# This class provides a backwards compatible "stream" socket that uses
 	# the parents ring buffer.
@@ -234,13 +239,13 @@ class RingBuffer
 		attr_accessor :ring
 		attr_accessor :seq
 		attr_accessor :buff
-		
+
 		def initialize(ring)
 			self.ring = ring
 			self.seq  = ring.base_sequence
 			self.buff = ''
 		end
-		
+
 		def read(len=nil)
 			if len and self.buff.length >= len
 				data = self.buff.slice!(0,len)
@@ -250,7 +255,7 @@ class RingBuffer
 			while true
 				lseq, data = self.ring.read_data( self.seq )
 				return if not lseq
-			
+
 				self.seq  = lseq
 				self.buff << data
 				if len
@@ -261,23 +266,23 @@ class RingBuffer
 						next
 					end
 				end
-				
+
 				data = self.buff
 				self.buff = ''
-				
+
 				return data
-				
+
 				# Not reached
 				break
 			end
-					
+
 		end
-		
+
 		def write(data)
 			self.ring.write(data)
 		end
 	end
-	
+
 end
 
 end
@@ -312,7 +317,7 @@ s,d = r.read_data(s)
 
 test_counter = 11
 1.upto(100) do
-	client.put( "X" )			
+	client.put( "X" )
 	test_counter += 1
 end