redns 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2bafcebc9a854b66739ac0f38dd909dd56ec4ef
-  data.tar.gz: e3da07761ddd463efaecdbf544d28ef4a8fa7bbd
+  metadata.gz: a285fa417ce8a6cd882a1a882dae99db88dea5e3
+  data.tar.gz: a9182c4722a3e97dc04c7ae18f3eeb998fe06034
 SHA512:
-  metadata.gz: 51dc9b6de6d62d44cad19112d858a98ad14cc8457213841665c5526da4d6e5eac7045d9c20f0750d8f3622d412e77d4c0f8ec39f013ee4eb160ebacb33d48d2a
-  data.tar.gz: 617feea176a9adf4f3e7895bc0f46da460850654ccaa598e26aa168dea00acfa262490f9cee88d62af526b747dafbcbd96f67e588dc2e723ccc4efbc6d476ace
+  metadata.gz: 83d57d0a82ef870f6b40269388d203bc85169071a48648352bf758e5b35756ec4d8b3aee678e68599fe602cb9340a55f918bb12e08bb10d2523610d79b5b284d
+  data.tar.gz: ec67b76f94fb65d902e6ae437d33e6301a8b04d1798935015f0b67d8758b97a85d10b96d90497274bd4070a8c9e3c11d9aaca726f3f56aaf34227fd6d26f07a7

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/redns/connection.rb

@@ -3,8 +3,8 @@ require 'socket'
 class ReDNS::Connection < EventMachine::Connection
   # == Constants ============================================================
   
-  TIMEOUT_DEFAULT = 5.0
-  ATTEMPTS_DEFAULT = 5
+  TIMEOUT_DEFAULT = 2.5
+  ATTEMPTS_DEFAULT = 10
   SEQUENCE_LIMIT = 0x10000
   
   # == Properties ===========================================================
@@ -54,6 +54,10 @@ class ReDNS::Connection < EventMachine::Connection
     @nameservers ||= ReDNS::Support.default_nameservers
   end
 
+  def nameserver_score
+    @nameserver_score ||= Hash.new(0)
+  end
+
   # Configure the nameservers to use. Supplied value can be either a string
   # containing one IP address, an Array containing multiple IP addresses, or
   # nil which reverts to defaults.
@@ -64,7 +68,7 @@ class ReDNS::Connection < EventMachine::Connection
   
   # Picks a random nameserver from the configured list.
   def random_nameserver
-    nameservers[rand(nameservers.length)]
+    nameservers.sample
   end
 
   # Returns the current port in use.
@@ -83,28 +87,24 @@ class ReDNS::Connection < EventMachine::Connection
     end
     
     serialized_message = message.serialize.to_s
-    target_nameserver = random_nameserver
 
-    result = send_datagram(
-      serialized_message,
-      target_nameserver,
-      ReDNS::Support.dns_port
-    )
+    nameservers = self.nameservers_by_score
 
-    if (result > 0)
-      @callback[@sequence] = {
-        serialized_message: serialized_message,
-        type: type,
-        filter_by_type: (type == :any || !filter) ? false : type,
-        nameserver: target_nameserver,
-        attempts: self.attempts - 1,
-        callback: callback,
-        at: Time.now
-      }
-    else
-      callback.call(nil)
-    end
+    entry = @callback[@sequence] = {
+      id: @sequence,
+      serialized_message: serialized_message,
+      type: type,
+      filter_by_type: (type == :any || !filter) ? false : type,
+      nameservers: nameservers,
+      nameserver: nameservers.pop,
+      attempts: self.attempts,
+      callback: callback,
+      at: Time.now
+    }
 
+    send_request!(entry)
+
+  ensure
     @sequence += 1
     @sequence %= SEQUENCE_LIMIT
   end
@@ -124,6 +124,14 @@ class ReDNS::Connection < EventMachine::Connection
     EventMachine.add_periodic_timer(1) do
       check_for_timeouts!
     end
+
+    EventMachine.add_periodic_timer(30) do
+      update_nameserver_scores!
+    end
+  end
+
+  def peer_addr
+    Socket.unpack_sockaddr_in(self.get_peername)
   end
 
   # EventMachine: Called when data is received on the active socket.
@@ -131,6 +139,10 @@ class ReDNS::Connection < EventMachine::Connection
     message = ReDNS::Message.new(ReDNS::Buffer.new(data))
     
     if (callback = @callback.delete(message.id))
+      _, ip = self.peer_addr
+
+      self.nameserver_score[ip] += 1
+
       answers = message.answers
 
       if (type = callback[:filter_by_type])
@@ -146,10 +158,35 @@ class ReDNS::Connection < EventMachine::Connection
   end
 
 protected
-  # Returns the next nameserver in the list for a given entry, wrapping around
-  # to the beginning if required.
-  def nameserver_after(nameserver)
-    self.nameservers[(self.nameservers.index(nameserver).to_i + 1) % self.nameservers.length]
+  def nameservers_by_score
+    self.nameservers.sort_by do |nameserver|
+      self.nameserver_score[nameserver]
+    end
+  end
+
+  def send_request!(params)
+    rv = send_datagram(
+      params[:serialized_message],
+      params[:nameserver],
+      ReDNS::Support.dns_port
+    )
+
+    # A non-positive result means there was some kind of error.
+    params[:retry] = rv <= 0
+
+  rescue EventMachine::ConnectionError
+    # This is thrown if an invalid address is configured in the nameservers.
+    params[:retry] = true
+  ensure
+    params[:attempts] -= 1
+  end
+
+  def update_nameserver_scores!
+    # Sorts nameservers by least to most timeouts, also shaves number of
+    # timeouts in half to ignore temporary problems.
+    self.nameservers.each do |nameserver|
+      self.nameserver_score[nameserver] /= 2
+    end
   end
 
   # Checks all pending queries for timeouts and triggers callbacks or retries
@@ -157,32 +194,37 @@ protected
   def check_for_timeouts!
     timeout_at = Time.now - (@timeout || TIMEOUT_DEFAULT)
   
+    # Iterate over a copy of the keys to avoid issues with deleting entries
+    # from a Hash being iterated.
     @callback.keys.each do |k|
-      if (params = @callback[k])
-        if (params[:at] < timeout_at)
-          if (params[:attempts] > 0)
-            # If this request can be retried, find a different nameserver.
-            target_nameserver = nameserver_after(params[:target_nameserver])
-            
-            # Send exactly the same request to it so that the request ID will
-            # match to the same callback.
-            send_datagram(
-              params[:serialized_message],
-              target_nameserver,
-              ReDNS::Support.dns_port
-            )
-            
-            params[:target_nameserver] = target_nameserver
-            params[:attempts] -= 1
-          else
-            params[:callback].call(nil)
-            @callback.delete(k)
-          end
-        end
-      else
+      params = @callback[k]
+
+      unless (params)
         # Was missing params so should be deleted if not already removed.
         @callback.delete(k)
       end
+
+      if (params[:at] < timeout_at or params[:retry])
+        nameserver_score[params[:nameserver]] -= 1
+
+        if (params[:attempts] > 0)
+          if (params[:nameservers].empty?)
+            params[:nameservers] = self.nameservers_by_score
+          end
+
+          # If this request can be retried, find a different nameserver.
+          params[:nameserver] = params[:nameservers].pop
+
+          # Send exactly the same request to it so that the request ID will
+          # match to the same callback. The first successful response is
+          # considered valid.
+          send_request!(params)
+        else
+          params[:callback].call(nil)
+
+          @callback.delete(k)
+        end
+      end
     end
   end
 end

data/lib/redns/name.rb

@@ -18,7 +18,7 @@ class ReDNS::Name < ReDNS::Fragment
     when String
       super(name: contents)
       
-      unless (ReDNS::Support.is_ip?(name) or self.name.match(/\.$/))
+      unless (ReDNS::Support.is_ip?(name) or self.name.match(/\.\z/))
         self.name += '.'
       end
     else
@@ -64,8 +64,12 @@ 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.
 
-        if (additional_offset = buffer.unpack('C')[0])
-          pointer = (c & 0x3F << 8) | additional_offset
+        
+
+        # The pointer is encoded as two sequential bytes representing the
+        # positional offset.
+        if (byte = buffer.unpack('C')[0])
+          pointer = (c & 0x3F) << 8 | byte
 
           return_to_offset ||= buffer.offset
           buffer.rewind
@@ -100,7 +104,7 @@ class ReDNS::Name < ReDNS::Fragment
       buffer.advance(return_to_offset)
     end
 
-    self.name.encode!('UTF-8')
+    self.name.encode!('UTF-8', undef: :replace, invalid: :replace)
     
     self
   end

data/redns.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: redns 0.2.0 ruby lib
+# stub: redns 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "redns".freeze
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["tadman".freeze]
-  s.date = "2017-09-14"
+  s.date = "2017-09-19"
   s.description = "ReDNS is a pure Ruby DNS library with drivers for reactor-model engines such as EventMachine".freeze
   s.email = "github@tadman.ca".freeze
   s.executables = ["redig".freeze]
@@ -46,6 +46,8 @@ Gem::Specification.new do |s|
     "lib/redns/resource.rb",
     "lib/redns/support.rb",
     "redns.gemspec",
+    "test/examples/aspmx4.googlemail.com",
+    "test/examples/postageapp.com.mx",
     "test/helper.rb",
     "test/test_redns.rb",
     "test/test_redns_address.rb",

data/test/helper.rb

@@ -13,4 +13,12 @@ require 'eventmachine'
 require 'redns'
 
 class Test::Unit::TestCase
+  def example_buffer(name)
+    ReDNS::Buffer.new(
+      File.open(
+        File.expand_path("examples/#{name}", File.dirname(__FILE__)),
+        'r:BINARY'
+      ).read
+    )
+  end
 end

data/test/test_redns_connection.rb

@@ -94,6 +94,24 @@ class TestReDNSConnection < Test::Unit::TestCase
       EventMachine.stop_event_loop
     end
   end
+
+  def test_broken_ns
+    address = :fail
+
+    EventMachine.run do
+      dns = ReDNS::Connection.instance do |c|
+        c.nameservers = '129.1.1.1'
+      end
+
+      dns.resolve('example.com') do |result|
+        address = result
+
+        EventMachine.stop_event_loop
+      end
+    end
+
+    assert_nil address
+  end
   
   def test_simple_attempts
     address = :fail

data/test/test_redns_message.rb

@@ -168,4 +168,12 @@ class TestReDNSMessage < Test::Unit::TestCase
     
     assert_equal 45532, question.id
   end
+
+  def test_decode_example
+    message = ReDNS::Message.new(example_buffer('postageapp.com.mx'))
+
+    message.answers.each do |answer|
+      assert_equal 'UTF-8', answer.rdata.to_a[0].encoding.to_s
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redns
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - tadman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,6 +74,8 @@ files:
 - lib/redns/resource.rb
 - lib/redns/support.rb
 - redns.gemspec
+- test/examples/aspmx4.googlemail.com
+- test/examples/postageapp.com.mx
 - test/helper.rb
 - test/test_redns.rb
 - test/test_redns_address.rb