dnsruby 1.50 → 1.51

data/demo/axfr.rb

@@ -99,6 +99,12 @@ else
   
   nameserver = (ARGV[0] =~ /^@/) ? ARGV.shift : ""
   nameserver = nameserver.sub(/^@/, "")
+  res = nil
+  if nameserver
+    res = Dnsruby::Resolver.new(nameserver)
+  else
+    res = Dnsruby::Resolver.new
+  end
   
   zone = ARGV.shift 
   basedir = opt_d!=nil ? opt_d : (ENV["HOME"]!=nil ? ENV["HOME"] : "") + "/.dns-zones"
@@ -175,7 +181,7 @@ else
     
     zoneref = zt.transfer(zone)
     if zoneref==nil
-      raise RuntimeError,  "couldn't transfer zone: " + res.errorstring + "\n"
+      raise RuntimeError,  "couldn't transfer zone\n"
     end
     Marshal.dump(zoneref, File.open(zonefile, File::CREAT|File::RDWR))
   end

data/lib/Dnsruby/Config.rb

@@ -283,6 +283,9 @@ module Dnsruby
                     server = addr
                   end
                 }
+                if (!found)
+                  raise ArgumentError.new("Recursor can't locate #{server}")
+                end
               end
             end
           rescue Exception => e

data/lib/Dnsruby/DNS.rb

@@ -282,6 +282,9 @@ module Dnsruby
         msg = Message.new
         msg.header.rd = 1
         msg.add_question(candidate, type, klass)
+        msg.do_validation = false
+        msg.header.cd = false
+        @resolver.do_validation = false
         @resolver.send_async(msg, q)
         id, ret, exception = q.pop
         if (exception == nil && ret && ret.rcode == RCode.NOERROR)

data/lib/Dnsruby/Recursor.rb

@@ -210,6 +210,8 @@ module Dnsruby
               hints[server] = AddressCache.new
             end
           end
+          # @TODO@ Some resolvers (e.g. 8.8.8.8) do not send an additional section -
+          # need to make explicit queries for these :(
           packet.additional.each do |rr|
             TheLog.debug(";; ADDITIONAL: "+rr.inspect+"\n")
             server = rr.name.to_s.downcase
@@ -254,7 +256,7 @@ module Dnsruby
           end
         end
       else
-        warn "Server ["+(@@nameservers)[0].to_s+".] did not give answers"
+        raise ResolvError.new( "Server ["+(@@nameservers)[0].to_s+".] did not give answers")
       end
           
       # Disable recursion flag.

data/lib/Dnsruby/dnssec.rb

@@ -206,7 +206,7 @@ module Dnsruby
       TheLog.debug("Checking whether to validate, query.cd = #{query.header.cd}")
       if (((@@validation_policy > ValidationPolicy::ALWAYS_ROOT_ONLY) && (self.trust_anchors().length > 0)) ||
             # Check query here, and validate if CD is true
-          (query.header.cd == true))
+          ((query.header.cd == true))) # && (query.do_validation)))
         TheLog.debug("Starting validation")
 
         # Validate!

data/lib/Dnsruby/resource/CERT.rb

@@ -74,7 +74,10 @@ module Dnsruby
           rescue ArgumentError
             @alg = Dnsruby::Algorithms.new(names[2].to_i)
           end
-          buf = names[3]
+          buf = ""
+          (names.length - 3).times {|index|
+            buf += names[index + 3]
+          }
 
 
           buf.gsub!(/\n/, "")

data/lib/Dnsruby/resource/RP.rb

@@ -22,11 +22,19 @@ module Dnsruby
       TypeValue = Types::RP #:nodoc: all
       
       #Returns a domain name that specifies the mailbox for the responsible person.
-      attr_accessor :mailbox
+      attr_reader :mailbox
       #A domain name that specifies a TXT record containing further
       #information about the responsible person.
-      attr_accessor :txtdomain
+      attr_reader :txtdomain
+
+      def txtdomain=(s)
+        @txtdomain = Name.create(s)
+      end
       
+      def mailbox=(s)
+        @mailbox = Name.create(s)
+      end
+
       def from_hash(hash)
         @mailbox = Name.create(hash[:mailbox])
         @txtdomain = Name.create(hash[:txtdomain])

data/lib/Dnsruby/resource/TSIG.rb

@@ -477,7 +477,7 @@ module Dnsruby
         @buf = nil
         
         # RFC 2845 Section 2.3
-        @klass = "ANY"
+        @klass = Classes.ANY
         
         @ttl = 0 # RFC 2845 Section 2.3
       end

data/lib/Dnsruby/resource/resource.rb

@@ -48,7 +48,8 @@ module Dnsruby
       end      
       new_pos = @rrs.length - @num_sigs
       if ((@num_sigs == @rrs.length)  && @num_sigs > 0) # if we added RRSIG first
-        if (r.type != @rrs.last.type_covered)
+        if (((r.type != @rrs.last.type_covered) && (r.type != Types.RRSIG))||
+              ((r.type == Types.RRSIG) && (r.type_covered != @rrs.last.type_covered)))
           return false
         end
       end
@@ -292,6 +293,9 @@ module Dnsruby
       if (@klass != rec.klass || @name.downcase != rec.name.downcase)
         return false
       end
+      if (rec.type == Types.RRSIG) && (@type == Types.RRSIG)
+        return rec.type_covered == self.type_covered
+      end
       [rec, self].each { |rr|
         if (rr.type == Types::RRSIG)
           return ((@type == rr.type_covered) || (rec.type == rr.type_covered))

data/lib/Dnsruby/update.rb

@@ -111,6 +111,7 @@ module Dnsruby
       
       @header.opcode=('UPDATE')
       @header.rd=(0)
+      @do_validation = false
     end
     
     #Ways to create the prerequisite records (exists, notexists, inuse, etc. - RFC2136, section 2.4)
@@ -220,7 +221,22 @@ module Dnsruby
         type=args[1]
         ttl=args[2]
         rdata=args[3]
-        resource = RR.create("#{name} #{ttl} #{zoneclass} #{type} #{rdata}")
+        resource = nil
+        if (Types.new(type) == Types.TXT)
+          instring = "#{name} #{ttl} #{zoneclass} #{type} ";
+          if (String === rdata)
+            instring += " '#{rdata}'"
+          elsif (Array === rdata)
+            rdata.length.times {|rcounter|
+            instring += " '#{rdata[rcounter]}' "
+            }
+          else
+            instring += rdata
+          end
+          resource = RR.create(instring)
+        else
+          resource = RR.create("#{name} #{ttl} #{zoneclass} #{type} #{rdata}")
+        end
         add_update(resource)
         return resource
       end
@@ -231,14 +247,14 @@ module Dnsruby
     #
     #2.5.2 - Delete An RRset
     #   update.delete(name, type)
-    #   
+    #
     #
     #2.5.3 - Delete All RRsets From A Name
     #   update.delete(name)
-    #   
+    #
     #2.5.4 - Delete An RR From An RRset
     #  update.delete(name, type, rdata)
-    #  
+    #
     def delete(*args)
       ttl = 0
       klass = Classes.ANY
@@ -247,14 +263,14 @@ module Dnsruby
       case args.length
       when 1 # name
         resource = RR.create("#{args[0]} #{ttl} #{klass} #{Types.ANY} #{rdata}")
-        add_update(resource)      
+        add_update(resource)
       when 2 # name, type
         resource = RR.create("#{args[0]} #{ttl} #{klass} #{args[1]} #{rdata}")
-        add_update(resource)      
+        add_update(resource)
       when 3 # name, type, rdata
         resource = RR.create("#{args[0]} #{ttl} IN #{args[1]} #{args[2]}")
         resource.klass = Classes.NONE
-        add_update(resource)      
+        add_update(resource)
       end
       return resource
     end

data/lib/Dnsruby/zone_reader.rb

@@ -217,7 +217,7 @@ module Dnsruby
       split = line.split(' ') # split on whitespace
       name = split[0].strip
       if (name.index"\\")
-
+        
         ls =[]
         Name.create(name).labels.each {|el| ls.push(Name.decode(el.to_s))}
         new_name = ls.join('.')
@@ -331,7 +331,7 @@ module Dnsruby
       #   "." + origin string if necessary
       if ([Types::MX, Types::NS, Types::AFSDB, Types::NAPTR, Types::RT,
             Types::SRV, Types::CNAME, Types::MB, Types::MG, Types::MR,
-            Types::PTR].include?type_was)
+            Types::PTR, Types::DNAME].include?type_was)
         #        if (line[line.length-1, 1] != ".")
         if (!(/\.\z/ =~ line))
           line = line + "." + @origin.to_s + "."
@@ -359,9 +359,9 @@ module Dnsruby
         when Types::RP
           if (!parsed_rr.mailbox.absolute?)
             parsed_rr.mailbox = parsed_rr.mailbox.to_s + "." + @origin.to_s
-            if (!parsed_rr.txtdomain.absolute?)
-              parsed_rr.txtdomain = parsed_rr.txtdomain.to_s + "." + @origin.to_s
-            end
+          end
+          if (!parsed_rr.txtdomain.absolute?)
+            parsed_rr.txtdomain = parsed_rr.txtdomain.to_s + "." + @origin.to_s
           end
         end
         line = parsed_rr.to_s

data/lib/Dnsruby/zone_transfer.rb

@@ -91,7 +91,8 @@ module Dnsruby
           server=Config.resolve_server(server)
           xfr = do_transfer(zone, server)
           break
-        rescue Exception => exception
+        rescue Exception => e
+          exception = e
         end
       end
       if (xfr == nil && exception != nil)
@@ -133,7 +134,7 @@ module Dnsruby
               raise ResolvError.new(rcode.string);
             end
             
-            if (response.question[0].qtype != @transfer_type) 
+            if (response.question[0].qtype != @transfer_type)
               raise ResolvError.new("invalid question section")
             end
             
@@ -213,7 +214,28 @@ module Dnsruby
         ret +=", Deletes : " + @deletes.join(",")
       end
     end
-    
+
+    #Compare two serials according to RFC 1982. Return 0 if equal,
+    #-1 if s1 is bigger, 1 if s1 is smaller.
+    def compare_serial(s1, s2)
+      if s1 == s2
+        return 0
+      end
+      if s1 < s2 and (s2 - s1) < (2**31)
+        return 1
+      end
+      if s1 > s2 and (s1 - s2) > (2**31)
+        return 1
+      end
+      if s1 < s2 and (s2 - s1) > (2**31)
+        return -1
+      end
+      if s1 > s2 and (s1 - s2) < (2**31)
+        return -1
+      end
+      return 0
+    end
+
     def parseRR(rec) #:nodoc: all
       name = rec.name
       type = rec.type
@@ -228,8 +250,11 @@ module Dnsruby
         # Remember the serial number in the initial SOA; we need it
         # to recognize the end of an IXFR.
         @end_serial = rec.serial
-        if (@transfer_type == Types.IXFR && @end_serial <= @serial)
+        #        if ((@transfer_type == Types.IXFR) && (@end_serial <= @serial))
+        if ((@transfer_type == Types.IXFR) && (compare_serial(@end_serial, @serial) >= 0))
           Dnsruby.log.debug("zone up to date")
+          raise ZoneSerialError.new("IXFR up to date: expected serial " +
+              @serial.to_s + " , got " + rec.serial.to_s);
           @state = :End
         else
           @state = :FirstData
@@ -246,6 +271,7 @@ module Dnsruby
         else
           Dnsruby.log.debug("AXFR response - using AXFR")
           @rtype = Types.AXFR
+          @transfer_type = Types.AXFR
           @axfr = []
           @axfr << @initialsoa
           @state = :Axfr
@@ -283,8 +309,8 @@ module Dnsruby
             @state = :End
             return
           elsif (soa_serial != @current_serial)
-            raise ResolvError.new("IXFR out of sync: expected serial " +
-                @current_serial + " , got " + soa_serial);
+            raise ZoneSerialError.new("IXFR out of sync: expected serial " +
+                @current_serial.to_s + " , got " + soa_serial.to_s);
           else
             @state = :Ixfr_DelSoa
             parseRR(rec); # Restart...

data/lib/dnsruby.rb

@@ -104,7 +104,7 @@ require 'Dnsruby/TheLog'
 module Dnsruby
 
   # @TODO@ Remember to update version in dnsruby.gemspec!
-  VERSION = 1.50
+  VERSION = 1.51
   def Dnsruby.version
     return VERSION
   end
@@ -479,6 +479,10 @@ module Dnsruby
   class VerifyError < ResolvError
   end
 
+  #Indicates a zone transfer has failed due to SOA serial mismatch
+  class ZoneSerialError < ResolvError
+  end
+
   #The Resolv class can be used to resolve addresses using /etc/hosts and /etc/resolv.conf, 
   #
   #The DNS class may be used to perform more queries. If greater control over the sending 

data/test/tc_dlv.rb

@@ -49,9 +49,10 @@ class TestDlv < Test::Unit::TestCase
     Dnsruby::PacketSender.clear_caches
 
 
-    res = Dnsruby::Recursor.new()
-    ret = res.query("ns2.nic.se", Dnsruby::Types.A)
-    assert(ret.security_level == Dnsruby::Message::SecurityLevel::SECURE)
+    # SE no longer in DLV
+#    res = Dnsruby::Recursor.new()
+#    ret = res.query("ns2.nic.se", Dnsruby::Types.A)
+#    assert(ret.security_level == Dnsruby::Message::SecurityLevel::SECURE)
 
     # .cz no longer in dlv?
 #    ret = res.query("b.ns.nic.cz", Dnsruby::Types.A)
@@ -59,16 +60,18 @@ class TestDlv < Test::Unit::TestCase
 
     # Test .gov
 #    Dnsruby::TheLog.level = Logger::DEBUG
+res = Resolver.new
     ret = res.query("nih.gov", "NS")
     assert(ret.security_level = Dnsruby::Message::SecurityLevel::SECURE)
   end
 
-  def test_scrub_non_authoritative
-#    Dnssec.do_validation_with_recursor(true)
-    res = Dnsruby::Recursor.new()
-    ret = res.query("frobbit.se")
-      res.prune_rrsets_to_rfc5452(ret, "frobbit.se.")
-      Dnssec.validate(ret)
-    assert(ret.security_level == Dnsruby::Message::SecurityLevel::SECURE)
-  end
+   # se no longer in dlv
+#  def test_scrub_non_authoritative
+##    Dnssec.do_validation_with_recursor(true)
+#    res = Dnsruby::Recursor.new()
+#    ret = res.query("frobbit.se")
+#      res.prune_rrsets_to_rfc5452(ret, "frobbit.se.")
+#      Dnssec.validate(ret)
+#    assert(ret.security_level == Dnsruby::Message::SecurityLevel::SECURE)
+#  end
 end

data/test/tc_update.rb

@@ -221,4 +221,16 @@ class TestUpdate < Test::Unit::TestCase
     assert_equal(Classes.ANY,               pre[1].klass, 'third class right');         #65
     assert_equal(Classes.NONE,              pre[2].klass, 'forth class right');         #66
   end
+
+  def test_txt
+    update = Update.new()
+    update.add("target_name", "TXT", 100, "test signed update")
+    assert(update.to_s.index("test signed update"))
+  end
+
+  def test_array
+    update = Update.new
+    update.add("target_name", "TXT", 100, ['"test signed update"', 'item#2'])
+    assert(update.to_s.index("item"))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnsruby
 version: !ruby/object:Gem::Version 
-  version: "1.50"
+  version: "1.51"
 platform: ruby
 authors: 
 - AlexD
@@ -9,7 +9,7 @@ autorequire: dnsruby
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +01:00
+date: 2010-11-12 00:00:00 +00:00
 default_executable: 
 dependencies: []