librex 0.0.65 → 0.0.66

data/lib/rex/proto/dcerpc/packet.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -10,7 +11,7 @@ class Rex::Proto::DCERPC::Packet::UnitTest < Test::Unit::TestCase
 	Klass = Rex::Proto::DCERPC::Packet
 
 	def test_parse
-		
+
 		actual = Klass.make_bind('367abb81-9844-35f1-ad32-98f038001003', '2.0')
 		expected = ["\005\000\v\003\020\000\000\000H\000\000\000\000\000\000\000\320\026\320\026\000\000\000\000\001\000\000\000\000\000\001\000\201\273z6D\230\3615\2552\230\3608\000\020\003\002\000\000\000\004]\210\212\353\034\311\021\237\350\010\000+\020H`\002\000\000\000", 0]
 		assert_equal(expected, actual, 'bind')
@@ -23,34 +24,34 @@ class Rex::Proto::DCERPC::Packet::UnitTest < Test::Unit::TestCase
 		actual = Klass.make_alter_context('367abb81-9844-35f1-ad32-98f038001003', '2.0')
 		expected = "\005\000\016\003\020\000\000\000H\000\000\000\000\000\000\000\320\026\320\026\000\000\000\000\001\000\000\000\000\000\001\000\201\273z6D\230\3615\2552\230\3608\000\020\003\002\000\000\000\004]\210\212\353\034\311\021\237\350\010\000+\020H`\002\000\000\000"
 		assert_equal(expected, actual, 'alter context')
-	
+
 		actual = Klass.make_request(1337, '', 1024, 7331)
 		expected = ["\005\000\000\003\020\000\000\000\030\000\000\000\000\000\000\000\000\000\000\000\243\0349\005"]
 		assert_equal(expected, actual, 'make_request with no stub')
-		
+
 		actual = Klass.make_request(1337, 'ABCD', 1024, 7331)
 		expected = ["\005\000\000\003\020\000\000\000\034\000\000\000\000\000\000\000\004\000\000\000\243\0349\005ABCD"]
 		assert_equal(expected, actual, 'make_request with stub')
-		
+
 		actual = Klass.make_request(1337, 'ABCD', 3, 7331)
 		expected = ["\005\000\000\001\020\000\000\000\e\000\000\000\000\000\000\000\003\000\000\000\243\0349\005ABC", "\005\000\000\002\020\000\000\000\031\000\000\000\000\000\000\000\001\000\000\000\243\0349\005D"]
 		assert_equal(expected, actual, 'make_request with 2 frags')
-		
-		actual = Klass.make_request(1337, 'ABCD', 1, 7331)	
+
+		actual = Klass.make_request(1337, 'ABCD', 1, 7331)
 		expected = ["\005\000\000\001\020\000\000\000\031\000\000\000\000\000\000\000\001\000\000\000\243\0349\005A", "\005\000\000\000\020\000\000\000\031\000\000\000\000\000\000\000\001\000\000\000\243\0349\005B", "\005\000\000\000\020\000\000\000\031\000\000\000\000\000\000\000\001\000\000\000\243\0349\005C", "\005\000\000\002\020\000\000\000\031\000\000\000\000\000\000\000\001\000\000\000\243\0349\005D"]
 		assert_equal(expected, actual, 'make_request with 4 frags')
-		
-		
+
+
 		actual = Klass.make_request(1337, '', 1024, 7331, '367abb81-9844-35f1-ad32-98f038001003')
 		expected = ["\005\000\000\x83\020\000\000\000\030\000\000\000\000\000\000\000\000\000\000\000\243\0349\005\201\273z6D\230\3615\2552\230\3608\000\020\003"]
 		assert_equal(expected, actual, 'make_request with no stub, with object_id')
-		
+
 		actual = Klass.make_request(1337, 'ABCD', 1024, 7331, '367abb81-9844-35f1-ad32-98f038001003')
 		expected = ["\005\000\000\x83\020\000\000\000\034\000\000\000\000\000\000\000\004\000\000\000\243\0349\005\201\273z6D\230\3615\2552\230\3608\000\020\003ABCD"]
 		assert_equal(expected, actual, 'make_request with stub, with object_id')
-		
+
 		actual = Klass.make_request(1337, 'ABCD', 1, 7331, '367abb81-9844-35f1-ad32-98f038001003')
 		expected = ["\005\000\000\x81\020\000\000\000\031\000\000\000\000\000\000\000\001\000\000\000\243\0349\005\201\273z6D\230\3615\2552\230\3608\000\020\003A", "\005\000\000\x80\020\000\000\000\031\000\000\000\000\000\000\000\001\000\000\000\243\0349\005\201\273z6D\230\3615\2552\230\3608\000\020\003B", "\005\000\000\x80\020\000\000\000\031\000\000\000\000\000\000\000\001\000\000\000\243\0349\005\201\273z6D\230\3615\2552\230\3608\000\020\003C", "\005\000\000\x82\020\000\000\000\031\000\000\000\000\000\000\000\001\000\000\000\243\0349\005\201\273z6D\230\3615\2552\230\3608\000\020\003D"]
 		assert_equal(expected, actual, 'make_request with 4 frags')
 	end
-end
+end

data/lib/rex/proto/dcerpc/response.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/proto/dcerpc/uuid'
 require 'rex/proto/dcerpc/exceptions'
 

data/lib/rex/proto/dcerpc/response.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -12,4 +13,4 @@ class Rex::Proto::DCERPC::Response::UnitTest < Test::Unit::TestCase
 	def test_parse
 
 	end
-end
+end

data/lib/rex/proto/dcerpc/uuid.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 module Rex
 module Proto
 module DCERPC
@@ -18,7 +19,7 @@ class UUID
 		'PNP'       => [ '8d9f4e40-a03d-11ce-8f69-08003e30051b', '1.0' ]
 	}
 
-	# Convert a UUID in binary format to the string representation	
+	# Convert a UUID in binary format to the string representation
 	def self.uuid_unpack(uuid_bin)
 		raise ArgumentError if uuid_bin.length != 16
 		sprintf("%.8x-%.4x-%.4x-%.4x-%s",
@@ -27,7 +28,7 @@ class UUID
 			uuid_bin[ 6, 2].unpack('v')[0],
 			uuid_bin[ 8, 2].unpack('n')[0],
 			uuid_bin[10, 6].unpack('H*')[0]
-		)	
+		)
 	end
 
 	# Validate a text based UUID
@@ -46,39 +47,39 @@ class UUID
 		parts = uuid_str.split('-')
 		[ parts[0].hex, parts[1].hex, parts[2].hex, parts[3].hex ].pack('Vvvn') + [ parts[4] ].pack('H*')
 	end
-	
+
 	# Provide the common TransferSyntax UUID in packed format
 	def self.xfer_syntax_uuid ()
 		self.uuid_pack('8a885d04-1ceb-11c9-9fe8-08002b104860')
 	end
-	
+
 	# Provide the common TransferSyntax version number
 	def self.xfer_syntax_vers ()
 		'2.0'
 	end
-	
-	# Determine the UUID string for the DCERPC service with this name	
-	def self.uuid_by_name (name) 
+
+	# Determine the UUID string for the DCERPC service with this name
+	def self.uuid_by_name (name)
 		if @@known_uuids.key?(name)
 			@@known_uuids[name][0]
 		end
 	end
-	
+
 	# Determine the common version number for the DCERPC service with this name
 	def self.vers_by_name (name)
 		if @@known_uuids.key?(name)
 			@@known_uuids[name][1]
 		end
 	end
-	
+
 	# Convert a string or number in float format to two unique numbers 2.0 => [2, 0]
-	def self.vers_to_nums (vers) 
+	def self.vers_to_nums (vers)
 		vers_maj = vers.to_i
 		vers_min = ((vers.to_f - vers.to_i) * 10).to_i
 		return vers_maj, vers_min
 	end
-	
+
+end
 end
 end
 end
-end

data/lib/rex/proto/dcerpc/uuid.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -43,4 +44,4 @@ class Rex::Proto::DCERPC::UUID::UnitTest < Test::Unit::TestCase
 		assert_equal(Klass.vers_to_nums('2.0'), [2, 0], 'vers_to_nums')
 		assert_equal(Klass.vers_to_nums('2'), [2, 0], 'vers_to_nums (short)')
 	end
-end
+end

data/lib/rex/proto/dhcp.rb

@@ -1,4 +1,5 @@
-# $Id: dhcp.rb 12196 2011-04-01 00:51:33Z egypt $
+# -*- coding: binary -*-
+# $Id: dhcp.rb 15548 2012-06-29 06:08:20Z rapid7 $
 #
 # DHCP Server support written by scriptjunkie
 #

data/lib/rex/proto/dhcp/constants.rb

@@ -1,4 +1,5 @@
-# $Id: constants.rb 12375 2011-04-20 14:21:36Z jduck $
+# -*- coding: binary -*-
+# $Id: constants.rb 15548 2012-06-29 06:08:20Z rapid7 $
 require 'rex/proto/dhcp'
 
 module Rex

data/lib/rex/proto/dhcp/server.rb

@@ -1,4 +1,5 @@
-# $Id: server.rb 13779 2011-09-23 15:12:19Z scriptjunkie $
+# -*- coding: binary -*-
+# $Id: server.rb 15548 2012-06-29 06:08:20Z rapid7 $
 
 require 'rex/socket'
 require 'rex/proto/dhcp'
@@ -87,7 +88,7 @@ class Server
 				self.served_over = hash['HOSTSTART'].to_i
 			end
 		end
-		
+
 		self.leasetime = 600
 		self.relayip = "\x00\x00\x00\x00" # relay ip - not currently suported
 		self.pxeconfigfile = "update2"
@@ -268,7 +269,7 @@ protected
 		if messageType == DHCPDiscover  #DHCP Discover - send DHCP Offer
 			pkt << [DHCPOffer].pack('C')
 			# check if already served an Ack based on hw addr (MAC address)
-			# if serveOnce & PXE, don't reply to another PXE request 
+			# if serveOnce & PXE, don't reply to another PXE request
 			# if serveOnce & ! PXE, don't reply to anything
 			if self.serveOnce == true and self.served.has_key?(buf[28..43]) and
 					self.served[buf[28..43]][1] and (pxeclient == false or self.servePXE == false)

data/lib/rex/proto/drda.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/proto/drda/constants'
 require 'rex/proto/drda/packet'
 require 'rex/proto/drda/utils'

data/lib/rex/proto/drda.rb.ts.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/test'
 

data/lib/rex/proto/drda/constants.rb

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

data/lib/rex/proto/drda/constants.rb.ut.rb

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

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

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/proto/drda'
 
 module Rex
@@ -8,12 +9,12 @@ class Error < StandardError; end
 class RespError < Error; end
 
 # See:
-# http://publib.boulder.ibm.com/infocenter/dzichelp/v2r2/index.jsp?topic=/com.ibm.db29.doc.drda/db2z_excsat.htm 
+# http://publib.boulder.ibm.com/infocenter/dzichelp/v2r2/index.jsp?topic=/com.ibm.db29.doc.drda/db2z_excsat.htm
 class MGRLVLLS_PARAM < Struct.new(:length, :codepoint, :payload)
 	def initialize(args={})
 		self[:codepoint] = Constants::MGRLVLLS
 		self[:payload] = "\x14\x03\x00\x0a\x24\x07\x00\x0a" +
-			"\x14\x74\x00\x05\x24\x0f\x00\x08" + 
+			"\x14\x74\x00\x05\x24\x0f\x00\x08" +
 			"\x14\x40\x00\x09\x1c\x08\x04\xb8"
 		self[:length] = self[:payload].to_s.size+4
 	end
@@ -22,10 +23,10 @@ class MGRLVLLS_PARAM < Struct.new(:length, :codepoint, :payload)
 	end
 end
 
-# Currently, only takes a MGRLVLLS param. Extend the struct 
+# Currently, only takes a MGRLVLLS param. Extend the struct
 # when more parameters are defined.
 class EXCSAT_DDM < Struct.new(:length, :magic, :format, :correlid, :length2,
-	 :codepoint, :mgrlvlls) 
+	 :codepoint, :mgrlvlls)
 
 	def initialize(args={})
 		self[:magic] = 0xd0
@@ -34,7 +35,7 @@ class EXCSAT_DDM < Struct.new(:length, :magic, :format, :correlid, :length2,
 		self[:codepoint] = Constants::EXCSAT
 		self[:mgrlvlls] = args[:mgrlvlls] || MGRLVLLS_PARAM.new.to_s
 		self[:length] = (10 + self[:mgrlvlls].to_s.size)
-		self[:length2] = self[:length]-6 
+		self[:length2] = self[:length]-6
 	end
 
 	def to_s
@@ -57,7 +58,7 @@ class SECMEC_PARAM < Struct.new(:length, :codepoint, :payload)
 	end
 end
 
-# Relational Database name parameter. 
+# Relational Database name parameter.
 class RDBNAM_PARAM < Struct.new(:length, :codepoint, :payload)
 	def initialize(args={})
 		self[:length] = 22 # Since the database name is padded out.
@@ -95,7 +96,7 @@ class ACCSEC_DDM < Struct.new(:length, :magic, :format, :correlid, :length2,
 			self[:rdbnam] = RDBNAM_PARAM.new(:payload => args[:dbname]).to_s
 		end
 		self[:length] =  10 + self[:secmec].to_s.size + self[:rdbnam].to_s.size
-		self[:length2] = self[:length]-6 
+		self[:length2] = self[:length]-6
 	end
 	def dbname=(str)
 		self[:rdbnam] = RDBNAM_PARAM.new(:payload => args[:dbname]).to_s
@@ -143,7 +144,7 @@ class BASIC_DDM < Struct.new(:length, :magic, :format, :correlid,
 		rest = str[10,self[:length2]-4]
 		i = 0
 		while (i < rest.size)
-			if self[:codepoint] == Constants::SQLCARD # These aren't DDM's. 
+			if self[:codepoint] == Constants::SQLCARD # These aren't DDM's.
 				this_param = rest[i,self[:length]-10]
 			else
 				this_param = DDM_PARAM.new.read(rest[i,rest.size])
@@ -154,7 +155,7 @@ class BASIC_DDM < Struct.new(:length, :magic, :format, :correlid,
 		return self
 	end
 
-	# Just a quick test. 
+	# Just a quick test.
 	def sanity_check
 		if self[:length] < 10
 			raise DRDA::RespError, "DDM Length is too short."
@@ -233,7 +234,7 @@ class SECCHK_DDM < Struct.new(:length, :magic, :format, :correlid, :length2,
 		self[:userid] = USERID_PARAM.new(:payload => args[:dbuser]).to_s
 		self[:length] = ( 10 + self[:secmec].to_s.size + self[:rdbnam].to_s.size +
 					 self[:password].to_s.size + self[:userid].to_s.size )
-		self[:length2] = self[:length]-6 
+		self[:length2] = self[:length]-6
 	end
 	def dbname=(str)
 		self[:rdbnam] = RDBNAM_PARAM.new(:payload => args[:dbname]).to_s

data/lib/rex/proto/drda/packet.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -6,7 +7,7 @@ require 'rex/test'
 require 'rex/proto/drda/packet'
 
 class Rex::Proto::DRDA::UnitTest < Test::Unit::TestCase
-	
+
 	Klass = Rex::Proto::DRDA
 	Konst = Rex::Proto::DRDA::Constants
 
@@ -24,7 +25,7 @@ class Rex::Proto::DRDA::UnitTest < Test::Unit::TestCase
 		assert_equal Konst::SECCHK, d.codepoint
 	end
 
-	# All parameter names should have a corresponding codepoint, 
+	# All parameter names should have a corresponding codepoint,
 	# except "DDM_PARAM" (a generic parameter).
 	def test_all_param_codepoints
 		params = Klass.constants.map {|x| x if x =~ /PARAM$/}.compact
@@ -67,7 +68,7 @@ class Rex::Proto::DRDA::UnitTest < Test::Unit::TestCase
 		ddms = Klass.constants.map {|x| x if x =~ /DDM$/}.compact
 		ddms.each do |d|
 			obj = Klass.const_get(d).new
-			assert_operator obj.size, :>=, 7 
+			assert_operator obj.size, :>=, 7
 			assert_respond_to obj, :length
 			assert_respond_to obj, :magic
 			assert_respond_to obj, :format
@@ -99,7 +100,7 @@ class Rex::Proto::DRDA::UnitTest < Test::Unit::TestCase
 		assert_equal Konst::SECCHKRM, s[0].codepoint
 		assert_equal Konst::ACCRDBRM, s[1].codepoint
 		assert_equal Konst::SQLCARD, s[2].codepoint
-		assert_equal 0xd0, s[0].magic 
+		assert_equal 0xd0, s[0].magic
 		assert_equal 0x52, s[1].format
 		assert_equal 134, s[2].length2
 		assert_equal 21+80+140, s.sz

data/lib/rex/proto/drda/utils.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/proto/drda'
 
 module Rex
@@ -43,7 +44,7 @@ class Utils
 				info_hash.merge!(_info_secchkrm(ddm))
 			else
 				next
-			end 
+			end
 		end
 		return info_hash
 	end
@@ -62,7 +63,7 @@ class Utils
 				next
 			end
 		end
-	 return info_hash	
+		return info_hash
 	end
 
 	def self._info_accsecrd(ddm)
@@ -74,7 +75,7 @@ class Utils
 			when Constants::SECCHKCD
 				info_hash[:security_check_code] = param.payload.unpack("C").first
 				# A little spurious? This is always nonzero when there's no SECCHKRM DDM.
-				info_hash[:db_login_success] = false unless info_hash[:security_check_code].zero? 
+				info_hash[:db_login_success] = false unless info_hash[:security_check_code].zero?
 			else
 				next
 			end

data/lib/rex/proto/drda/utils.rb.ut.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
@@ -33,7 +34,7 @@ class Rex::Proto::DRDA::Utils::UnitTest < Test::Unit::TestCase
 		begin
 			Timeout.timeout($_REX_TEST_TIMEOUT) do
 				socket = Rex::Socket.create_tcp(
-					'PeerHost' => $_REX_TEST_DRDA_HOST.to_s, 
+					'PeerHost' => $_REX_TEST_DRDA_HOST.to_s,
 					'PeerPort' => 50000
 				)
 				sent = socket.put probe_pkt
@@ -62,7 +63,7 @@ class Rex::Proto::DRDA::Utils::UnitTest < Test::Unit::TestCase
 		begin
 			Timeout.timeout($_REX_TEST_TIMEOUT) do
 				socket = Rex::Socket.create_tcp(
-					'PeerHost' => $_REX_TEST_DRDA_HOST.to_s, 
+					'PeerHost' => $_REX_TEST_DRDA_HOST.to_s,
 					'PeerPort' => 50000
 				)
 				sent = socket.put probe_pkt

data/lib/rex/proto/http.rb

@@ -1,5 +1,6 @@
+# -*- coding: binary -*-
 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'
+require 'rex/proto/http/server'

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'test/unit'
 
@@ -9,4 +10,4 @@ require 'rex/proto/http/header.rb.ut'
 require 'rex/proto/http/request.rb.ut'
 require 'rex/proto/http/response.rb.ut'
 require 'rex/proto/http/handler/erb.rb.ut'
-require 'rex/proto/http/handler/proc.rb.ut'
+require 'rex/proto/http/handler/proc.rb.ut'

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

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/socket'
 require 'rex/proto/http'
 require 'rex/text'
@@ -9,8 +10,8 @@ module Http
 ###
 #
 # Acts as a client to an HTTP server, sending requests and receiving responses.
-# 
-# See the RFC: http://www.w3.org/Protocols/rfc2616/rfc2616.html 
+#
+# See the RFC: http://www.w3.org/Protocols/rfc2616/rfc2616.html
 #
 ###
 class Client
@@ -99,16 +100,22 @@ class Client
 	#
 	def set_config(opts = {})
 		opts.each_pair do |var,val|
+			# Default type is string
 			typ = self.config_types[var] || 'string'
 
+			# These are enum types
 			if(typ.class.to_s == 'Array')
 				if not typ.include?(val)
 					raise RuntimeError, "The specified value for #{var} is not one of the valid choices"
 				end
 			end
 
+			# The caller should have converted these to proper ruby types, but
+			# take care of the case where they didn't before setting the
+			# config.
+
 			if(typ == 'bool')
-				val = (val =~ /^(t|y|1)$/i ? true : false)
+				val = (val =~ /^(t|y|1)$/i ? true : false || val === true)
 			end
 
 			if(typ == 'integer')
@@ -139,6 +146,11 @@ class Client
 		c_conn = opts['connection']
 		c_auth = opts['basic_auth'] || config['basic_auth'] || ''
 
+		# An agent parameter was specified, but so was a header, prefer the header
+		if c_ag and c_head.keys.map{|x| x.downcase }.include?('user-agent')
+			c_ag = nil
+		end
+		
 		uri    = set_uri(c_uri)
 
 		req = ''
@@ -158,6 +170,7 @@ class Client
 		req << set_host_header(c_host)
 		req << set_agent_header(c_ag)
 
+
 		if (c_auth.length > 0)
 			req << set_basic_auth_header(c_auth)
 		end
@@ -373,7 +386,7 @@ class Client
 
 					buff = conn.get_once(-1, 1)
 					rv   = resp.parse( buff || '' )
-		
+
 				##########################################################################
 				# XXX: NOTE: BUG: get_once currently (as of r10042) rescues "Exception"
 				# As such, the following rescue block will ever be reached.  -jjd
@@ -678,9 +691,20 @@ class Client
 	#
 	# Return the HTTP Host header
 	#
-	def set_host_header(host)
+	def set_host_header(host=nil)
 		return "" if self.config['uri_full_url']
 		host ||= self.config['vhost']
+
+		# IPv6 addresses must be placed in brackets
+		if Rex::Socket.is_ipv6?(host)
+			host = "[#{host}]"
+		end
+
+		# The port should be appended if non-standard
+		if not [80,443].include?(self.port)
+			host = host + ":#{port}"
+		end
+
 		set_formatted_header("Host", host)
 	end