dnsruby 1.2 → 1.23

data/lib/Dnsruby/resource/PX.rb

@@ -60,7 +60,7 @@ module Dnsruby
         end
         
         def self.decode_rdata(msg) #:nodoc: all
-          preference = msg.get_unpack('n')
+          preference, = msg.get_unpack('n')
           map822 = msg.get_name
           mapx400 = msg.get_name
           return self.new([preference, map822, mapx400])

data/lib/Dnsruby/resource/RRSIG.rb

@@ -91,8 +91,8 @@ module Dnsruby
         @algorithm=Algorithms.RSASHA1
         @type_covered = Types.A
         @original_ttl = 3600
-        @inception = Time.now.to_i
-        @expiration = Time.now.to_i
+        @inception = Time.now
+        @expiration = Time.now
         @key_tag = 0
         @labels = 0
         self.signers_name="."
@@ -133,8 +133,10 @@ module Dnsruby
       
 
       def from_data(data) #:nodoc: all
-        type_covered, algorithm, @labels, @original_ttl, @expiration, @inception, 
+        type_covered, algorithm, @labels, @original_ttl, expiration, inception, 
           @key_tag, signers_name, @signature = data
+        @expiration = Time.at(expiration)
+        @inception = Time.at(inception)
         self.type_covered=(type_covered)
         self.signers_name=(signers_name)
         self.algorithm=(algorithm)
@@ -194,7 +196,7 @@ module Dnsruby
         #   digits, while the decimal representation of a 32-bit unsigned integer
         #   can never be longer than 10 digits.
         if (input.length == 10)
-          return input.to_i
+          return input
         elsif (input.length == 14)
           year = input[0,4]
           mon=input[4,2]
@@ -202,18 +204,24 @@ module Dnsruby
           hour=input[8,2]
           min=input[10,2]
           sec=input[12,2]
-          return Time.mktime(year, mon, day, hour, min, sec).to_i
+          return Time.mktime(year, mon, day, hour, min, sec)
         else
           raise DecodeError.new("RRSIG : Illegal time value #{input} - see RFC 4034 section 3.2")
         end
       end
       
+      def format_time(time)
+        return time.strftime("%Y%m%d%H%M%S")
+      end
+      
       def rdata_to_string #:nodoc: all
         if (@type_covered!=nil)
 #          signature = Base64.encode64(@signature) # .gsub(/\n/, "")
           signature = [@signature].pack("m*") # .gsub(/\n/, "")
+          # @TODO@ Display the expiration and inception as 
           return "#{@type_covered.string} #{@algorithm.string} #{@labels} #{@original_ttl} " + 
-            "#{@expiration} ( #{@inception} #{@key_tag} #{@signers_name} #{signature} )"
+            "#{format_time(@expiration)} ( #{format_time(@inception)} " + 
+            "#{@key_tag} #{@signers_name} #{signature} )"
         else
           return ""
         end
@@ -235,8 +243,8 @@ module Dnsruby
         signers_name = msg.get_name
         signature  = msg.get_bytes
         return self.new(
-          [type_covered, algorithm, labels, original_ttl, expiration,
-            inception, key_tag, signers_name, signature])
+          [type_covered, algorithm, labels, original_ttl, Time.at(expiration),
+            Time.at(inception), key_tag, signers_name, signature])
       end
       
       def sig_data
@@ -245,7 +253,7 @@ module Dnsruby
         #the Signature field excluded;
         data = MessageEncoder.new { |msg|
           msg.put_pack('ncc', @type_covered.to_i, @algorithm.to_i, @labels)
-          msg.put_pack("NNN", @original_ttl, @expiration, @inception)
+          msg.put_pack("NNN", @original_ttl, @expiration.to_i, @inception.to_i)
           msg.put_pack("n", @key_tag)
           msg.put_name(@signers_name, true)
         }.to_s

data/lib/Dnsruby/resource/RT.rb

@@ -58,7 +58,7 @@ module Dnsruby
       end
       
       def self.decode_rdata(msg) #:nodoc: all
-        preference = msg.get_unpack('n')
+        preference, = msg.get_unpack('n')
         intermediate = msg.get_name
         return self.new([preference, intermediate])
       end

data/lib/Dnsruby/resource/TSIG.rb

@@ -14,7 +14,11 @@
 #limitations under the License.
 #++
 #require 'base64'
+begin
 require 'openssl'
+rescue LoadError
+  print "OpenSSL not found - ignoring\n"
+end
 module Dnsruby
   class RR
     #TSIG implements RFC2845.

data/lib/Dnsruby/resource/generic.rb

@@ -148,4 +148,5 @@ require 'Dnsruby/resource/RRSIG'
 require 'Dnsruby/resource/NSEC'
 require 'Dnsruby/resource/DS'
 require 'Dnsruby/resource/NSEC3'
-require 'Dnsruby/resource/NSEC3PARAM'
+require 'Dnsruby/resource/NSEC3PARAM'
+require 'Dnsruby/resource/DLV'

data/lib/Dnsruby/resource/resource.rb

@@ -218,7 +218,15 @@ module Dnsruby
     alias :rr_type :type
     
     def klass=(klass)
-      @klass= Classes.new(klass)
+      if (@type != Types.OPT) 
+        @klass= Classes.new(klass)
+      else
+         if (klass.class == Classes)
+            @klass = klass
+        else
+            @klass = Classes.new("CLASS#{klass}")
+        end
+      end
     end
     
     # Determines if two Records could be part of the same RRset.
@@ -411,7 +419,10 @@ module Dnsruby
       rdlength = args[4]
       data = args[5]
       offset = args[6]
-      rdata = data[offset, rdlength]
+      rdata = []
+      if (data != nil)
+         rdata = data[offset, rdlength]
+      end
       
       record = nil
       MessageDecoder.new(rdata) {|msg|
@@ -478,11 +489,15 @@ module Dnsruby
     
     def ==(other)
       return false unless self.class == other.class
-      s_ivars = self.instance_variables
+      ivars = self.instance_variables
+      s_ivars = []
+      ivars.each {|i| s_ivars << i.to_s} # Ruby 1.9
       s_ivars.sort!
       s_ivars.delete "@ttl" # RFC 2136 section 1.1
       
-      o_ivars = other.instance_variables
+      ivars = other.instance_variables
+      o_ivars = []
+      ivars.each {|i| o_ivars << i.to_s} # Ruby 1.9
       o_ivars.sort!
       o_ivars.delete "@ttl" # RFC 2136 section 1.1
       
@@ -507,9 +522,9 @@ module Dnsruby
     
     #Get an RR of the specified type and class
     def self.get_class(type_value, class_value) #:nodoc: all
-      #      if (type_value == Types.OPT)
-      #        return Class.new(OPT)
-      #      end
+      if (type_value == Types.OPT)
+         return Class.new(OPT)
+      end
       if (type_value.class == Class)
         type_value = type_value.const_get(:TypeValue)
         return ClassHash[[type_value, Classes.to_code(class_value)]] ||
@@ -526,7 +541,7 @@ module Dnsruby
           class_value = Classes.new(class_value).code
         end
         return ClassHash[[type_value, class_value]] ||
-          Generic.create(type_value, class_value)
+           Generic.create(type_value, class_value)
       end
       return ret
     end  

data/lib/Dnsruby/select_thread.rb

@@ -120,7 +120,7 @@ module Dnsruby
       while true do
         send_tick_to_observers
         send_queued_exceptions
-        timeout = tick_time = 0.1 # We provide a timer service to various Dnsruby classes
+        timeout = tick_time = 0.5 # We provide a timer service to various Dnsruby classes
         sockets=[]
         timeouts=[]
         has_observer = false
@@ -187,7 +187,13 @@ module Dnsruby
         udp_packet_size = query_settings.udp_packet_size
         msg, bytes = get_incoming_data(socket, udp_packet_size)
         if (msg!=nil)
-          send_response_to_client(msg, bytes, socket)
+          # Check that the IP we received from was the IP we sent to!
+          if ((msg.answerip != query_settings.dest_server) && 
+                (msg.answerfrom != query_settings.dest_server))
+            Dnsruby.log.warn("Unsolicited response received from #{answerip}")
+          else 
+            send_response_to_client(msg, bytes, socket)
+          end
         end
         ready.delete(socket)
       end
@@ -297,13 +303,13 @@ module Dnsruby
           else
             # recvfrom failed - why?
             Dnsruby.log.error{"Error - recvfrom failed from #{socket}"}
-            handle_recvfrom_failure(socket)          
+            handle_recvfrom_failure(socket, "")          
             return
           end        
         end
       rescue Exception => e
         Dnsruby.log.error{"Error - recvfrom failed from #{socket}, exception : #{e}"}
-        handle_recvfrom_failure(socket)          
+        handle_recvfrom_failure(socket, e)          
         return
       end
       Dnsruby.log.debug{";; answer from #{answerfrom} : #{answersize} bytes\n"}
@@ -325,12 +331,14 @@ module Dnsruby
         Dnsruby.log.debug{"#{ans}"}
         ans.answerfrom=(answerfrom)
         ans.answersize=(answersize)
+        ans.answerip =(answerip)
       end
       return ans, buf
     end
     
-    def handle_recvfrom_failure(socket)
-      #  @TODO@ No way to notify the client about this error, unless there was only one connection on the socket
+    def handle_recvfrom_failure(socket, exception)
+      #  No way to notify the client about this error, unless there was only one connection on the socket
+      # Not a problem, as there only will ever be one connection on the socket (Kaminsky attack mitigation)
       ids_for_socket = []
       @@mutex.synchronize{
         ids_for_socket = @@socket_hash[socket]
@@ -341,7 +349,7 @@ module Dnsruby
           query_settings = @@query_hash[ids_for_socket[0]]
           answerfrom=query_settings.dest_server
         }
-        send_exception_to_client(OtherResolvError.new("recvfrom failed from #{answerfrom}"), socket, ids_for_socket[0])
+        send_exception_to_client(OtherResolvError.new("recvfrom failed from #{answerfrom}; #{exception}"), socket, ids_for_socket[0])
       else
         Dnsruby.log.fatal{"Recvfrom failed from #{socket}, no way to tell query id"}
       end

data/lib/Dnsruby/update.rb

@@ -136,7 +136,7 @@ module Dnsruby
     #           update.present(name)
     def present(*args)
       ttl = 0
-      rdata = []
+      rdata = ""
       klass = Classes.ANY
       if (args.length>=1) # domain (RFC2136, Section 2.4.4)
         name = args[0]
@@ -172,7 +172,7 @@ module Dnsruby
     #
     def absent(*args)
       ttl = 0
-      rdata = []
+      rdata = ""
       klass = Classes.NONE
       if (args.length>=1) # domain (RFC2136, Section 2.4.5)
         name = args[0]
@@ -242,7 +242,7 @@ module Dnsruby
     def delete(*args)
       ttl = 0
       klass = Classes.ANY
-      rdata=[]
+      rdata=""
       resource = nil
       case args.length
       when 1 # name

data/lib/Dnsruby/zone_transfer.rb

@@ -101,7 +101,7 @@ module Dnsruby
           response = receive_message(socket)
           
           if (@state == :InitialSoa)
-            rcode = response.header.rcode
+            rcode = response.rcode
             if (rcode != RCode.NOERROR)
               if (@transfer_type == Types.IXFR &&
                     rcode == RCode.NOTIMP)

data/lib/dnsruby.rb

@@ -263,6 +263,7 @@ module Dnsruby
     MAILB     = 253     # RFC 1035 (MB, MG, MR)
     MAILA     = 254     # RFC 1035 (obsolete - see MX)
     ANY       = 255     # RFC 1035    
+    DLV       = 32769   # RFC 4431 (informational)
     update()
     
     def unknown_string(arg) #:nodoc: all
@@ -351,18 +352,19 @@ module Dnsruby
     OPT         = 41     # RFC 2671
   end
   
+  # http://www.iana.org/assignments/dns-sec-alg-numbers/
   class Algorithms < CodeMapper
     RSAMD5     = 1
     DH         = 2
     DSA        = 3
     ECC        = 4
     RSASHA1    = 5
-    DSANSEC3SHA1 = 131
-    RSASHA1NSEC3SHA1 = 133
     INDIRECT   = 252
     PRIVATEDNS = 253
     PRIVATEOID = 254
     update()
+    add_pair("DSA-NSEC3-SHA1", 131)
+    add_pair("RSASHA1-NSEC3-SHA1", 133)
   end  
   
   #An error raised while querying for a resource

data/test/tc_dns.rb

@@ -80,7 +80,7 @@ class TestDNS < Test::Unit::TestCase
     #
     Dnsruby.log.level=Logger::FATAL
     [:nameserver].each do |test|
-      [{}, 'string',1,'\1',nil].each do |input|
+      [{}, 'kjghdfkjhase',1,'\1',nil].each do |input|
         res=nil
         begin
           res = Dnsruby::DNS.new({test => input})

data/test/tc_ds.rb

@@ -1,16 +1,30 @@
 require 'test/unit'
+require 'openssl'
 require 'dnsruby'
 
 class DsTest < Test::Unit::TestCase
   INPUT = "dskey.example.com. 86400 IN DS 60485 5 1 ( 2BB183AF5F22588179A53B0A" + 
     "98631FAD1A292118 )"
+     DNSKEY = "dskey.example.com. 86400 IN DNSKEY 256 3 5 ( AQOeiiR0GOMYkDshWoSKz9Xz" +
+                                                "fwJr1AYtsmx3TGkJaNXVbfi/" +                                                
+                                                "2pHm822aJ5iI9BMzNXxeYCmZ"+
+                                                "DRD99WYwYqUSdjMmmAphXdvx"+
+                                                "egXd/M5+X7OrzKBaMbCVdFLU"+
+                                                "Uh6DhweJBjEVv5f2wwjM9Xzc"+
+                                                "nOf+EPbtG9DMBmADjFDc2w/r"+
+                                                "ljwvFw== )" #  key id = 60485
+      DS1 = "dskey.example.com. 86400 IN DS 60485 5 1 ( 2BB183AF5F22588179A53B0A"+
+                                              "98631FAD1A292118 )"
+      DS2 = "dskey.example.com. 86400 IN DS 60485 5 2   ( D4B7D520E7BB5F0F67674A0C"+
+                                                "CEB1E3E0614B93C4F9E99B83"+
+                                                "83F6A1E4469DA50A )"
   include Dnsruby
   def test_ds_from_string
     ds = Dnsruby::RR.create(INPUT)
     assert_equal(60485, ds.key_tag)
     assert_equal(Algorithms.RSASHA1, ds.algorithm)
     assert_equal(1, ds.digest_type)
-    assert_equal("2BB183AF5F22588179A53B0A98631FAD1A292118", [ds.digest].pack("m*").chomp!)
+    assert_equal("2BB183AF5F22588179A53B0A98631FAD1A292118", ds.digest)
     
     ds2 = Dnsruby::RR.create(ds.to_s)
     assert(ds2.to_s == ds.to_s)
@@ -28,11 +42,40 @@ class DsTest < Test::Unit::TestCase
   
   def test_ds_values
     ds = Dnsruby::RR.create(INPUT)
+    ds.digest_type = 2
+    # Be liberal in what you accept...
+#    begin
+#      ds.digest_type = 3
+#      fail
+#      
+#    rescue DecodeError
+#    end
+  end
+  
+  def test_ds_digest
+     key = Dnsruby::RR.create(DNSKEY)
+     
+     # and check it is the same as DS
+     right_ds = Dnsruby::RR.create(DS1)
+     ds = Dnsruby::RR::DS.from_key(key, 1);
+     assert_equal(ds.to_s, right_ds.to_s)    
+  end
+  
+  def test_sha2
     begin
-      ds.digest_type = 2
-      fail
-    rescue DecodeError
+      s = OpenSSL::Digest::SHA256
+    rescue Exception
+      print "SHA256 not available - skipping that test\n"
+      return
     end
+      
+     # Create a new DS from the DNSKEY, 
+     key = Dnsruby::RR.create(DNSKEY)
+     
+     # and check it is the same as DS
+     right_ds = Dnsruby::RR.create(DS2)
+     ds = Dnsruby::RR::DS.from_key(key, 2);
+     assert_equal(ds.to_s, right_ds.to_s)
   end
   
 end

data/test/tc_em_deferrable.rb

@@ -0,0 +1,38 @@
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+require 'rubygems'
+require 'test/unit'
+require 'eventmachine'
+require 'dnsruby'
+#begin
+#  require 'test/tc_single_resolver'
+#rescue Exception
+#  require 'tc_single_resolver'
+#end
+
+class EmDeferrableTest < Test::Unit::TestCase
+  Dnsruby::Resolver.use_eventmachine(true)
+  def setup
+    Dnsruby::Resolver.use_eventmachine(true)
+  end
+  def teardown
+    Dnsruby::Resolver.use_eventmachine(false)    
+  end
+  
+  def test_deferrable_success
+    res = Dnsruby::SingleResolver.new
+    Dnsruby::Resolver.use_eventmachine
+    q = Queue.new
+    id = 1
+    done = false
+    EM.run {
+      df = res.send_async(Dnsruby::Message.new("nominet.org.uk"))
+      df.callback {|id, msg| puts "callback: #{id}, #{msg}"; done = true; EM.stop}
+      df.errback {|id, msg, err| puts "errback: #{id}, #{msg}, #{err}"; done = true; EM.stop}
+    }
+  end
+  
+  def test_deferrable_timeout
+    flunk("IMPLEMENT!")    
+  end
+end

data/test/tc_event_machine_res.rb

@@ -76,7 +76,7 @@ class EventMachineTestResolver < Test::Unit::TestCase
     res.send_async(Message.new("dklfjhdFHFHDVVUIEWRFDSAJKVCNASDLFJHN.com", Types.A), q, 1)
     id, m, err = q.pop
     assert(id==1)
-    assert(m.header.rcode == RCode.NXDOMAIN)
+    assert(m.rcode == RCode.NXDOMAIN)
     assert(err.kind_of?(NXDomain))
   end