dnsruby 1.31 → 1.32

data/lib/Dnsruby/name.rb

@@ -55,7 +55,7 @@ module Dnsruby
         return Name.new(split_escaped(arg), /\.\z/ =~ arg ? true : false)
         #        return Name.new(Label.split(arg), /\.\z/ =~ arg ? true : false)
       when Array
-        return Name.new(arg, /\.\z/ =~ ((arg.last.kind_of?String)?arg.last : arg.last.string) ? true : false)
+        return Name.new(arg, /\.\z/ =~ (arg.last ? ((arg.last.kind_of?String)?arg.last : arg.last.string) : arg.last) ? true : false)
       else        
         raise ArgumentError.new("cannot interpret as DNS name: #{arg.inspect}")
       end

data/lib/Dnsruby/resource/DS.rb

@@ -209,7 +209,13 @@ module Dnsruby
             index = 4
           end
           (index..end_index).each {|i|
-            buf += data[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
           } 
 #          self.digest=Base64.decode64(buf)
           buf.gsub!(/\n/, "")

data/lib/Dnsruby/resource/NSEC3.rb

@@ -206,7 +206,8 @@ module Dnsruby
         self.flags=(flags)
         self.iterations=(iterations)
 #        self.salt_length=(salt_length)
-        self.salt=(salt)
+#        self.salt=(salt)
+        @salt=salt
         self.hash_length=(hash_length)
         self.next_hashed=(next_hashed)
         self.types=(types)
@@ -299,7 +300,8 @@ module Dnsruby
       end
       
       def encode_rdata(msg, canonical=false) #:nodoc: all
-        s = salt()
+#        s = salt()
+        s = @salt
         sl = s.length()
         if (s == "-")
           sl = 0

data/lib/Dnsruby/resource/NSEC3PARAM.rb

@@ -90,7 +90,8 @@ module Dnsruby
         self.flags=(flags)
         self.iterations=(iterations)
         #        self.salt_length=(salt_length)
-        self.salt=(salt)
+#        self.salt=(salt)
+        @salt=salt
       end
       
       def from_string(input)
@@ -110,7 +111,8 @@ module Dnsruby
       end
       
       def encode_rdata(msg, canonical=false) #:nodoc: all
-        s = salt()
+#        s = salt()
+        s = @salt
         sl = s.length()
         if (s == "-")
           sl == 0

data/lib/Dnsruby/resource/RRSIG.rb

@@ -202,7 +202,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
+          return input.to_i
         elsif (input.length == 14)
           year = input[0,4]
           mon=input[4,2]
@@ -210,20 +210,20 @@ 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.gm(year, mon, day, hour, min, sec).to_i
         else
           raise DecodeError.new("RRSIG : Illegal time value #{input} - see RFC 4034 section 3.2")
         end
       end
       
       def format_time(time)
-        return Time.at(time).strftime("%Y%m%d%H%M%S")
+        return Time.at(time).gmtime.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/, "")
+          signature = [@signature].pack("m*").gsub(/\n/, "")
           # @TODO@ Display the expiration and inception as 
           return "#{@type_covered.string} #{@algorithm.string} #{@labels} #{@original_ttl} " + 
             "#{format_time(@expiration)} ( #{format_time(@inception)} " + 
@@ -259,7 +259,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.to_i, @inception.to_i)
+          msg.put_pack("NNN", @original_ttl, @expiration, @inception)
           msg.put_pack("n", @key_tag)
           msg.put_name(@signers_name, true)
         }.to_s

data/lib/Dnsruby/single_verifier.rb

@@ -114,7 +114,7 @@ module Dnsruby
     # Check that the RRSet and RRSIG record are compatible
     def check_rr_data(rrset, sigrec)#:nodoc: all
       #Each RR MUST have the same owner name as the RRSIG RR;
-      if (rrset.name.to_s.downcase != sigrec.name.to_s.downcase)
+      if (rrset.name.canonical != sigrec.name.canonical)
         raise VerifyError.new("RRSET should have same owner name as RRSIG for verification (rrsert=#{rrset.name}, sigrec=#{sigrec.name}")
       end
 
@@ -280,7 +280,7 @@ module Dnsruby
               #              if (all_delegate && rrset.sigs.length == 0)
               #                next
               #              end
-              if ((rrset.name.to_s.downcase == msg.question()[0].qname.to_s.downcase) && (rrset.sigs.length == 0))
+              if ((rrset.name.canonical == msg.question()[0].qname.canonical) && (rrset.sigs.length == 0))
                 next
               end
             end
@@ -866,11 +866,12 @@ module Dnsruby
       # If we get to root, then return false
       n = Name.create(name)
       root = Name.create(".")
-      while (n != root)
+      while (true) # n != root)
         # Try the trusted keys first, then the DS set
         (@trust_anchors.keys + @trusted_keys.keys + @configured_ds_store + @discovered_ds_store).each {|key|
-          return key if key.name.to_s.downcase == n.to_s.downcase
+          return key if key.name.canonical == n.canonical
         }
+        break if (n == root)
         # strip the name
         n = n.strip_label
       end
@@ -1095,7 +1096,7 @@ module Dnsruby
       if (!ns_rrset || ns_rrset.length == 0)
         ns_rrset = ns_ret.authority.rrset(name, Types.NS) # @TOO@ Is ths OK?
       end
-      if (!ns_rrset || ns_rrset.length == 0 || ns_rrset.name.to_s != name.to_s)
+      if (!ns_rrset || ns_rrset.length == 0 || ns_rrset.name.canonical != name.canonical)
         return nil
       end
       if (ns_rrset.sigs.length > 0)
@@ -1132,7 +1133,7 @@ module Dnsruby
         #   and see if we can find any of the names in the A/AAAA records in ns_additional
         found_addr = false
         ns_additional.each {|addr_rr|
-          if (ns_rr.nsdname.to_s == addr_rr.name.to_s)
+          if (ns_rr.nsdname.canonical == addr_rr.name.canonical)
             #            print "Found address #{addr_rr.address} for #{ns_rr.nsdname}\n"
             nameservers.push(addr_rr.address.to_s)
             found_addr = true

metadata

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