librex 0.0.30 → 0.0.31

data/README.markdown

@@ -3,7 +3,7 @@
 A non-official re-packaging of the Rex library as a gem for easy of usage of the Metasploit REX framework in a non Metasploit application. I received permission from HDM to create this package.
 
 Currently based on:
-SVN Revision: 12516
+SVN Revision: 12559
 
 # Credits
 The Metasploit development team <http://www.metasploit.com>

data/lib/rex.rb

@@ -40,53 +40,60 @@ end
 # Generic classes
 require 'rex/constants'
 require 'rex/exceptions'
-require 'rex/transformer'
-require 'rex/text'
-require 'rex/time'
-require 'rex/job_container'
-require 'rex/file'
 
-# Thread safety and synchronization
-require 'rex/sync'
+module Rex
+	# Generic modules
+	autoload :File,         'rex/file'
+	autoload :Text,         'rex/text'
+	autoload :Job,          'rex/job_container'
+	autoload :JobContainer, 'rex/job_container'
+	autoload :Transformer,  'rex/transformer'
+	autoload :ExtTime,      'rex/time'
 
-# Thread factory
-require 'rex/thread_factory'
+	# Thread safety and synchronization
+	autoload :ReadWriteLock, 'rex/sync/read_write_lock'
+	autoload :ThreadSafe,    'rex/sync/thread_safe'
+	autoload :Ref,           'rex/sync/ref'
+	autoload :Sync,          'rex/sync/event'
 
-# Encoding
-require 'rex/encoder/xor'
-require 'rex/encoding/xor'
+	# Thread factory
+	autoload :ThreadFactory, 'rex/thread_factory'
 
-# Architecture subsystem
-require 'rex/arch'
+	# Encoding
+	autoload :Encoder,  'rex/encoder'
+	autoload :Encoders, 'rex/encoders'
+	autoload :Encoding, 'rex/encoding'
 
-# Assembly
-require 'rex/assembly/nasm'
+	# Architecture subsystem
+	autoload :Arch, 'rex/arch'
 
-# Logging
-require 'rex/logging/log_dispatcher'
+	# Assembly
+	autoload :Assembly, 'rex/assembly/nasm'
 
-# IO
-require 'rex/io/stream'
-require 'rex/io/stream_abstraction'
-require 'rex/io/stream_server'
+	# Logging
+	autoload :Logging, 'rex/logging'
 
-# Sockets
-require 'rex/socket'
+	# IO
+	autoload :IO, 'rex/io'
 
-# Protocols
+	# Sockets
+	autoload :Socket, 'rex/socket'
 
-require 'rex/proto'
+	# Platforms
+	autoload :Platforms, 'rex/platforms'
 
-# Parsers
-require 'rex/parser/arguments'
-require 'rex/parser/ini'
+	# Protocols
+	autoload :Proto, 'rex/proto'
 
+	# Service handling
+	autoload :Service, 'rex/service'
 
-# Compatibility
-require 'rex/compat'
+	# Parsers
+	autoload :Parser, 'rex/parser'
 
-# Platforms
-require 'rex/platforms'
+	# Compatibility
+	autoload :Compat, 'rex/compat'
+end
 
 
 # Overload the Kernel.sleep() function to be thread-safe

data/lib/rex/arch.rb

@@ -2,7 +2,6 @@ require 'rex/constants'
 
 module Rex
 
-
 ###
 #
 # This module provides generalized methods for performing operations that are
@@ -15,8 +14,8 @@ module Arch
 	#
 	# Architecture classes
 	#
-	require 'rex/arch/x86'
-	require 'rex/arch/sparc'
+	autoload :X86, 'rex/arch/x86'
+	autoload :Sparc, 'rex/arch/sparc'
 
 	#
 	# This routine adjusts the stack pointer for a given architecture.

data/lib/rex/encoder.rb

@@ -0,0 +1,17 @@
+##
+# $Id: encoder.rb 12554 2011-05-06 18:47:10Z jduck $
+#
+# This file maps encoders for autoload
+##
+
+module Rex::Encoder
+	# Encoder support code
+	autoload :Xor,      'rex/encoder/xor'
+	autoload :Alpha2,   'rex/encoder/alpha2'
+	autoload :NonAlpha, 'rex/encoder/nonalpha'
+	autoload :NonUpper, 'rex/encoder/nonupper'
+
+	# Hrm? Is these in the wrong module?
+	autoload :XDR, 'rex/encoder/xdr'
+	autoload :NDR, 'rex/encoder/ndr'
+end

data/lib/rex/encoder/alpha2.rb

@@ -18,14 +18,16 @@
 module Rex
 module Encoder
 module Alpha2
-end end end
 
-#
-# include the Alpha2 encodings
-#
+	#
+	# autoload the Alpha2 encoders
+	#
+	autoload :Generic,      'rex/encoder/alpha2/generic'
+	autoload :AlphaMixed,   'rex/encoder/alpha2/alpha_mixed'
+	autoload :AlphaUpper,   'rex/encoder/alpha2/alpha_upper'
+	autoload :UnicodeMixed, 'rex/encoder/alpha2/unicode_mixed'
+	autoload :UnicodeUpper, 'rex/encoder/alpha2/unicode_upper'
 
-require 'rex/encoder/alpha2/generic'
-require 'rex/encoder/alpha2/alpha_mixed'
-require 'rex/encoder/alpha2/alpha_upper'
-require 'rex/encoder/alpha2/unicode_mixed'
-require 'rex/encoder/alpha2/unicode_upper'
+end
+end
+end

data/lib/rex/encoder/xor.rb

@@ -10,6 +10,9 @@ module Encoder
 ###
 class Xor
 
+	autoload :Dword,         'rex/encoder/xor/dword'
+	autoload :DwordAdditive, 'rex/encoder/xor/dword_additive'
+
 	attr_accessor :raw, :encoded, :badchars, :opts, :key, :fkey # :nodoc:
 
 	#
@@ -65,5 +68,5 @@ class Xor
 
 end
 
-end end
-
+end
+end

data/lib/rex/encoders.rb

@@ -0,0 +1,11 @@
+##
+# $Id: encoders.rb 12554 2011-05-06 18:47:10Z jduck $
+#
+# This file maps encoders for autoload
+##
+require 'rex'
+
+module Rex::Encoders
+	autoload :XorDword,         'rex/encoders/xor_dword'
+	autoload :XorDwordAdditive, 'rex/encoders/xor_dword_additive'
+end

data/lib/rex/encoding.rb

@@ -0,0 +1,10 @@
+##
+# $Id: encoding.rb 12554 2011-05-06 18:47:10Z jduck $
+#
+# This file maps encodings for autoload
+##
+
+module Rex::Encoding
+	# Encoding support code
+	autoload :Xor, 'rex/encoding/xor'
+end

data/lib/rex/encoding/xor.rb

@@ -1,20 +1,19 @@
-#!/usr/bin/env ruby
-
-#
-# make sure the namespace is created
-#
-
 module Rex
 module Encoding
 module Xor
-end end end
 
-#
-# include the Xor encodings
-#
+	#
+	# autoload the Xor encodings
+	#
+	autoload :Generic, 'rex/encoding/xor/generic'
+	autoload :Byte,    'rex/encoding/xor/byte'
+	autoload :Word,    'rex/encoding/xor/word'
+	autoload :Dword,   'rex/encoding/xor/dword'
+	autoload :DwordAdditive, 'rex/encoding/xor/dword_additive'
+	autoload :Qword,   'rex/encoding/xor/qword'
+
+	autoload :Exception, 'rex/encoding/xor/exceptions'
 
-require 'rex/encoding/xor/generic'
-require 'rex/encoding/xor/byte'
-require 'rex/encoding/xor/word'
-require 'rex/encoding/xor/dword'
-require 'rex/encoding/xor/qword'
+end 
+end
+end

data/lib/rex/exploitation/egghunter.rb

@@ -1,5 +1,6 @@
 require 'rex/text'
 require 'rex/arch'
+require 'metasm'
 
 module Rex
 module Exploitation

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

@@ -10,16 +10,18 @@ class Rex::Exploitation::Egghunter::UnitTest < Test::Unit::TestCase
 	Klass = Rex::Exploitation::Egghunter
 
 	def test_egghunter
+		payload = "\xcc" * 1023
+
 		r = Klass.new('bogus')
-		assert_nil(r.generate)
+		assert_nil(r.generate(payload))
 
 		r = Klass.new('win')
-		assert_nil(r.generate)
+		assert_nil(r.generate(payload))
 
 		r = Klass.new('win', ARCH_X86)
-		assert_not_nil(r.generate)
-		assert_not_nil(r.generate[0])
-		assert_not_nil(r.generate[1])
+		assert_not_nil(r.generate(payload))
+		assert_not_nil(r.generate(payload)[0])
+		assert_not_nil(r.generate(payload)[1])
 	end
 
 end

data/lib/rex/exploitation/javascriptosdetect.rb

@@ -1,7 +1,6 @@
 
 require 'rex/text'
 require 'rex/exploitation/obfuscatejs'
-require 'msf/core/auxiliary'
 
 module Rex
 module Exploitation

data/lib/rex/exploitation/omelet.rb

@@ -104,8 +104,8 @@ class Omelet
 			eggsize_hex = "%02x" % eggsize
 
 			hextag = ''
-			eggtag.split('').each do | thischar |
-				decchar = "%02x" % thischar[0]
+			eggtag.each_byte do |thischar|
+				decchar = "%02x" % thischar
 				hextag = decchar + hextag
 			end
 			hextag = hextag + "01"

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

@@ -1,13 +1,26 @@
-# $Id$
-
-require 'omelet.rb'
-
-x = Rex::Exploitation::Omelet.new('win', ARCH_X86)
-x.generate("\xcc" * 1024, '', {
-	#:eggsize => 31336,       # default: 123
-	#:eggtag => "b00",        # default: 00w
-	#:searchforward => false, # default: true
-	#:reset => true,          # default: false
-	#:startreg => "EBP",      # default: none
-	:checksum => true        # default: false
-})
+#!/usr/bin/env ruby
+
+$:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
+
+require 'test/unit'
+require 'rex/exploitation/omelet'
+
+class Rex::Exploitation::Omelet::UnitTest < Test::Unit::TestCase
+
+	Klass = Rex::Exploitation::Omelet
+
+	def test_generate
+		x = Klass.new('win', ARCH_X86)
+
+		om = x.generate("\xcc" * 1024, '', {
+			#:eggsize => 31336,       # default: 123
+			#:eggtag => "b00",        # default: 00w
+			#:searchforward => false, # default: true
+			#:reset => true,          # default: false
+			#:startreg => "EBP",      # default: none
+			:checksum => true        # default: false
+		})
+		# XXX: TODO: assertions!
+	end
+
+end

data/lib/rex/io.rb

@@ -0,0 +1,16 @@
+##
+# $Id: io.rb 12554 2011-05-06 18:47:10Z jduck $
+# 
+# This file simply provides an autoload interface for the children 
+# of Rex::IO
+#
+##
+module Rex::IO
+	autoload :Stream,              'rex/io/stream'
+	autoload :StreamAbstraction,   'rex/io/stream_abstraction'
+	autoload :StreamServer,        'rex/io/stream_server'
+
+	autoload :BidirectionalPipe,   'rex/io/bidirectional_pipe'
+	autoload :DatagramAbstraction, 'rex/io/datagram_abstraction'
+	autoload :RingBuffer,          'rex/io/ring_buffer'
+end

data/lib/rex/io/stream.rb

@@ -56,7 +56,7 @@ module Stream
 			# Try to write the data again
 			retry
 		rescue ::IOError, ::Errno::EPIPE
-			return nil if (fd.abortive_close == true)
+			return nil
 		end
 		
 		total_sent
@@ -75,7 +75,7 @@ module Stream
 			# Decrement the block size to handle full sendQs better
 			retry
 		rescue ::IOError, ::Errno::EPIPE
-			return nil if (fd.abortive_close == true)
+			return nil
 		end
 	end
 
@@ -101,11 +101,8 @@ module Stream
 		rescue ::Errno::EBADF, ::Errno::ENOTSOCK
 			raise ::EOFError
 		rescue StreamClosedError, ::IOError, ::EOFError, ::Errno::EPIPE
-			# If the thing that lead to the closure was an abortive close, then
-			# don't raise the stream closed error.
-			return false if (fd.abortive_close == true)
-
-			raise $!
+			#  Return false if the socket is dead
+			return false
 		end
 	end
 
@@ -310,11 +307,6 @@ module Stream
 		16384
 	end
 
-	#
-	# This flag indicates whether or not an abortive close has been issued.
-	#
-	attr_accessor :abortive_close
-
 protected
 
 end

data/lib/rex/io/stream_abstraction.rb

@@ -148,10 +148,9 @@ protected
 							closed = true
 							wlog("monitor_rsock: closed remote socket due to nil read")
 						end
-
 					rescue ::Exception
 						closed = true
-						wlog("monitor_rsock: exception during read: #{e.class} #{e}")						
+						wlog("monitor_rsock: exception during read: #{e.class} #{e}")
 					end
 				end
 
@@ -165,15 +164,18 @@ protected
 							# Note that this must be write() NOT syswrite() or put() or anything like it.
 							# Using syswrite() breaks SSL streams.
 							sent = self.write( data )
-							
+
 							# sf: Only remove the data off the queue is write was successfull.
 							#     This way we naturally perform a resend if a failure occured.
 							#     Catches an edge case with meterpreter TCP channels where remote send
 							#     failes gracefully and a resend is required.
-							if( sent > 0 )
+							if (sent.nil? or sent <= 0)
+								wlog("monitor_rsock: failed writing, socket must be dead")
+								break
+							else
 								total_sent += sent
 							end
-						rescue ::IOError => e
+						rescue ::IOError, ::EOFError => e
 							closed = true
 							wlog("monitor_rsock: exception during write: #{e.class} #{e}")
 							break

data/lib/rex/logging.rb

@@ -1,4 +1,17 @@
-#!/usr/bin/env ruby
+##
+# $Id: $
+#
+# maps autoload for logging classes
+##
 
 require 'rex/constants' # for LEV_'s
-require 'rex/logging/log_dispatcher'
+
+module Rex
+module Logging
+	autoload :LogSink,       'rex/logging/log_sink'
+	autoload :Sinks,         'rex/logging/sinks'
+end
+end
+
+# This defines a global so it must be loaded always
+require 'rex/logging/log_dispatcher'

data/lib/rex/logging/log_dispatcher.rb

@@ -1,5 +1,4 @@
 require 'rex/sync'
-require 'rex/logging/log_sink'
 
 module Rex
 module Logging

data/lib/rex/logging/log_sink.rb

@@ -37,6 +37,3 @@ end
 
 end
 end
-
-require 'rex/logging/sinks/flatfile'
-require 'rex/logging/sinks/stderr'

data/lib/rex/logging/sinks.rb

@@ -0,0 +1,16 @@
+##
+# $Id: sinks.rb 12554 2011-05-06 18:47:10Z jduck $
+#
+# Map log sinks for autload
+##
+
+module Rex
+module Logging
+module Sinks
+
+	autoload :Flatfile, 'rex/logging/sinks/flatfile'
+	autoload :Stderr,   'rex/logging/sinks/stderr'
+
+end
+end
+end

data/lib/rex/logging/sinks/flatfile.rb

@@ -1,3 +1,5 @@
+require 'rex/logging'
+
 module Rex
 module Logging
 module Sinks

data/lib/rex/parser.rb

@@ -0,0 +1,23 @@
+##
+# $Id: parser.rb 12554 2011-05-06 18:47:10Z jduck $
+#
+# This file maps parsers for autoload
+##
+
+module Rex
+module Parser
+	# General parsers
+	autoload :Arguments, 'rex/parser/arguments'
+	autoload :Ini,       'rex/parser/ini'
+
+	# Data import parsers
+	autoload :NmapXMLStreamParser,       'rex/parser/nmap_xml'
+	autoload :NexposeXMLStreamParser,    'rex/parser/nexpose_xml'
+	autoload :RetinaXMLStreamParser,     'rex/parser/retina_xml'
+	autoload :NetSparkerXMLStreamParser, 'rex/parser/netsparker_xml'
+	autoload :NessusXMLStreamParser,     'rex/parser/nessus_xml'
+	autoload :IP360XMLStreamParser,      'rex/parser/ip360_xml'
+	autoload :IP360ASPLXMLStreamParser,  'rex/parser/ip360_aspl_xml'
+	autoload :AppleBackupManifestDB,     'rex/parser/apple_backup_manifestdb'
+end
+end

data/lib/rex/payloads.rb

@@ -1 +1,3 @@
-require 'rex/payloads/win32'
+module Rex::Payloads
+	autoload :Win32, 'rex/payloads/win32'
+end

data/lib/rex/payloads/win32.rb

@@ -1,2 +1,4 @@
-require 'rex/payloads/win32/common'
-require 'rex/payloads/win32/kernel'
+module Rex::Payloads::Win32
+	autoload :Common, 'rex/payloads/win32/common'
+	autoload :Kernel, 'rex/payloads/win32/kernel'
+end

data/lib/rex/payloads/win32/kernel.rb

@@ -1,14 +1,13 @@
 module Rex
 module Payloads
 module Win32
-
-require 'rex/payloads/win32/kernel/common'
-require 'rex/payloads/win32/kernel/recovery'
-require 'rex/payloads/win32/kernel/stager'
-require 'rex/payloads/win32/kernel/migration'
-
 module Kernel
 
+	autoload :Common,    'rex/payloads/win32/kernel/common'
+	autoload :Recovery,  'rex/payloads/win32/kernel/recovery'
+	autoload :Stager,    'rex/payloads/win32/kernel/stager'
+	autoload :Migration, 'rex/payloads/win32/kernel/migration'
+
 	#
 	# Constructs a kernel-mode payload using the supplied options.  The options
 	# can be:

data/lib/rex/peparsey.rb

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
-
-# $Id: peparsey.rb 12196 2011-04-01 00:51:33Z egypt $
+#
+# $Id: peparsey.rb 12554 2011-05-06 18:47:10Z jduck $
+#
 
 module Rex
 module PeParsey
-
+	autoload :Pe,        'rex/peparsey/pe'
+	autoload :PeMemDump, 'rex/peparsey/pe_memdump'
 end
 end
-
-require 'rex/peparsey/pe'
-require 'rex/peparsey/pe_memdump'

data/lib/rex/pescan.rb

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
-
-# $Id: pescan.rb 12196 2011-04-01 00:51:33Z egypt $
+#
+# $Id: pescan.rb 12554 2011-05-06 18:47:10Z jduck $
+#
 
 module Rex
 module PeScan
-
+	autoload :Analyze, 'rex/pescan/analyze'
+	autoload :Scanner, 'rex/pescan/scanner'
+	autoload :Search,  'rex/pescan/search'
 end
 end
-
-require 'rex/pescan/analyze'
-require 'rex/pescan/scanner'
-require 'rex/pescan/search'

data/lib/rex/platforms.rb

@@ -1 +1,11 @@
-require 'rex/platforms/windows'
+##
+# $Id: $
+#
+# This file maps Platforms for autoload
+##
+
+module Rex
+module Platforms
+	autoload :Windows, 'rex/platforms/windows'
+end
+end

data/lib/rex/post/meterpreter/extensions/stdapi/railgun/api_constants.rb.ut.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..','..','..','..','..', 'lib'))
+$:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..','..','..','..'))
 
 require 'rex/post/meterpreter/extensions/stdapi/railgun/api_constants'
 require 'rex/post/meterpreter/extensions/stdapi/railgun/win_const_manager'

data/lib/rex/proto.rb

@@ -1,13 +1,24 @@
-require 'rex/proto/http'
-require 'rex/proto/smb'
-require 'rex/proto/ntlm'
-require 'rex/proto/dcerpc'
-require 'rex/proto/drda'
+##
+# $Id: proto.rb 12554 2011-05-06 18:47:10Z jduck $
+#
+# This file maps Proto items for autoload
+##
 
 module Rex
 module Proto
 
-attr_accessor :alias
+	autoload :Http,   'rex/proto/http'
+	autoload :SMB,    'rex/proto/smb'
+	autoload :NTLM,   'rex/proto/ntlm'
+	autoload :DCERPC, 'rex/proto/dcerpc'
+	autoload :DRDA,   'rex/proto/drda'
+
+	autoload :SunRPC, 'rex/proto/sunrpc'
+	autoload :DHCP,   'rex/proto/dhcp'
+	autoload :TFTP,   'rex/proto/tftp'
+	autoload :RFB,    'rex/proto/rfb'
+
+	attr_accessor :alias
 
 end
 end

data/lib/rex/proto/dcerpc.rb

@@ -1,6 +1,15 @@
-require 'rex/proto/dcerpc/uuid'
-require 'rex/proto/dcerpc/response'
-require 'rex/proto/dcerpc/client'
-require 'rex/proto/dcerpc/packet'
-require 'rex/proto/dcerpc/handle'
-require 'rex/proto/dcerpc/ndr'
+module Rex
+module Proto
+module DCERPC
+
+	autoload :Exceptions, 'rex/proto/dcerpc/exceptions'
+	autoload :UUID,       'rex/proto/dcerpc/uuid'
+	autoload :Response,   'rex/proto/dcerpc/response'
+	autoload :Client,     'rex/proto/dcerpc/client'
+	autoload :Packet,     'rex/proto/dcerpc/packet'
+	autoload :Handle,     'rex/proto/dcerpc/handle'
+	autoload :NDR,        'rex/proto/dcerpc/ndr'
+
+end
+end
+end

data/lib/rex/proto/drda.rb

@@ -1,5 +1,10 @@
-require 'rex/proto/drda/constants'
-require 'rex/proto/drda/packet'
-require 'rex/proto/drda/utils'
-
+module Rex
+module Proto
+module DRDA
+	autoload :Constants, 'rex/proto/drda/constants'
+	autoload :Utils,     'rex/proto/drda/utils'
+end
+end
+end
 
+require 'rex/proto/drda/packet'

data/lib/rex/proto/http.rb

@@ -1,5 +1,18 @@
+# These are required by all uses of Rex::Proto::Http
 require 'rex/proto/http/packet'
 require 'rex/proto/http/request'
 require 'rex/proto/http/response'
-require 'rex/proto/http/client'
-require 'rex/proto/http/server'
+
+# These are specific to use case
+module Rex
+module Proto
+module Http
+
+	autoload :Client, 'rex/proto/http/client'
+
+	autoload :Server,  'rex/proto/http/server'
+	autoload :Handler, 'rex/proto/http/handler'
+
+end
+end
+end

data/lib/rex/proto/http/packet.rb

@@ -1,4 +1,5 @@
 require 'rex/proto/http'
+require 'rex/text'
 
 module Rex
 module Proto

data/lib/rex/proto/ntlm.rb

@@ -1,7 +1,13 @@
-require 'rex/proto/ntlm/constants'
-require 'rex/proto/ntlm/exceptions'
-require 'rex/proto/ntlm/crypt'
-require 'rex/proto/ntlm/utils'
-require 'rex/proto/ntlm/base'
-require 'rex/proto/ntlm/message'
+module Rex
+module Proto
+module NTLM
+	autoload :Constants,  'rex/proto/ntlm/constants'
+	autoload :Exceptions, 'rex/proto/ntlm/exceptions'
 
+	autoload :Base,       'rex/proto/ntlm/base'
+	autoload :Crypt,      'rex/proto/ntlm/crypt'
+	autoload :Message,    'rex/proto/ntlm/message'
+	autoload :Utils,      'rex/proto/ntlm/utils'
+end
+end
+end

data/lib/rex/proto/ntlm.rb.ut.rb

@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
+
+$:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
+
 require 'test/unit'
 require 'rex/proto/ntlm'
 require 'rex/socket'

data/lib/rex/proto/ntlm/message.rb

@@ -45,6 +45,8 @@
 
 #this module defines the message class , useful for easily handling type 1/2/3 ntlm messages
 
+require 'rex/text'
+
 require 'rex/proto/ntlm/base'
 require 'rex/proto/ntlm/constants'
 require 'rex/proto/ntlm/crypt'

data/lib/rex/proto/rfb.rb.ut.rb

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

data/lib/rex/proto/smb.rb

@@ -1,7 +1,15 @@
-require 'rex/proto/smb/constants'
-require 'rex/proto/smb/exceptions'
-require 'rex/proto/smb/evasions'
-require 'rex/proto/smb/crypt'
-require 'rex/proto/smb/utils'
-require 'rex/proto/smb/client'
-require 'rex/proto/smb/simpleclient'
+module Rex
+module Proto
+module SMB
+
+	autoload :Constants,    'rex/proto/smb/constants'
+	autoload :Exceptions,   'rex/proto/smb/exceptions'
+	autoload :Evasions,     'rex/proto/smb/evasions'
+	autoload :Crypt,        'rex/proto/smb/crypt'
+	autoload :Utils,        'rex/proto/smb/utils'
+	autoload :Client,       'rex/proto/smb/client'
+	autoload :SimpleClient, 'rex/proto/smb/simpleclient'
+
+end
+end
+end

data/lib/rex/service_manager.rb

@@ -1,6 +1,5 @@
 require 'singleton'
 require 'rex'
-require 'rex/service'
 
 module Rex
 

data/lib/rex/socket.rb

@@ -12,19 +12,23 @@ module Rex
 ###
 module Socket
 
-	module Comm
-	end
-
-	require 'rex/socket/parameters'
-	require 'rex/socket/tcp'
-	require 'rex/socket/tcp_server'
-
-	require 'rex/socket/comm'
-	require 'rex/socket/comm/local'
-
-	require 'rex/socket/switch_board'
-	require 'rex/socket/subnet_walker'
-	require 'rex/socket/range_walker'
+	# Plumbing / Aux
+	autoload :Parameters, 'rex/socket/parameters'
+	autoload :Comm,       'rex/socket/comm'
+
+	# Underlying protocol-specific
+	autoload :Ip,           'rex/socket/ip'
+	autoload :Udp,          'rex/socket/udp'
+	autoload :Tcp,          'rex/socket/tcp'
+	autoload :TcpServer,    'rex/socket/tcp_server'
+	autoload :SslTcp,       'rex/socket/ssl_tcp'
+	autoload :SslTcpServer, 'rex/socket/ssl_tcp_server'
+
+	# Utilities
+	autoload :SwitchBoard,  'rex/socket/switch_board'
+	autoload :SubnetWalker, 'rex/socket/subnet_walker'
+	autoload :Range,        'rex/socket/range_walker'
+	autoload :RangeWalker,  'rex/socket/range_walker'
 
 	##
 	#

data/lib/rex/socket/comm.rb

@@ -14,6 +14,8 @@ module Socket
 ###
 module Comm
 
+	autoload :Local, 'rex/socket/comm/local'
+
 	###
 	# 
 	# This mixin provides stubs for event notification handlers that can be

data/lib/rex/socket/comm/local.rb

@@ -1,10 +1,6 @@
-require 'singleton'
+require 'rex/compat'
 require 'rex/socket'
-require 'rex/socket/tcp'
-require 'rex/socket/ssl_tcp'
-require 'rex/socket/ssl_tcp_server'
-require 'rex/socket/udp'
-require 'rex/socket/ip'
+require 'singleton'
 require 'timeout'
 
 ###

data/lib/rex/socket/ssl_tcp.rb

@@ -144,7 +144,8 @@ begin
 
 		total_sent   = 0
 		total_length = buf.length
-		block_size   = 32768
+		block_size   = 16384
+		retry_time   = 0.5
 
 		begin
 			while( total_sent < total_length )
@@ -160,29 +161,35 @@ begin
 			end
 
 		rescue ::IOError, ::Errno::EPIPE
-			return nil if (fd.abortive_close == true)
+			return nil
 		
 		# Ruby 1.8.7 and 1.9.0/1.9.1 uses a standard Errno
 		rescue ::Errno::EAGAIN, ::Errno::EWOULDBLOCK
 			# Sleep for a half a second, or until we can write again
-			Rex::ThreadSafe.select( nil, [ self.sslsock ], nil, 0.5 )
+			Rex::ThreadSafe.select( nil, [ self.sslsock ], nil, retry_time )
 			# Decrement the block size to handle full sendQs better
 			block_size = 1024
 			# Try to write the data again
 			retry
-			
+		
 		# Ruby 1.9.2+ uses IO::WaitReadable/IO::WaitWritable	
 		rescue ::Exception => e
 			if ::IO.const_defined?('WaitReadable') and e.kind_of?(::IO::WaitReadable)
-				IO::select( [ self.sslsock ], nil, nil, 0.5 )
+				IO::select( [ self.sslsock ], nil, nil, retry_time )
 				retry
 			end
 					
 			if ::IO.const_defined?('WaitWritable') and e.kind_of?(::IO::WaitWritable)						
-				IO::select( nil, [ self.sslsock ], nil, 0.5 )
+				IO::select( nil, [ self.sslsock ], nil, retry_time )
 				retry
 			end
-				
+			
+			# Another form of SSL error, this is always fatal
+			if e.kind_of?(::OpenSSL::SSL::SSLError)
+				return nil
+			end
+			
+			# Bubble the event up to the caller otherwise
 			raise e
 		end
 
@@ -197,8 +204,8 @@ begin
 			length = 16384 unless length
 			begin
 				return sslsock.sysread(length)
-			rescue EOFError, ::Errno::EPIPE
-				raise EOFError
+			rescue ::IOError, ::Errno::EPIPE, ::OpenSSL::SSL::SSLError
+				return nil
 			end
 			return
 		end
@@ -210,13 +217,11 @@ begin
 				if( s == nil || s[0] == nil )
 					next
 				end						
-				buf = sslsock.read_nonblock( length ) 				
-				return buf if buf
-				raise ::EOFError
+				return sslsock.read_nonblock( length ) 				
 			end
 			
 		rescue ::IOError, ::Errno::EPIPE
-			return nil if (fd.abortive_close == true)
+			return nil
 
 		# Ruby 1.8.7 and 1.9.0/1.9.1 uses a standard Errno	
 		rescue ::Errno::EAGAIN, ::Errno::EWOULDBLOCK
@@ -238,6 +243,11 @@ begin
 				IO::select( nil, [ self.sslsock ], nil, 0.5 )
 				retry
 			end
+
+			# Another form of SSL error, this is always fatal
+			if e.kind_of?(::OpenSSL::SSL::SSLError)
+				return nil
+			end
 				
 			raise e
 		end
@@ -249,7 +259,7 @@ begin
 	# Closes the SSL socket.
 	#
 	def close
-		sslsock.close
+		sslsock.close rescue nil
 		super
 	end
 
@@ -281,7 +291,21 @@ begin
 	def cipher
 		sslsock.cipher if sslsock
 	end
+	
+	#
+	# Prevent a sysread from the bare socket
+	#
+	def sysread(*args)
+		raise RuntimeError, "Invalid sysread() call on SSL socket"
+	end
 
+	#
+	# Prevent a sysread from the bare socket
+	#
+	def syswrite(*args)
+		raise RuntimeError, "Invalid syswrite() call on SSL socket"
+	end
+	
 	attr_reader :peer_verified # :nodoc:
 	attr_accessor :sslsock, :sslctx # :nodoc:
 

data/lib/rex/socket/switch_board.rb

@@ -78,6 +78,7 @@ class SwitchBoard
 		if ret && comm.respond_to?(:routes) && comm.routes.kind_of?(Array)
 			comm.routes << "#{subnet}/#{mask}"
 		end
+		ret
 	end
 
 	#
@@ -89,6 +90,7 @@ class SwitchBoard
 		if ret && comm.respond_to?(:routes) && comm.routes.kind_of?(Array)
 			comm.routes.delete "#{subnet}/#{mask}"
 		end
+		ret
 	end
 
 	#
@@ -193,7 +195,9 @@ class SwitchBoard
 		# Remove each of the individual routes so the comms don't think they're
 		# still routing after a flush.
 		self.routes.each { |r|
-			r.comm.routes.delete("#{r.subnet}/#{r.netmask}")
+			if r.comm.respond_to? :routes
+				r.comm.routes.delete("#{r.subnet}/#{r.netmask}")
+			end
 		}
 		# Re-initialize to an empty array
 		self.routes = Array.new

data/lib/rex/socket/tcp_server.rb.ut.rb

@@ -31,9 +31,9 @@ class Rex::Socket::TcpServer::UnitTest < Test::Unit::TestCase
 
 			assert_equal(2, scli.put("Yo"), "scli: put Yo")
 			assert_equal("Yo", ccli.get(), "ccli: get Yo")
-			assert(scli.methods.include?('<<'))
-			assert(scli.methods.include?('>>'))
-			assert(scli.methods.include?('has_read_data?'))
+			assert(scli.methods.include?('<<'), "no << operator")
+			assert(scli.methods.include?('>>'), "no >> operator")
+			assert(scli.methods.include?('has_read_data?'), "no has_read_data?")
 			
 		ensure
 			ccli.close if (ccli)

data/lib/rex/sync.rb

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
-
-require 'rex/sync/thread_safe'
-require 'rex/sync/ref'
-require 'rex/sync/read_write_lock'
-require 'rex/sync/event'
+module Rex
+	autoload :ReadWriteLock, 'rex/sync/read_write_lock'
+	autoload :ThreadSafe,    'rex/sync/thread_safe'
+	autoload :Ref,           'rex/sync/ref'
+	autoload :Sync,          'rex/sync/event'
+end

data/lib/rex/ui.rb

@@ -3,19 +3,19 @@
 # wrappers of the rex library.
 #
 
-# General classes
-require 'rex/ui/output'
-require 'rex/ui/progress_tracker'
+require 'rex'
 
-# Text-based user interfaces
-require 'rex/ui/text/input'
-require 'rex/ui/text/shell'
-require 'rex/ui/text/dispatcher_shell'
-require 'rex/ui/text/irb_shell'
+module Rex
+module Ui
+	# General classes
+	autoload :Output,          'rex/ui/output'
+	autoload :ProgressTracker, 'rex/ui/progress_tracker'
 
-require 'rex/ui/text/color'
-require 'rex/ui/text/table'
+	# Text-based user interfaces
+	autoload :Text, 'rex/ui/text'
 
-# Ui subscriber
-require 'rex/ui/subscriber'
-require 'rex/ui/interactive'
+	# Ui subscriber
+	autoload :Subscriber,  'rex/ui/subscriber'
+	autoload :Interactive, 'rex/ui/interactive'
+end
+end

data/lib/rex/ui/text.rb

@@ -0,0 +1,17 @@
+module Rex
+module Ui
+module Text
+	autoload :Input,  'rex/ui/text/input'
+	autoload :Output, 'rex/ui/text/output'
+	autoload :Color,  'rex/ui/text/color'
+	autoload :Table,  'rex/ui/text/table'
+	
+	autoload :PseudoShell,     'rex/ui/text/shell'
+	autoload :Shell,           'rex/ui/text/shell'
+	autoload :DispatcherShell, 'rex/ui/text/dispatcher_shell'
+	autoload :IrbShell,        'rex/ui/text/irb_shell'
+
+	autoload :ProgressTracker, 'rex/ui/text/progress_tracker'
+end
+end
+end

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

@@ -13,10 +13,10 @@ module Text
 ###
 class Input
 
-	require 'rex/ui/text/input/stdio'
-	require 'rex/ui/text/input/readline'
-	require 'rex/ui/text/input/socket'
-	require 'rex/ui/text/color'
+	autoload :Buffer,   'rex/ui/text/color'
+	autoload :Stdio,    'rex/ui/text/input/stdio'
+	autoload :Readline, 'rex/ui/text/input/readline'
+	autoload :Socket,   'rex/ui/text/input/socket'
 
 	include Rex::Ui::Text::Color
 

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

@@ -14,7 +14,10 @@ require 'rex/io/stream_abstraction'
 class Input::Buffer < Rex::Ui::Text::Input
 
 	class BufferSock
-		include Rex::IO::StreamAbstraction
+		include Rex::IO::StreamAbstraction	
+		def write(buf, opts={})
+			syswrite(buf)
+		end
 	end
 
 	def initialize
@@ -30,10 +33,10 @@ class Input::Buffer < Rex::Ui::Text::Input
 		@sock.rsock.sysread(len)
 	end
 
-	def put(msg)
+	def put(msg, opts={})
 		@sock.lsock.write(msg)
 	end
-
+	
 	#
 	# Wait for a line of input to be read from a socket.
 	#

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

@@ -12,11 +12,10 @@ 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/color'
+	autoload :Stdio,  'rex/ui/text/output/stdio'
+	autoload :Socket, 'rex/ui/text/output/socket'
+	autoload :Buffer, 'rex/ui/text/output/buffer'
+	autoload :File,   'rex/ui/text/output/file'
 
 	include Rex::Ui::Text::Color
 

metadata

@@ -2,7 +2,7 @@
 name: librex
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors: 
 - Metasploit Development Team
@@ -11,11 +11,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -05:00
+date: 2011-05-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Rex provides a variety of classes useful for security testing and exploit development. Based on SVN Revision 12516
+description: Rex provides a variety of classes useful for security testing and exploit development. Based on SVN Revision 12559
 email: 
 - hdm@metasploit.com
 - jacob.hammack@hammackj.com
@@ -60,9 +60,11 @@ files:
 - lib/rex/encoder/xor/dword.rb
 - lib/rex/encoder/xor/dword_additive.rb
 - lib/rex/encoder/xor.rb
+- lib/rex/encoder.rb
 - lib/rex/encoders/xor_dword.rb
 - lib/rex/encoders/xor_dword_additive.rb
 - lib/rex/encoders/xor_dword_additive.rb.ut.rb
+- lib/rex/encoders.rb
 - lib/rex/encoding/xor/byte.rb
 - lib/rex/encoding/xor/byte.rb.ut.rb
 - lib/rex/encoding/xor/dword.rb
@@ -77,6 +79,7 @@ files:
 - lib/rex/encoding/xor/word.rb.ut.rb
 - lib/rex/encoding/xor.rb
 - lib/rex/encoding/xor.rb.ts.rb
+- lib/rex/encoding.rb
 - lib/rex/exceptions.rb
 - lib/rex/exceptions.rb.ut.rb
 - lib/rex/exploitation/cmdstager/base.rb
@@ -110,12 +113,14 @@ files:
 - lib/rex/io/stream.rb
 - lib/rex/io/stream_abstraction.rb
 - lib/rex/io/stream_server.rb
+- lib/rex/io.rb
 - lib/rex/job_container.rb
 - lib/rex/LICENSE
 - lib/rex/logging/log_dispatcher.rb
 - lib/rex/logging/log_sink.rb
 - lib/rex/logging/sinks/flatfile.rb
 - lib/rex/logging/sinks/stderr.rb
+- lib/rex/logging/sinks.rb
 - lib/rex/logging.rb
 - lib/rex/machparsey/exceptions.rb
 - lib/rex/machparsey/mach.rb
@@ -161,6 +166,7 @@ files:
 - lib/rex/parser/nexpose_xml.rb
 - lib/rex/parser/nmap_xml.rb
 - lib/rex/parser/retina_xml.rb
+- lib/rex/parser.rb
 - lib/rex/payloads/win32/common.rb
 - lib/rex/payloads/win32/kernel/common.rb
 - lib/rex/payloads/win32/kernel/migration.rb
@@ -454,6 +460,7 @@ files:
 - lib/rex/ui/text/shell.rb
 - lib/rex/ui/text/table.rb
 - lib/rex/ui/text/table.rb.ut.rb
+- lib/rex/ui/text.rb
 - lib/rex/ui.rb
 - lib/rex/zip/archive.rb
 - lib/rex/zip/blocks.rb