redns 0.1.12 → 0.1.13

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/lib/redns/connection.rb

@@ -4,6 +4,7 @@ class ReDNS::Connection < EventMachine::Connection
   # == Constants ============================================================
   
   DEFAULT_TIMEOUT = 5
+  SEQUENCE_LIMIT = 0x10000
   
   # == Properties ===========================================================
   
@@ -15,6 +16,8 @@ class ReDNS::Connection < EventMachine::Connection
 
   # == Class Methods ========================================================
 
+  # Returns a new instance of a reactor-bound resolver. If a block is given,
+  # the instance is supplied for customization purposes.
   def self.instance
     connection = EventMachine.open_datagram_socket(
       ReDNS::Support.bind_all_addr,
@@ -32,7 +35,7 @@ class ReDNS::Connection < EventMachine::Connection
   def post_init
     # Sequence numbers do not have to be cryptographically secure, but having
     # a healthy amount of randomness is a good thing.
-    @sequence = (rand(0x10000) ^ (object_id ^ (Time.now.to_f * 100000).to_i)) % 0x10000
+    @sequence = (rand(SEQUENCE_LIMIT) ^ (object_id ^ (Time.now.to_f * SEQUENCE_LIMIT).to_i)) % SEQUENCE_LIMIT
     
     # Callback tracking is done by matching response IDs in a lookup table
     @callback = { }
@@ -97,6 +100,7 @@ class ReDNS::Connection < EventMachine::Connection
     end
 
     @sequence += 1
+    @sequence %= SEQUENCE_LIMIT
   end
   
   def unbind

data/lib/redns/message.rb

@@ -1,7 +1,7 @@
 class ReDNS::Message < ReDNS::Fragment
   # == Constants ============================================================
   
-  SECTIONS = [ :questions, :answers, :nameservers, :additional_records ]
+  SECTIONS = [ :questions, :answers, :nameservers, :additional_records ].freeze
 
   # == Attributes ===========================================================
   
@@ -28,6 +28,9 @@ class ReDNS::Message < ReDNS::Fragment
 
   # == Class Methods ========================================================
   
+  # Constructs a question that asks for more information about a given
+  # resource with an optional query type specified. Query type defaults to
+  # :ptr for dotted-quad IP addresses, :a otherwise.
   def self.question(name, qtype = nil)
     if (!qtype)
       if (ReDNS::Support.is_ip?(name))
@@ -55,13 +58,17 @@ class ReDNS::Message < ReDNS::Fragment
   # == Instance Methods =====================================================
   
 	def increment_id!
-	  self.id += 1
+	  self.id = (self.id + 1) % 0x10000
 	end
 
+  # Returns true if this is a response type message, false otherwise, as is
+  # the case with query messages.
 	def response?
 	  !self.query?
 	end
 	
+	# Returns a string representation of the message in a format similar to what
+	# the dig shell utility produces.
 	def to_s
 	  flags = [ ]
 	  flags << 'qr' if (response?)
@@ -83,10 +90,13 @@ class ReDNS::Message < ReDNS::Fragment
 		additional_records.collect(&:to_s).join("\n") + "\n"
 	end
 	
+	# Returns the length of the encoded DNS request.
 	def length
 		to_dns.length
 	end
 	
+	# Returns true if the questions, answers, nameservers and additional records
+	# are all empty, false otherwise.
 	def empty?
 		questions.empty? and
 		  answers.empty? and
@@ -94,10 +104,13 @@ class ReDNS::Message < ReDNS::Fragment
 		  additional_records.empty?
 	end
 	
+	# Returns a YAML serialized version of the message.
 	def to_yaml
 		@attributes.to_yaml
 	end
 
+  # Serializes the message into a supplied buffer, or allocates a new one to
+  # store it. Returns the buffer used.
 	def serialize(buffer = ReDNS::Buffer.new)
 	  buffer.pack(
 		  'nnnnnn',
@@ -126,11 +139,17 @@ class ReDNS::Message < ReDNS::Fragment
     buffer
 	end
 
+  # Extracts a message from the supplied buffer. Will return the message if
+  # successful, nil if an error occurred or no suitable data cound be found
+  # in the buffer.
 	def deserialize(buffer)
 	  return unless (buffer)
 	  
 		data = buffer.unpack("nnnnnn")
 		
+		# Abandon efforts to decode if insufficient data is available.
+		return if (data.length < 6)
+		
 		self.id = data.shift
 
 		flags = data.shift

data/lib/redns/name.rb

@@ -1,4 +1,8 @@
 class ReDNS::Name < ReDNS::Fragment
+  # == Constants ============================================================
+  
+  POINTER_CHAIN_LIMIT = 64
+  
   # == Attributes ===========================================================
   
   attribute :name, :default => '.'
@@ -52,6 +56,7 @@ class ReDNS::Name < ReDNS::Fragment
 		self.name = ''
 		
 		return_to_offset = nil
+		pointer_count = 0
 
     while (c = buffer.unpack('C')[0])
       if (c & 0xC0 == 0xC0)
@@ -59,11 +64,25 @@ class ReDNS::Name < ReDNS::Fragment
         # point and read from there, but preserve the position where the
         # pointer was found to leave the buffer in that final state.
 
-        pointer = (c & 0x3F << 8) | buffer.unpack('C')[0]
+        if (additional_offset = buffer.unpack('C')[0])
+          pointer = (c & 0x3F << 8) | additional_offset
 
-        return_to_offset ||= buffer.offset
-        buffer.rewind
-        buffer.advance(pointer)
+          return_to_offset ||= buffer.offset
+          buffer.rewind
+          buffer.advance(pointer)
+          
+          pointer_count += 1
+          
+          if (pointer_count > POINTER_CHAIN_LIMIT)
+            # Encountered too many pointers, probably a sign of a circular
+            # reference or a badly constructed response. Ignore.
+            break
+          end
+        else
+          # The buffer may have prematurely run dry, in which case the only
+          # option left is to abandon further processing.
+          break
+        end
       elsif (c == 0)
         break
       else

data/lib/redns/record/null.rb

@@ -24,9 +24,9 @@ class ReDNS::Record::Null < ReDNS::Fragment
 	end
 
 	def deserialize(buffer)
-	  content_length = buffer.unpack('C')[0]
-	  
-	  self.contents = buffer.read(content_length)
+	  if (content_length = buffer.unpack('C')[0])
+  	  self.contents = buffer.read(content_length)
+	  end
 
 	  self
 	end

data/lib/redns/resource.rb

@@ -71,7 +71,7 @@ class ReDNS::Resource < ReDNS::Fragment
   		when :soa
   			self.rdata = ReDNS::Record::SOA.new(buffer)
   		when :txt, :null
-  			self.rdata = ReDNS::Record::Null.new(buffer.slice(rdata_length))
+  		  self.rdata = (rdata_length and ReDNS::Record::Null.new(buffer.slice(rdata_length)))
   		when :mx
   			self.rdata = ReDNS::Record::MX.new(buffer)
   		else

data/redns.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redns}
-  s.version = "0.1.12"
+  s.version = "0.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["tadman"]
-  s.date = %q{2011-05-16}
+  s.date = %q{2011-06-17}
   s.description = %q{ReDNS is a pure Ruby DNS library with drivers for reactor-model engines such as EventMachine}
   s.email = %q{github@tadman.ca}
   s.extra_rdoc_files = [
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/tadman/redns}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.0}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Ruby Reactor-Ready DNS Library}
   s.test_files = [
     "test/helper.rb",

data/test/test_redns.rb

@@ -1,4 +1,7 @@
 require File.expand_path('helper', File.dirname(__FILE__))
 
 class TestRedns < Test::Unit::TestCase
+  def test_module_loaded
+    assert ReDNS
+  end
 end

data/test/test_redns_connection.rb

@@ -58,10 +58,10 @@ class TestReDNSConnection < Test::Unit::TestCase
       end
     end
     
-    assert_equal %w[ 192.0.32.10 ], address
-    assert_equal %w[ www.example.com. ], reverse
-    assert_equal %w[ a.iana-servers.net. b.iana-servers.net. ], nameservers.sort
-    assert_equal %w[ 74.207.228.18 ], cname
+    assert_equal %w[ 192.0.43.10 ], address.collect { |a| a.rdata.to_s }
+    assert_equal %w[ www.example.com. ], reverse.collect { |a| a.rdata.to_s }
+    assert_equal %w[ a.iana-servers.net. b.iana-servers.net. ], nameservers.collect { |a| a.rdata.to_s }.sort
+    assert_equal %w[ 74.207.228.18 ], cname.collect { |a| a.rdata.to_s }
 
   end
 

data/test/test_redns_name.rb

@@ -86,7 +86,7 @@ class TestReDNSName < Test::Unit::TestCase
     example_buffer = ReDNS::Buffer.new(
       [
         3, ?c, ?o, ?m,
-        192, 6,
+        0xC0, 6,
         3, ?n, ?e, ?t,
         0,
         7, ?e, ?x, ?a, ?m, ?p, ?l, ?e,
@@ -105,4 +105,17 @@ class TestReDNSName < Test::Unit::TestCase
     
     assert_equal 0, example_buffer.length
   end
+  
+  def test_circular_pointer
+    example_buffer = ReDNS::Buffer.new(
+      [
+        3, ?c, ?o, ?m,
+        0xC0, 0
+      ].collect(&:chr).join
+    )
+    
+    name = ReDNS::Name.new(example_buffer)
+
+    assert_equal 'com.' * (ReDNS::Name::POINTER_CHAIN_LIMIT + 1), name.to_s
+  end
 end

data/test/test_redns_resolver.rb

@@ -25,7 +25,7 @@ class TestReReDNSResolver < Test::Unit::TestCase
 		assert_equal 1, r.size
 
     assert_equal :a, r[0].rtype
-		assert_equal '192.0.32.10', r[0].rdata.to_s
+		assert_equal '192.0.43.10', r[0].rdata.to_s
   end
 
   def test_simple_reverse_query
@@ -63,7 +63,7 @@ class TestReReDNSResolver < Test::Unit::TestCase
 		assert_equal 1, r.questions.size
 		assert_equal 1, r.answers.size
 
-		assert_equal '192.0.32.10', r.answers[0].rdata.to_s
+		assert_equal '192.0.43.10', r.answers[0].rdata.to_s
 	end
 
 	def test_ns_query
@@ -87,12 +87,12 @@ class TestReReDNSResolver < Test::Unit::TestCase
 
 	def test_bulk_query
 		addrs = %w[
-		  192.0.32.1
-		  192.0.32.2
-		  192.0.32.3
-		  192.0.32.4
-		  192.0.32.5
 		  192.0.32.10
+		  192.0.32.12
+		  192.0.32.13
+		  192.0.32.14
+		  192.0.32.15
+		  192.0.32.16
 		].collect do |i|
 		  ReDNS::Support.addr_to_arpa(i)
 	  end
@@ -110,12 +110,12 @@ class TestReReDNSResolver < Test::Unit::TestCase
 		assert rlist[addrs[0]]
 		
 		expected =  %w[
-		  32-1.lax.icann.org.
-		  32-2.lax.icann.org.
-		  32-3.lax.icann.org.
-		  32-4.lax.icann.org.
-		  32-5.lax.icann.org.
 		  www.example.com.
+		  redirects.iana.org.
+		  tools.iana.org.
+		  nomcom.icann.org.
+		  confirm.icann.org.
+		  dnscert.com.
 		]
 
     answers = addrs.collect do |a|
@@ -126,13 +126,13 @@ class TestReReDNSResolver < Test::Unit::TestCase
 	end
 
 	def test_reverse_addresses
-    addrs = %w[
-		  192.0.32.1
-		  192.0.32.2
-		  192.0.32.3
-		  192.0.32.4
-		  192.0.32.5
+		addrs = %w[
 		  192.0.32.10
+		  192.0.32.12
+		  192.0.32.13
+		  192.0.32.14
+		  192.0.32.15
+		  192.0.32.16
 		]
 		
 		res = ReDNS::Resolver.new
@@ -144,12 +144,12 @@ class TestReReDNSResolver < Test::Unit::TestCase
 		assert_equal addrs.length, rlist.length
 
 		expected =  %w[
-		  32-1.lax.icann.org.
-		  32-2.lax.icann.org.
-		  32-3.lax.icann.org.
-		  32-4.lax.icann.org.
-		  32-5.lax.icann.org.
 		  www.example.com.
+		  redirects.iana.org.
+		  tools.iana.org.
+		  nomcom.icann.org.
+		  confirm.icann.org.
+		  dnscert.com.
 		]
 		
     answers = addrs.collect do |a|

metadata

@@ -2,7 +2,7 @@
 name: redns
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - tadman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -04:00
+date: 2011-06-17 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Ruby Reactor-Ready DNS Library