librex 0.0.65 → 0.0.66

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

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

data/lib/rex/socket/ip.rb

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

data/lib/rex/socket/parameters.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/socket'
 
 ###
@@ -62,7 +63,7 @@ class Rex::Socket::Parameters
 	# SSLVersion
 	#
 	# 	Specify SSL2, SSL3, or TLS1 (SSL3 is default)
-	#	
+	#
 	# SSLCert
 	#
 	# 	A file containing an SSL certificate (for server sockets)
@@ -97,7 +98,7 @@ class Rex::Socket::Parameters
 	#
 	# 	The number of seconds before a connection should time out
 	#
-	
+
 	def initialize(hash)
 		if (hash['PeerHost'])
 			self.peerhost = hash['PeerHost']
@@ -138,11 +139,11 @@ class Rex::Socket::Parameters
 		else
 			self.ssl = false
 		end
-		
+
 		if (hash['SSLVersion'] and hash['SSLVersion'].to_s =~ /^(SSL2|SSL3|TLS1)$/i)
 			self.ssl_version = hash['SSLVersion']
 		end
-		
+
 		if (hash['SSLCert'] and ::File.file?(hash['SSLCert']))
 			begin
 				self.ssl_cert = ::File.read(hash['SSLCert'])
@@ -150,11 +151,11 @@ class Rex::Socket::Parameters
 				elog("Failed to read cert: #{e.class}: #{e}", LogSource)
 			end
 		end
-		
-		if hash['Proxies']	
+
+		if hash['Proxies']
 			self.proxies = hash['Proxies'].split('-').map{|a| a.strip}.map{|a| a.split(':').map{|b| b.strip}}
 		end
-		
+
 		# The protocol this socket will be using
 		if (hash['Proto'])
 			self.proto = hash['Proto'].downcase
@@ -170,7 +171,7 @@ class Rex::Socket::Parameters
 
 		# The context that was passed in, if any.
 		self.context   = hash['Context'] || {}
-		
+
 		# If no comm was supplied, try to use the comm that is best fit to
 		# handle the provided host based on the current routing table.
 		if( self.server )
@@ -185,13 +186,13 @@ class Rex::Socket::Parameters
 
 		# If we still haven't found a comm, we default to the local comm.
 		self.comm      = Rex::Socket::Comm::Local if (self.comm == nil)
-		
-		# If we are a UDP server, turn off the server flag as it was only set when 
+
+		# If we are a UDP server, turn off the server flag as it was only set when
 		# creating the UDP socket in order to avail of the switch board above.
 		if( self.server and self.proto == 'udp' )
 			self.server = false
 		end
-		
+
 		# The number of connection retries to make (client only)
 		if hash['Retries']
 			self.retries = hash['Retries'].to_i
@@ -205,7 +206,7 @@ class Rex::Socket::Parameters
 		else
 			self.timeout = 5
 		end
-	
+
 		# Whether to force IPv6 addressing
 		self.v6        = hash['IPv6'] || false
 	end
@@ -250,7 +251,7 @@ class Rex::Socket::Parameters
 	def ip?
 		return (proto == 'ip')
 	end
-	
+
 	#
 	# Returns true if the socket is a bare socket that does not inherit from
 	# any extended Rex classes.
@@ -354,7 +355,7 @@ class Rex::Socket::Parameters
 	# Synonyms
 	#
 	##
-	
+
 	alias peeraddr  peerhost
 	alias localaddr localhost
 

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -48,4 +49,4 @@ class Rex::Socket::Parameters::UnitTest < Test::Unit::TestCase
 		assert_equal(false, p.ssl, "default false ssl")
 	end
 
-end
+end

data/lib/rex/socket/range_walker.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/socket'
 
 module Rex
@@ -53,7 +54,40 @@ class RangeWalker
 		return nil if not parseme
 		ranges = []
 		parseme.split(', ').map{ |a| a.split(' ') }.flatten.each { |arg|
-			if arg.include?("/")
+			opts = {}
+
+			# Handle IPv6 first (support ranges, but not CIDR)
+			if arg.include?(":")
+				addrs = arg.split('-', 2)
+
+				# Handle a single address
+				if addrs.length == 1
+					addr, scope_id = addrs[0].split('%')
+					opts[:scope_id] = scope_id if scope_id
+
+					return false unless Rex::Socket.is_ipv6?(addr)
+					addr = Rex::Socket.addr_atoi(addr)
+					ranges.push [addr, addr, true, opts]
+					next
+				end
+
+				addr1, scope_id = addrs[0].split('%')
+				opts[:scope_id] = scope_id if scope_id
+
+				addr2, scope_id = addrs[0].split('%')
+				( opts[:scope_id] ||= scope_id ) if scope_id
+
+				return false if not (Rex::Socket.is_ipv6?(addr1) and Rex::Socket.is_ipv6?(addr2))
+
+				# Handle IPv6 ranges in the form of 2001::1-2001::10
+				addr1 = Rex::Socket.addr_atoi(addr1)
+				addr2 = Rex::Socket.addr_atoi(addr2)
+
+				ranges.push [addr1, addr2, true, opts]
+				next
+
+			# Handle IPv4 CIDR
+			elsif arg.include?("/")
 				# Then it's CIDR notation and needs special case
 				return false if arg =~ /[,-]/ # Improper CIDR notation (can't mix with 1,3 or 1-3 style IP ranges)
 				return false if arg.scan("/").size > 1 # ..but there are too many slashes
@@ -69,40 +103,40 @@ class RangeWalker
 
 				expanded = expand_cidr(arg)
 				if expanded
-					ranges += expanded
+					ranges.push(expanded)
 				else
 					return false
 				end
-			elsif arg.include?(":")
-				# Then it's IPv6
-				# Can't really do much with IPv6 right now, just return it and
-				# hope for the best
-				addr = Rex::Socket.addr_atoi(arg)
-				ranges.push [addr, addr, true]
+
+			# Handle hostnames
 			elsif arg =~ /[^-0-9,.*]/
 				# Then it's a domain name and we should send it on to addr_atoi
 				# unmolested to force a DNS lookup.
-				Rex::Socket.addr_atoi_list(arg).each { |addr| ranges.push [addr, addr] }
+				Rex::Socket.addr_atoi_list(arg).each { |addr| ranges.push [addr, addr, false, opts] }
+
+			# Handle IPv4 ranges
 			elsif arg =~ /^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})-([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})$/
 				# Then it's in the format of 1.2.3.4-5.6.7.8
 				# Note, this will /not/ deal with DNS names, or the fancy/obscure 10...1-10...2
-				begin 
+				begin
 					addrs = [Rex::Socket.addr_atoi($1), Rex::Socket.addr_atoi($2)]
 					return false if addrs[0] > addrs[1] # The end is greater than the beginning.
-					ranges.push [addrs[0], addrs[1]]
+					ranges.push [addrs[0], addrs[1], false, opts]
 				rescue Resolv::ResolvError # Something's broken, forget it.
 					return false
 				end
 			else
+				# Returns an array of ranges
 				expanded = expand_nmap(arg)
 				if expanded
-					ranges += expanded
-				else
-					return false
+					expanded.each { |r| ranges.push(r) }
 				end
 			end
 		}
 
+		# Remove any duplicate ranges
+		ranges = ranges.uniq
+
 		return ranges
 	end
 
@@ -113,7 +147,6 @@ class RangeWalker
 		return false if not valid?
 		@curr_range = 0
 		@curr_addr = @ranges[0][0]
-
 		@length = 0
 		@ranges.each { |r| @length += r[1] - r[0] + 1 }
 	end
@@ -131,6 +164,11 @@ class RangeWalker
 			@curr_addr = @ranges[@curr_range][0]
 		end
 		addr = Rex::Socket.addr_itoa(@curr_addr, @ranges[@curr_range][2])
+
+		if @ranges[@curr_range][3][:scope_id]
+			addr = addr + '%' + @ranges[@curr_range][3][:scope_id]
+		end
+
 		@curr_addr += 1
 		return addr
 	end
@@ -139,7 +177,7 @@ class RangeWalker
 		(@ranges and not @ranges.empty?)
 	end
 
-	# 
+	#
 	# Returns true if the argument is an ip address that falls within any of
 	# the stored ranges.
 	#
@@ -148,7 +186,7 @@ class RangeWalker
 		if (addr.is_a? String)
 			addr = Rex::Socket.addr_atoi(addr)
 		end
-		@ranges.map { |r| 
+		@ranges.map { |r|
 			if r[0] <= addr and addr <= r[1]
 				return true
 			end
@@ -158,7 +196,7 @@ class RangeWalker
 
 	#
 	# Returns true if this RangeWalker includes all of the addresses in the
-	# given RangeWalker 
+	# given RangeWalker
 	#
 	def include_range?(range_walker)
 		return false if ((not @ranges) or @ranges.empty?)
@@ -172,7 +210,7 @@ class RangeWalker
 		end
 	end
 
-	# 
+	#
 	# Calls the given block with each address. This is basically a wrapper for
 	# #next_ip
 	#
@@ -195,8 +233,9 @@ class RangeWalker
 		range.start = Rex::Socket.addr_atoi(start)
 		range.stop = Rex::Socket.addr_atoi(stop)
 		range.ipv6 = (arg.include?(":"))
+		range.options = {}
 
-		return [range]
+		return range
 	end
 
 	#
@@ -209,7 +248,7 @@ class RangeWalker
 	# ensuring that n is never greater than m.
 	#
 	# non-unique elements will be removed
-	#  e.g.: 
+	#  e.g.:
 	#    10.1.1.1-3,2-2,2 =>  ["10.1.1.1", "10.1.1.2", "10.1.1.3"]
 	#    10.1.1.1-3,7 =>  ["10.1.1.1", "10.1.1.2", "10.1.1.3", "10.1.1.7"]
 	#
@@ -249,7 +288,7 @@ class RangeWalker
 			# "1-3,5-7" => ["1-3", "5-7"]
 			ranges = section.split(',', -1)
 			sets = []
-			ranges.each { |r| 
+			ranges.each { |r|
 				bounds = []
 				if r.include?('-')
 					# Then it's an actual range, break it down into start,stop
@@ -272,7 +311,7 @@ class RangeWalker
 				return false if bounds[0] > 255 or (bounds[1] and bounds[1] > 255)
 				return false if bounds[1] and bounds[0] > bounds[1]
 				if bounds[1]
-					bounds[0].upto(bounds[1]) do |i| 
+					bounds[0].upto(bounds[1]) do |i|
 						sets.push(i)
 					end
 				elsif bounds[0]
@@ -286,9 +325,9 @@ class RangeWalker
 		# Combinitorically squish all of the quads together into a big list of
 		# ip addresses, stored as ints
 		#
-		# e.g.: 
-		#  [[1],[1],[1,2],[1,2]] 
-		#  => 
+		# e.g.:
+		#  [[1],[1],[1,2],[1,2]]
+		#  =>
 		#  [atoi("1.1.1.1"),atoi("1.1.1.2"),atoi("1.1.2.1"),atoi("1.1.2.2")]
 		addrs = []
 		for a in bytes[0]
@@ -304,8 +343,12 @@ class RangeWalker
 
 		addrs.sort!
 		addrs.uniq!
+
 		rng = Range.new
+		rng.ipv6 = false
+		rng.options = {}
 		rng.start = addrs[0]
+
 		ranges = []
 		1.upto(addrs.length - 1) do |idx|
 			if addrs[idx - 1] + 1 == addrs[idx]
@@ -339,9 +382,11 @@ class Range < Array # :nodoc: all
 	def start; self[0]; end
 	def stop;  self[1]; end
 	def ipv6;  self[2]; end
+	def options; self[3]; end
 	def start=(val); self[0] = val; end
 	def stop=(val);  self[1] = val; end
 	def ipv6=(val);  self[2] = val; end
+	def options=(val); self[3] = val; end
 end
 
 end

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

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

data/lib/rex/socket/ssl_tcp.rb

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

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

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

data/lib/rex/socket/ssl_tcp_server.rb

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

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

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

data/lib/rex/socket/subnet_walker.rb

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

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

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

data/lib/rex/socket/switch_board.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'singleton'
 require 'thread'
 require 'rex/socket'

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

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: binary -*-
 
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 
@@ -49,4 +50,4 @@ class Rex::Socket::SwitchBoard::UnitTest < Test::Unit::TestCase
 		assert_nil(Klass.best_comm('1.2.3.7'))
 	end
 
-end
+end

data/lib/rex/socket/tcp.rb

@@ -1,3 +1,4 @@
+# -*- coding: binary -*-
 require 'rex/socket'
 require 'rex/io/stream'
 
@@ -10,7 +11,7 @@ module Rex::Socket::Tcp
 
 	include Rex::Socket
 	include Rex::IO::Stream
-	
+
 	##
 	#
 	# Factory
@@ -21,7 +22,7 @@ module Rex::Socket::Tcp
 	# Creates the client using the supplied hash.
 	#
 	def self.create(hash = {})
-		hash['Proto'] = 'tcp' 
+		hash['Proto'] = 'tcp'
 		self.create_param(Rex::Socket::Parameters.from_hash(hash))
 	end
 
@@ -73,4 +74,4 @@ module Rex::Socket::Tcp
 		return 'tcp'
 	end
 
-end
+end