librex 0.0.65 → 0.0.66

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -61,4 +62,4 @@ class Rex::Socket::Tcp::UnitTest < Test::Unit::TestCase
 		end
 	end
 
-end
+end

data/lib/rex/socket/tcp_server.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/socket'
 require 'rex/socket/tcp'
 require 'rex/io/stream_server'

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -41,4 +42,4 @@ class Rex::Socket::TcpServer::UnitTest < Test::Unit::TestCase
 		end
 	end
 
-end
+end

data/lib/rex/socket/udp.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/socket'
 
 ###
@@ -101,7 +102,7 @@ module Rex::Socket::Udp
 		# Catch unconnected IPv6 sockets talking to IPv4 addresses
 		peer = Rex::Socket.resolv_nbo(peerhost)
 		if (peer.length == 4 and self.ipv == 6)
-			peerhost = Rex::Socket.getaddress(peerhost)
+			peerhost = Rex::Socket.getaddress(peerhost, true)
 			if peerhost[0,7].downcase != '::ffff:'
 				peerhost = '::ffff:' + peerhost
 			end

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -41,4 +42,4 @@ class Rex::Socket::Udp::UnitTest < Test::Unit::TestCase
 		end
 	end
 
-end
+end

data/lib/rex/struct2.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 # just a shim to load all of the Struct2 libraries
 
-require 'rex/struct2/c_struct_template'
+require 'rex/struct2/c_struct_template'

data/lib/rex/struct2/c_struct.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 # Rex::Struct2
 module Rex
@@ -178,4 +179,4 @@ end
 
 # end Rex::Struct2
 end
-end
+end

data/lib/rex/struct2/c_struct_template.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 # Rex::Struct2
 module Rex
@@ -36,4 +37,4 @@ end
 
 # end Rex::Struct2
 end
-end
+end

data/lib/rex/struct2/constant.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 # Rex::Struct2
 module Rex
@@ -23,4 +24,4 @@ end
 
 # end Rex::Struct2
 end
-end
+end

data/lib/rex/struct2/element.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 # Rex::Struct2
 module Rex
@@ -41,4 +42,4 @@ end
 
 # end Rex::Struct2
 end
-end
+end

data/lib/rex/struct2/generic.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 # Rex::Struct2
 module Rex

data/lib/rex/struct2/restraint.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 # Rex::Struct2
 module Rex
@@ -51,4 +52,4 @@ end
 
 # end Rex::Struct2
 end
-end
+end

data/lib/rex/struct2/s_string.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 # Rex::Struct2
 module Rex

data/lib/rex/struct2/s_struct.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 # Rex::Struct2
 module Rex

data/lib/rex/sync.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 require 'rex/sync/thread_safe'
 require 'rex/sync/ref'
 require 'rex/sync/read_write_lock'
-require 'rex/sync/event'
+require 'rex/sync/event'

data/lib/rex/sync/event.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'thread'
 
 module Rex

data/lib/rex/sync/read_write_lock.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'thread'
 
 module Rex

data/lib/rex/sync/ref.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'thread'
 
 module Rex
@@ -54,4 +55,4 @@ module Ref
 	end
 
 end
-end
+end

data/lib/rex/sync/thread_safe.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'timeout'
 
 module Rex
@@ -79,4 +80,4 @@ module ThreadSafe
 
 end
 
-end
+end

data/lib/rex/test.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'test/unit'
 
 # DEFAULTS
@@ -32,4 +33,4 @@ end
 Rex::Test.load()
 
 end
-end
+end

data/lib/rex/text.rb

@@ -1,10 +1,15 @@
+# -*- coding: binary -*-
 require 'digest/md5'
 require 'stringio'
 
 begin
+	old_verbose = $VERBOSE
+	$VERBOSE = nil
 	require 'iconv'
 	require 'zlib'
-rescue LoadError
+rescue ::LoadError
+ensure
+	$VERBOSE = old_verbose
 end
 
 module Rex
@@ -32,6 +37,7 @@ module Text
 	UpperAlpha   = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 	LowerAlpha   = "abcdefghijklmnopqrstuvwxyz"
 	Numerals     = "0123456789"
+	Base32       = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"
 	Alpha        = UpperAlpha + LowerAlpha
 	AlphaNumeric = Alpha + Numerals
 	HighAscii    = [*(0x80 .. 0xff)].pack("C*")
@@ -234,6 +240,15 @@ module Text
 		return buff
 	end
 
+	def self.to_octal(str, prefix = "\\")
+		octal = ""
+		str.each_byte { |b|
+			octal << "#{prefix}#{b.to_s 8}"
+		}
+
+		return octal
+	end
+
 	#
 	# Returns the hex version of the supplied string
 	#
@@ -474,28 +489,28 @@ module Text
 			return str.gsub(normal) { |s| Rex::Text.to_hex(s, '%') }
 		when 'hex-all'
 			return str.gsub(all) { |s| Rex::Text.to_hex(s, '%') }
-			when 'hex-random'
-				res = ''
-				str.each_byte do |c|
-					b = c.chr
-					res << ((rand(2) == 0) ?
-						b.gsub(all)   { |s| Rex::Text.to_hex(s, '%') } :
-						b.gsub(normal){ |s| Rex::Text.to_hex(s, '%') } )
-				end
-				return res
+		when 'hex-random'
+			res = ''
+			str.each_byte do |c|
+				b = c.chr
+				res << ((rand(2) == 0) ?
+					b.gsub(all)   { |s| Rex::Text.to_hex(s, '%') } :
+					b.gsub(normal){ |s| Rex::Text.to_hex(s, '%') } )
+			end
+			return res
 		when 'u-normal'
 			return str.gsub(normal) { |s| Rex::Text.to_hex(Rex::Text.to_unicode(s, 'uhwtfms'), '%u', 2) }
 		when 'u-all'
 			return str.gsub(all) { |s| Rex::Text.to_hex(Rex::Text.to_unicode(s, 'uhwtfms'), '%u', 2) }
-			when 'u-random'
-				res = ''
-				str.each_byte do |c|
-					b = c.chr
-					res << ((rand(2) == 0) ?
-						b.gsub(all)   { |s| Rex::Text.to_hex(Rex::Text.to_unicode(s, 'uhwtfms'), '%u', 2) } :
-						b.gsub(normal){ |s| Rex::Text.to_hex(Rex::Text.to_unicode(s, 'uhwtfms'), '%u', 2) } )
-				end
-				return res
+		when 'u-random'
+			res = ''
+			str.each_byte do |c|
+				b = c.chr
+				res << ((rand(2) == 0) ?
+					b.gsub(all)   { |s| Rex::Text.to_hex(Rex::Text.to_unicode(s, 'uhwtfms'), '%u', 2) } :
+					b.gsub(normal){ |s| Rex::Text.to_hex(Rex::Text.to_unicode(s, 'uhwtfms'), '%u', 2) } )
+			end
+			return res
 		when 'u-half'
 			return str.gsub(all) { |s| Rex::Text.to_hex(Rex::Text.to_unicode(s, 'uhwtfms-half'), '%u', 2) }
 		else
@@ -692,6 +707,83 @@ module Text
 	#
 	##
 
+	#
+	# Base32 code
+	#
+
+	# Based on --> https://github.com/stesla/base32
+
+	# Copyright (c) 2007-2011 Samuel Tesla
+
+	# Permission is hereby granted, free of charge, to any person obtaining a copy
+	# of this software and associated documentation files (the "Software"), to deal
+	# in the Software without restriction, including without limitation the rights
+	# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	# copies of the Software, and to permit persons to whom the Software is
+	# furnished to do so, subject to the following conditions:
+
+	# The above copyright notice and this permission notice shall be included in
+	# all copies or substantial portions of the Software.
+
+	# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	# THE SOFTWARE.
+
+
+	#
+	# Base32 encoder
+	#
+	def self.b32encode(bytes_in)
+		n = (bytes_in.length * 8.0 / 5.0).ceil
+		p = n < 8 ? 5 - (bytes_in.length * 8) % 5 : 0
+		c = bytes_in.inject(0) {|m,o| (m << 8) + o} << p
+		[(0..n-1).to_a.reverse.collect {|i| Base32[(c >> i * 5) & 0x1f].chr},
+		("=" * (8-n))]
+	end
+
+	def self.encode_base32(str)
+		bytes = str.bytes
+		result = ''
+		size= 5
+		while bytes.any? do
+			bytes.each_slice(size) do |a|
+			bytes_out = b32encode(a).flatten.join
+			result << bytes_out
+			bytes = bytes.drop(size)
+			end
+		end
+		return result
+	end
+
+	#
+	# Base32 decoder
+	#
+	def self.b32decode(bytes_in)
+		bytes = bytes_in.take_while {|c| c != 61} # strip padding
+		n = (bytes.length * 5.0 / 8.0).floor
+		p = bytes.length < 8 ? 5 - (n * 8) % 5 : 0
+		c = bytes.inject(0) {|m,o| (m << 5) + Base32.index(o.chr)} >> p
+		(0..n-1).to_a.reverse.collect {|i| ((c >> i * 8) & 0xff).chr}
+	end
+
+	def self.decode_base32(str)
+		bytes = str.bytes
+		result = ''
+		size= 8
+		while bytes.any? do
+			bytes.each_slice(size) do |a|
+			bytes_out = b32decode(a).flatten.join
+			result << bytes_out
+			bytes = bytes.drop(size)
+			end
+		end
+		return result
+	end
+
 	#
 	# Base64 encoder
 	#
@@ -827,6 +919,11 @@ module Text
 		rand_base(len, bad, *foo )
 	end
 
+	# Generate a random GUID, of the form {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}
+	def self.rand_guid
+		"{#{[8,4,4,4,12].map {|a| rand_text_hex(a) }.join("-")}}"
+	end
+
 	#
 	# Creates a pattern that can be used for offset calculation purposes.  This
 	# routine is capable of generating patterns using a supplied set and a
@@ -1214,6 +1311,26 @@ protected
 		@@codepage_map_cache = map
 	end
 
+	def self.checksum8(str)
+		str.unpack("C*").inject(:+) % 0x100
+	end
+
+	def self.checksum16_le(str)
+		str.unpack("v*").inject(:+) % 0x10000
+	end
+
+	def self.checksum16_be(str)
+		str.unpack("n*").inject(:+) % 0x10000
+	end
+
+	def self.checksum32_le(str)
+		str.unpack("V*").inject(:+) % 0x100000000
+	end
+
+	def self.checksum32_be(str)
+		str.unpack("N*").inject(:+) % 0x100000000
+	end
+
 end
 end
 

data/lib/rex/text.rb.ut.rb

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

data/lib/rex/thread_factory.rb

@@ -1,8 +1,9 @@
+# -*- coding: binary -*-
 module Rex
 
 ###
-# 
-# This class provides a wrapper around Thread.new that can provide 
+#
+# This class provides a wrapper around Thread.new that can provide
 # additional features if a corresponding thread provider is set.
 #
 ###
@@ -10,7 +11,7 @@ module Rex
 class ThreadFactory
 
 	@@provider = nil
-	
+
 	def self.provider=(val)
 		@@provider = val
 	end
@@ -35,7 +36,7 @@ class ThreadFactory
 			t[:tm_call] = caller
 			return t
 		end
-	
+
 	end
 end