dnsruby 1.30 → 1.31

data/lib/Dnsruby/resource/NSEC3PARAM.rb

@@ -39,10 +39,18 @@ module Dnsruby
       #The Salt Length field defines the length of the Salt field in octets,
       #ranging in value from 0 to 255.
       attr_reader :salt_length
+
       #The Salt field is appended to the original owner name before hashing
       #in order to defend against pre-calculated dictionary attacks.
-      attr_accessor :salt
-      
+      def salt
+        return NSEC3.encode_salt(@salt)
+      end
+
+      def salt=(s)
+        @salt = NSEC3.decode_salt(s)
+        @salt_length = @salt.length
+      end
+
       def hash_alg=(a)
         if (a.instance_of?String)
           if (a.length == 1)
@@ -50,11 +58,11 @@ module Dnsruby
           end
         end
         begin
-          alg = Algorithms.new(a)
+          alg = Nsec3HashAlgorithms.new(a)
           @hash_alg = alg
         rescue ArgumentError => e
           raise DecodeError.new(e)
-        end        
+        end
       end
       
       def types=(t)
@@ -69,19 +77,19 @@ module Dnsruby
         end
       end
       
-      def salt_length=(l)
-        if ((l < 0) || (l > 255))
-          raise DecodeError.new("NSEC3 salt length must be between 0 and 255")
-        end
-        @salt_length = l
-      end
-      
+      #      def salt_length=(l) # :nodoc: all
+      #        if ((l < 0) || (l > 255))
+      #          raise DecodeError.new("NSEC3 salt length must be between 0 and 255")
+      #        end
+      #        @salt_length = l
+      #      end
+      #
       def from_data(data) #:nodoc: all
         hash_alg, flags, iterations, salt_length, salt = data
         self.hash_alg=(hash_alg)
         self.flags=(flags)
         self.iterations=(iterations)
-        self.salt_length=(salt_length)
+        #        self.salt_length=(salt_length)
         self.salt=(salt)
       end
       
@@ -92,21 +100,26 @@ module Dnsruby
           self.flags=(data[1]).to_i
           self.iterations=(data[2]).to_i
           self.salt=(data[3])
-          self.salt_length=(data[3].length)
+          #          self.salt_length=(data[3].length)
         end
       end
       
       def rdata_to_string #:nodoc: all
-        if (@next_hashed!=nil)
-          return "#{@hash_alg.code} #{@flags} #{@iterations} #{@salt}"
-        else
-          return ""
-        end
+          s = salt()
+          return "#{@hash_alg.code} #{@flags} #{@iterations} #{s}"
       end
       
       def encode_rdata(msg, canonical=false) #:nodoc: all
-        msg.put_pack("ccnc", @hash_alg.code, @flags, @iterations, @salt_length)
-        msg.put_bytes(@salt)
+        s = salt()
+        sl = s.length()
+        if (s == "-")
+          sl == 0
+        end
+        msg.put_pack("ccnc", @hash_alg.code, @flags, @iterations, sl)
+
+        if (sl > 0)
+          msg.put_bytes(s)
+        end
       end
       
       def self.decode_rdata(msg) #:nodoc: all

data/lib/Dnsruby/resource/RRSIG.rb

@@ -165,7 +165,13 @@ module Dnsruby
           # the white space out 
           buf=""
           (index+3..end_index).each {|i|
+            if (comment_index = data[i].index(";"))
+              buf += data[i].slice(0, comment_index)
+              # @TODO@ We lose the comments here - we should really keep them for when we write back to string format?
+              break
+            else
             buf += data[i]
+            end
           }
           buf.gsub!(/\n/, "")
           buf.gsub!(/ /, "")

data/lib/Dnsruby/resource/resource.rb

@@ -23,6 +23,7 @@ module Dnsruby
   # (RRSet)."
   # This class also stores the RRSIG records which cover the RRSet
   class RRSet
+    include Comparable
     # The number of RRSIGs stored in this RRSet
     attr_reader :num_sigs
     def initialize(rrs = [])
@@ -90,9 +91,19 @@ module Dnsruby
       end
       
         return privateAdd(r)
-      return true
+#      return true
     end
-    
+
+    def <=>(other)
+#      return 1 if ((!other) || !(other.name) || !(other.type))
+#      return -1 if (!@name)
+      if (@name.canonical == other.name.canonical)
+        return @type.code <=> other.type.code
+      else
+        return @name <=> other.name
+      end
+    end
+
     def sort_canonical
       #Make a list, for all the RRs, where each RR contributes
       #the canonical RDATA encoding

data/lib/Dnsruby/select_thread.rb

@@ -492,11 +492,10 @@ module Dnsruby
         #        push_to_client(client_id, client_queue, msg, err)
         client_queue.push([client_id, Resolver::EventType::RECEIVED, msg, err])
         notify_queue_observers(client_queue, client_id)
-        # @TODO@ Do we need to validate this? The response has come from the cache -
+        # Do we need to validate this? The response has come from the cache -
         # validate it only if it has not been validated already
         # So, if we need to validate it, send it to the validation thread
         # Otherwise, send VALIDATED to the requester.
-        # Should we really just be checking (level != SECURE) ?
         if (((msg.security_level == Message::SecurityLevel::UNCHECKED) ||
               (msg.security_level == Message::SecurityLevel::INDETERMINATE)) &&
             (ValidatorThread.requires_validation?(query, msg, err, res)))

data/lib/Dnsruby/single_verifier.rb

@@ -641,7 +641,7 @@ module Dnsruby
 
         sigrecs.each {|sig|
           if ((key.key_tag == sig.key_tag) && (key.algorithm == sig.algorithm))
-            #            print "Found key #{key.key_tag}\n"
+#                        print "Found key #{key.key_tag}\n"
             return key, sig
           end
         }
@@ -654,10 +654,8 @@ module Dnsruby
     #
     # Returns true if the RRSet verified, false otherwise.
     def verify_rrset(rrset, keys = nil)
-      # @TODO@ Finer-grained reporting than "false".
       #      print "Verify_rrset #{rrset.name}, #{rrset.type}\n"
       sigrecs = rrset.sigs
-      #      return false if (rrset.num_sigs == 0)
       if (rrset.rrs.length == 0)
         raise VerifyError.new("No RRSet to veryify")
       end
@@ -755,7 +753,7 @@ module Dnsruby
       expiration_diff = (sigrec.expiration.to_i - Time.now.to_i).abs
       rrset.ttl = ([rrset.ttl, sigrec.ttl, sigrec.original_ttl,
           expiration_diff].sort)[0]
-      #      print "VERIFIED OK\n"
+#            print "VERIFIED OK\n"
       return true
     end
 

data/lib/Dnsruby/update.rb

@@ -252,8 +252,8 @@ module Dnsruby
         resource = RR.create("#{args[0]} #{ttl} #{klass} #{args[1]} #{rdata}")
         add_update(resource)      
       when 3 # name, type, rdata
-        klass = Classes.NONE
-        resource = RR.create("#{args[0]} #{ttl} #{klass} #{args[1]} #{args[2]}")
+        resource = RR.create("#{args[0]} #{ttl} IN #{args[1]} #{args[2]}")
+        resource.klass = Classes.NONE
         add_update(resource)      
       end
       return resource

data/lib/dnsruby.rb

@@ -75,7 +75,17 @@ require 'Dnsruby/TheLog'
 #* NotImp < ResolvError
 #  
 #* Refused < ResolvError
+#
+#* NotZone < ResolvError
+#
+#* YXDomain < ResolvError
+#
+#* YXRRSet < ResolvError
 #  
+#* NXRRSet < ResolvError
+#
+#* NotAuth < ResolvError
+#
 #* OtherResolvError < ResolvError
 #  
 #== I/O
@@ -377,7 +387,14 @@ module Dnsruby
     # Referred to as Algoriths.RSASHA1_NSEC3_SHA1
     add_pair("RSASHA1-NSEC3-SHA1", 7)
   end  
-  
+
+  # http://www.iana.org/assignments/dnssec-nsec3-parameters/dnssec-nsec3-parameters.xhtml
+  class Nsec3HashAlgorithms < CodeMapper
+    RESERVED = 0
+    update()
+    add_pair("SHA-1", 1)
+  end
+
   #An error raised while querying for a resource
   class ResolvError < StandardError
   end
@@ -405,6 +422,27 @@ module Dnsruby
   #The requested operation was refused by the remote resolver
   class Refused < ResolvError
   end
+
+  #The update RR is outside the zone (in dynamic update)
+  class NotZone < ResolvError
+  end
+
+  #Some name that ought to exist, does not exist (in dynamic update)
+  class YXDomain < ResolvError
+  end
+
+  #Some RRSet that ought to exist, does not exist (in dynamic update)
+  class YXRRSet < ResolvError
+  end
+
+  #Some RRSet that ought not to exist, does exist (in dynamic update)
+  class NXRRSet < ResolvError
+  end
+
+  #The nameserver is not responsible for the zone (in dynamic update)
+  class NotAuth < ResolvError
+  end
+
   
   #Another kind of resolver error has occurred
   class OtherResolvError < ResolvError

data/test/tc_dnskey.rb

@@ -34,6 +34,11 @@ class DnskeyTest < Test::Unit::TestCase
     assert(dnskey2.to_s == dnskey.to_s, "#{dnskey.to_s} not equal to \n#{dnskey2.to_s}")
   end
 
+  def test_from_string_with_comments
+    k = Dnsruby::RR.create("tjeb.nl.		 3600		 IN		 DNSKEY		 256 3 7 AwEAAcglEOS7bECRK5fqTuGTMJycmDhTzmUu/EQbAhKJOYJxDb5SG/RYqsJgzG7wgtGy0W1aP7I4k6SPtHmwcqjLaZLVUwRNWCGr2adjb9JTFyBR7F99Ngi11lEGM6Uiw/eDRk66lhoSGzohjj/rmhRTV6gN2+0ADPnafv3MBkPgryA3 ;{id = 53177 (zsk), size = 1024b}")
+    assert_equal(53177, k.key_tag)
+  end
+
   def test_dnskey_from_data
     dnskey = Dnsruby::RR.create(INPUT)
     m = Dnsruby::Message.new

data/test/tc_nsec.rb

@@ -13,6 +13,11 @@ class NsecTest < Test::Unit::TestCase
     
     nsec2 = Dnsruby::RR.create(nsec.to_s)
     assert(nsec2.to_s == nsec.to_s)
+
+    s = "tjeb.nl.		3600	IN	NSEC	dragon.tjeb.nl. A NS SOA MX AAAA RRSIG NSEC DNSKEY"
+    nsec = Dnsruby::RR.create(s)
+    assert(nsec.types.include?(Types.A))
+    assert(nsec.types.include?(Types.DNSKEY))
   end
 
   def test_nsec_from_data

data/test/tc_nsec3.rb

@@ -12,7 +12,7 @@ class Nsec3Test < Test::Unit::TestCase
     assert(nsec.opt_out?)
     assert_equal(12, nsec.iterations)
     assert_equal("aabbccdd", nsec.salt)
-    assert_equal(Dnsruby::Algorithms.RSAMD5, nsec.hash_alg)
+    assert_equal(Dnsruby::Nsec3HashAlgorithms.SHA_1, nsec.hash_alg)
     
     nsec2 = Dnsruby::RR.create(nsec.to_s)
     assert(nsec2.to_s == nsec.to_s)
@@ -39,19 +39,44 @@ class Nsec3Test < Test::Unit::TestCase
     nsec3 = m2.additional()[0]
     assert_equal(nsec.to_s, nsec3.to_s)
   end
-  
+
+  def test_calculate_hash
+    input = [
+[   "example"       , "0p9mhaveqvm6t7vbl5lop2u3t2rp3tom"],
+[   "a.example"     , "35mthgpgcu1qg68fab165klnsnk3dpvl"],
+[   "ai.example"    , "gjeqe526plbf1g8mklp59enfd789njgi"],
+[   "ns1.example"   , "2t7b4g4vsa5smi47k61mv5bv1a22bojr"],
+[   "ns2.example"   , "q04jkcevqvmu85r014c7dkba38o0ji5r"],
+[   "w.example"     , "k8udemvp1j2f7eg6jebps17vp3n8i58h"],
+[   "*.w.example"   , "r53bq7cc2uvmubfu5ocmm6pers9tk9en"],
+[   "x.w.example"   , "b4um86eghhds6nea196smvmlo4ors995"],
+[   "y.w.example"   , "ji6neoaepv8b5o6k4ev33abha8ht9fgc"],
+[   "x.y.w.example" , "2vptu5timamqttgl4luu9kg21e0aor3s"],
+[   "xx.example"    , "t644ebqk9bibcna874givr6joj62mlhv"],
+[   "2t7b4g4vsa5smi47k61mv5bv1a22bojr.example" , "kohar7mbb8dc2ce8a9qvl8hon4k53uhi"]
+    ]
+    input.each {|name, hash|
+      nsec3 = Dnsruby::RR.create({:type => Dnsruby::Types.NSEC3, :name => name, :salt => "aabbccdd", :iterations => 12, :hash_alg  => 1})
+      n = nsec3.calculate_hash
+      assert_equal(n, hash, "Expected #{hash} but got #{n} for #{name}")
+      c = Dnsruby::RR::NSEC3.calculate_hash(name, 12, Dnsruby::RR::NSEC3.decode_salt("aabbccdd"), 1)
+      assert_equal(c, hash, "Expected #{hash} but got #{c} for #{name}")
+    }
+    #
+  end
+
   def test_nsec_other_stuff
     nsec = Dnsruby::RR.create(INPUT)
-    begin
-      nsec.salt_length=256
-      fail
-    rescue DecodeError
-    end
-    begin
-      nsec.hash_length=256
-      fail
-    rescue DecodeError
-    end
+#    begin
+#      nsec.salt_length=256
+#      fail
+#    rescue DecodeError
+#    end
+#    begin
+#      nsec.hash_length=256
+#      fail
+#    rescue DecodeError
+#    end
     # Be liberal in what you accept...
 #    begin
 #      nsec.hash_alg = 8

data/test/tc_nsec3param.rb

@@ -8,7 +8,7 @@ class Nsec3ParamTest < Test::Unit::TestCase
   def test_nsec_from_string
     nsec = Dnsruby::RR.create(INPUT)
 
-    assert_equal(Dnsruby::Algorithms.RSAMD5, nsec.hash_alg)
+    assert_equal(Dnsruby::Nsec3HashAlgorithms.SHA_1, nsec.hash_alg)
     assert_equal(0, nsec.flags)
     assert_equal(12, nsec.iterations)
     assert_equal("aabbccdd", nsec.salt)
@@ -25,6 +25,14 @@ class Nsec3ParamTest < Test::Unit::TestCase
     m2 = Dnsruby::Message.decode(data)
     nsec3 = m2.additional()[0]
     assert_equal(nsec.to_s, nsec3.to_s)
+
+  end
+
+  def test_from_real_string
+    r = Dnsruby::RR.create("tjeb.nl.		 3600		 IN		 NSEC3PARAM		 1 0 5 beef")
+    assert_equal(Dnsruby::Name.create("tjeb.nl."), r.name)
+    assert_equal("beef", r.salt)
+    assert_equal(Dnsruby::Nsec3HashAlgorithms.SHA_1, r.hash_alg)
   end
   
 end

data/test/tc_rrsig.rb

@@ -29,4 +29,9 @@ class RrsigTest < Test::Unit::TestCase
     rrsig2 = Dnsruby::RR.create(rrsig.to_s)
     assert(rrsig2.to_s == rrsig.to_s)
   end
+
+  def test_string_with_comments
+    r = Dnsruby::RR.create("tjeb.nl.		 3600		 IN		 RRSIG		 NSEC3PARAM 7 2 3600 20090630164649 20090602164649 53177 tjeb.nl. Fw70WQMviRFGyeze3MUpfafaAcWIvHRpnq4ZK3lxexrR1p+rLxK5C4qVKU71XYrPYR7XEBxgUG1oyKNOhFOVyx31EjC462dz7Vxn6UDpD1LIwNnD28+oHfS9AFzGKcn4zUZqT+8IvOO1jiS9c3Y8WAkOloN9AwGIIKWU8zAp1n4= ;{id = 53177}")
+    assert_equal("Fw70WQMviRFGyeze3MUpfafaAcWIvHRpnq4ZK3lxexrR1p+rLxK5C4qVKU71XYrPYR7XEBxgUG1oyKNOhFOVyx31EjC462dz7Vxn6UDpD1LIwNnD28+oHfS9AFzGKcn4zUZqT+8IvOO1jiS9c3Y8WAkOloN9AwGIIKWU8zAp1n4=", ([r.signature].pack("m*")).gsub(/\n/,"").chomp)
+  end
 end

data/test/tc_tkey.rb

@@ -72,4 +72,5 @@ class TestTKey < Test::Unit::TestCase
     #@TODO@ Test TKEY against server!
     
   end
+
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnsruby
 version: !ruby/object:Gem::Version 
-  version: "1.30"
+  version: "1.31"
 platform: ruby
 authors: 
 - AlexD
@@ -9,7 +9,7 @@ autorequire: dnsruby
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 +01:00
+date: 2009-06-04 00:00:00 +01:00
 default_executable: 
 dependencies: []