dnsruby 1.43 → 1.44

data/lib/Dnsruby/resource/NSEC.rb

@@ -79,13 +79,15 @@ module Dnsruby
           # from the wire, already decoded
           types =t
         elsif (t.instance_of?String)
-          if t[t.length-1, t.length]!=")"
-            t = t + " )"
+          if (index = t.index";")
+            t = t[0, index]
+          end
+          if (index = t.index")")
+            t = t[0, index]
           end
           # List of mnemonics
           types=[]
           mnemonics = t.split(" ")
-          mnemonics.pop
           mnemonics.each do |m|
             type = Types.new(m)
             types.push(type)
@@ -261,6 +263,7 @@ module Dnsruby
             len = len + data[1].length
           end
           self.types=(input[len, input.length-len])
+          @types = NSEC.get_types(input[len, input.length-len])
         end
       end
       

data/lib/Dnsruby/resource/NSEC3.rb

@@ -131,10 +131,15 @@ module Dnsruby
 
         n = Name.create(name)
         out = n.canonical
+        begin
         (0..iterations).each  {
           out =NSEC3.h(out + salt, hash_alg);
         }
         return Base32.encode32hex(out).downcase
+        rescue ArgumentError
+        TheLog.error("Unknown hash algorithm #{hash_alg} used for NSEC3 hash")
+        return "Unknown NSEC3 hash algorithm"
+        end
       end
 
       def h(x) # :nodoc: all
@@ -142,11 +147,10 @@ module Dnsruby
       end
 
       def NSEC3.h(x, hash_alg) # :nodoc: all
-        if Nsec3HashAlgorithms.SHA_1 == hash_alg
+        if (Nsec3HashAlgorithms.SHA_1 == hash_alg)
           return Digest::SHA1.digest(x)
         end
-        TheLog.error("Unknown hash algorithm #{hash_alg} used for NSEC3 hash")
-        return "Unknown NSEC3 hash algorithm"
+        raise ArgumentError.new("Unknown hash algorithm")
       end
 
       def hash_alg=(a)
@@ -264,9 +268,7 @@ module Dnsruby
           self.hash_alg=(data[0]).to_i
           self.flags=(data[1]).to_i
           self.iterations=(data[2]).to_i
-          #          self.salt=NSEC3.decode_salt(data[3])
           self.salt=(data[3])
-          #          self.salt_length=(@salt.length)
 
           len = data[0].length + data[1].length + data[2].length + data[3].length + 4
           # There may or may not be brackets around next_hashed

data/lib/Dnsruby/resource/OPT.rb

@@ -185,7 +185,6 @@ module Dnsruby
             msg.put_pack('n', opt.data.length)
             msg.put_bytes(opt.data)
           end
-          msg.put_array(@options)
         end
       end
       

data/lib/Dnsruby/resource/RRSIG.rb

@@ -179,8 +179,8 @@ module Dnsruby
           self.signature=buf.unpack("m*")[0]
         end
       end
-      
-      def get_time(input)
+
+      def RRSIG.get_time(input)
         if (input.kind_of?Fixnum)
           return input
         end
@@ -217,6 +217,10 @@ module Dnsruby
         end
       end
       
+      def get_time(input)
+        return RRSIG.get_time(input)
+      end
+      
       def format_time(time)
         return Time.at(time).gmtime.strftime("%Y%m%d%H%M%S")
       end

data/lib/Dnsruby/select_thread.rb

@@ -276,7 +276,7 @@ module Dnsruby
           if (ret = res.check_response(msg, bytes, query, client_queue, id, tcp))
             remove_id(id)
             exception = msg.get_exception
-            if (ret.instance_of?TsigError)
+            if (ret.kind_of?TsigError)
               exception = ret
             end
             Dnsruby.log.debug{"Pushing response to client queue"}

data/lib/Dnsruby/zone_reader.rb

@@ -68,7 +68,7 @@ module Dnsruby
     # Process the next line of the file
     # Returns a string representing the normalised line.
     def process_line(line, do_prefix_hack = false)
-      return nil if (line.index(';') == 0)
+      return nil if (line[0,1] == ";")
       return nil if (line.strip.length == 0)
       return nil if (!line || (line.length == 0))
       @in_quoted_section = false if !@continued_line

data/lib/dnsruby.rb

@@ -104,7 +104,7 @@ require 'Dnsruby/TheLog'
 module Dnsruby
 
   # @TODO@ Remember to update version in dnsruby.gemspec!
-  VERSION = 1.43
+  VERSION = 1.44
   def Dnsruby.version
     return VERSION
   end
@@ -462,6 +462,10 @@ module Dnsruby
   class TsigError < OtherResolvError
   end
   
+  # Sent a signed packet, got an unsigned response
+  class TsigNotSignedResponseError < TsigError
+  end
+
   #Indicates an error in decoding an incoming DNS message
   class DecodeError < ResolvError
   end

data/test/tc_nsec3.rb

@@ -127,6 +127,15 @@ class Nsec3Test < Test::Unit::TestCase
     assert(nsec.to_s.include?(Types.TYPE65534.string))
   end
 
+  def test_types
+     rr = RR.create("tfkha3ph6qs16qu3oqtmnfc5tbckpjl7.archi.amt. 1209600 IN NSEC3 1 1 5 -  1tmmto81uc71moj44cli3m6avs5l44l3 NSEC3 CNAME RRSIG    ; flags: optout")
+     assert(rr.types.include?Types::NSEC3)
+     assert(rr.types.include?Types::CNAME)
+     assert(rr.types.include?Types::RRSIG)
+     rr = RR.create("929p027vb26s89h6fv5j7hmsis4tcr1p.tjeb.nl.		 3600		 IN		 NSEC3		 1 0 5 beef  9rs4nbe7128ap5i6v196ge2iag5b7rcq A AAAA RRSIG
+       ")
+  end
+
   def test_rfc_examples
     print "IMPLEMENT NSEC3 validation!\n"
     return

data/test/tc_rrsig.rb

@@ -32,8 +32,8 @@ class RrsigTest < Test::Unit::TestCase
     assert_equal(Dnsruby::Algorithms::RSASHA1, rrsig.algorithm)
     assert_equal(3, rrsig.labels)
     assert_equal(86400, rrsig.original_ttl)
-    assert_equal(Time.mktime(2003,03,22,17,31, 03).to_i, rrsig.expiration)
-    assert_equal(Time.mktime(2003,02,20,17,31,03).to_i, rrsig.inception)
+    assert_equal(Time.gm(2003,03,22,17,31, 03).to_i, rrsig.expiration)
+    assert_equal(Time.gm(2003,02,20,17,31,03).to_i, rrsig.inception)
     assert_equal(2642, rrsig.key_tag)
     assert_equal(Dnsruby::Name.create("example.com."), rrsig.signers_name)
     assert_equal("oJB1W6WNGv+ldvQ3WDG0MQkg5IEhjRip8WTr" +

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnsruby
 version: !ruby/object:Gem::Version 
-  version: "1.43"
+  version: "1.44"
 platform: ruby
 authors: 
 - AlexD
@@ -9,7 +9,7 @@ autorequire: dnsruby
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 +00:00
+date: 2010-03-03 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ extra_rdoc_files:
 - README
 - EVENTMACHINE
 files: 
+- Rakefile
 - test/custom.txt
 - test/resolv.conf
 - test/tc_axfr.rb