dnsruby 1.48 → 1.49

data/lib/Dnsruby/Cache.rb

@@ -41,6 +41,9 @@ module Dnsruby
         @cache = Hash.new
       }
     end
+    def length
+      return @cache.length
+    end
     def add(message)
       q = message.question[0]
       key = CacheKey.new(q.qname, q.qtype, q.qclass).to_s

data/lib/Dnsruby/Resolver.rb

@@ -423,10 +423,10 @@ module Dnsruby
         # Add the Config nameservers
         @config.nameserver.each do |ns|
           res = PacketSender.new({:server=>ns, :dnssec=>@dnssec,
-                :use_tcp=>@use_tcp, :no_tcp=>@no_tcp, :packet_timeout=>@packet_timeout,
-                :tsig => @tsig, :ignore_truncation=>@ignore_truncation,
-                :src_address=>@src_address, :src_port=>@src_port,
-                :recurse=>@recurse, :udp_size=>@udp_size})
+              :use_tcp=>@use_tcp, :no_tcp=>@no_tcp, :packet_timeout=>@packet_timeout,
+              :tsig => @tsig, :ignore_truncation=>@ignore_truncation,
+              :src_address=>@src_address, :src_port=>@src_port,
+              :recurse=>@recurse, :udp_size=>@udp_size})
           @single_resolvers.push(res) if res
         end
       }
@@ -615,8 +615,8 @@ module Dnsruby
     def Resolver.port_in_range(p)
       if ((p == 0) || ((p >= 50000) && (p <= 65535)))
         # @TODO@ IANA port bitmap - use 50000 - 65535 for now
-#            ((Iana::IANA_PORTS.index(p)) == nil &&
-#              (p > 1024) && (p < 65535)))
+        #            ((Iana::IANA_PORTS.index(p)) == nil &&
+        #              (p > 1024) && (p < 65535)))
         return true
       end
       return false
@@ -1073,10 +1073,12 @@ module Dnsruby
         timeouts = @timeouts[client_query_id]
         if (!(error.to_s=~/Errno::EMFILE/))
           Dnsruby.log.debug{"Removing #{resolver.server} from resolver list for this query"}
-          timeouts[1].each do |key, value|
-            res = value[0]
-            if (res == resolver)
-              timeouts[1].delete(key)
+          if (timeouts)
+            timeouts[1].each do |key, value|
+              res = value[0]
+              if (res == resolver)
+                timeouts[1].delete(key)
+              end
             end
           end
           # Also stick it to the back of the list for future queries
@@ -1085,7 +1087,7 @@ module Dnsruby
           Dnsruby.log.debug{"NOT Removing #{resolver.server} due to Errno::EMFILE"}
         end
         #        - if it was the last server, then return an error to the client (and clean up)
-        if (outstanding.empty? && timeouts && timeouts[1].values.empty?)
+        if (outstanding.empty? && ((!timeouts) || (timeouts && timeouts[1].values.empty?)))
           #          if (outstanding.empty?)
           Dnsruby.log.debug{"Sending error to client"}
           send_result_and_stop_querying(client_queue, client_query_id, select_queue, response, error)

data/lib/Dnsruby/select_thread.rb

@@ -58,6 +58,8 @@ module Dnsruby
         @@queued_responses=[]
         @@queued_validation_responses=[]
         @@wakeup_sockets = get_socket_pair
+        @@sockets << @@wakeup_sockets[1]
+
         # Suppress reverse lookups
         BasicSocket.do_not_reverse_lookup = true
         #    end
@@ -75,7 +77,7 @@ module Dnsruby
       srv = nil
       begin
         srv = TCPServer.new('localhost', 0)
-      rescue Errno::EADDRNOTAVAIL # OSX Snow Leopard issue - need to use explicit IP
+      rescue Errno::EADDRNOTAVAIL, SocketError # OSX Snow Leopard issue - need to use explicit IP
         begin
           srv = TCPServer.new('127.0.0.1', 0)
         rescue Error # Try IPv6
@@ -164,7 +166,6 @@ module Dnsruby
           timeouts = @@timeouts.values
           has_observer = !@@observers.empty?
         }
-        sockets << @@wakeup_sockets[1]
         if (timeouts.length > 0)
           timeouts.sort!
           timeout = timeouts[0] - Time.now

data/lib/Dnsruby/zone_reader.rb

@@ -176,7 +176,7 @@ module Dnsruby
             else
               if (c == ";")
                 if (!quoted)
-                  return line[0, pos]
+                  return line[0, pos+1]
                 end
               end
             end

data/lib/dnsruby.rb

@@ -104,7 +104,7 @@ require 'Dnsruby/TheLog'
 module Dnsruby
 
   # @TODO@ Remember to update version in dnsruby.gemspec!
-  VERSION = 1.48
+  VERSION = 1.49
   def Dnsruby.version
     return VERSION
   end

data/test/tc_dlv.rb

@@ -53,8 +53,9 @@ class TestDlv < Test::Unit::TestCase
     ret = res.query("ns2.nic.se", Dnsruby::Types.A)
     assert(ret.security_level == Dnsruby::Message::SecurityLevel::SECURE)
 
-    ret = res.query("b.ns.nic.cz", 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)
+#    assert(ret.security_level == Dnsruby::Message::SecurityLevel::SECURE)
 
     # Test .gov
 #    Dnsruby::TheLog.level = Logger::DEBUG

data/test/tc_rr-txt.rb

@@ -141,5 +141,10 @@ class TestRrTest < Test::Unit::TestCase
   def test_nasty_txt
    t = RR.create('txt2.t.net-dns.org. 60 IN TXT "Net-DNS\; complicated $tuff" "sort of \" text\; and binary \000 data"')
    assert(t.rdata.to_s == '"Net-DNS\; complicated $tuff" "sort of \" text\; and binary \000 data"', t.to_s)
+
+   r1 = RR.create("auto._domainkey.cacert.org.  43200 IN	TXT	\"v=DKIM1\;g=*\;k=rsa\;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDNFxiNr+NHJwih3OPhGr4iwLE+BBDu72YrMSzUnU1FF50CW7iOtuhg796UZ6xrZ5VuhAix6YmmzcvF2UxYzoD/XpfZ4MzBu0ND4/nkt9/YOTyIBzwQqn9uMNve0Y76Zsel89dIJtOI+y+lfnFExV0jKwe53gzmxMVpMSSCcZPGwIDAQAB\"	; ----- DKIM auto for cacert.org")
+   r2 = RR.create("auto._domainkey.cacert.org.	43200	IN	TXT	\"v=DKIM1;g=*;k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDNFxiNr+NHJwih3OPhGr4iwLE+BBDu72YrMSzUnU1FF50CW7iOtuhg796UZ6xrZ5VuhAix6YmmzcvF2UxYzoD/XpfZ4MzBu0ND4/nkt9/YOTyIBzwQqn9uMNve0Y76Zsel89dIJtOI+y+lfnFExV0jKwe53gzmxMVpMSSCcZPGwIDAQAB\"")
+   assert(r1.to_s == r2.to_s)
   end
+
 end

data/test/tc_verifier.rb

@@ -269,33 +269,66 @@ class VerifierTest < Test::Unit::TestCase
   end
 
   def test_naptr
-    key = Dnsruby::RR.create("all.rr.org.	2678400	IN	DNSKEY	256 3 7 AwEAAcW1ZJxnMxZAAfsQ0JJQPHOlVNeGzs/AWVSGXiIYsg9UUSsvRTiK/Wy2wD7XC6osZpgy4Blhm846wktPbCwHpkxxbjxpaMABjbhH14gRol1Gpzf+gOr8vpdii8c2y6VMN9kIXZyaZUWcshLii19ysSGlqY1a1g2XZjogFtvzDHjH ;{id = 43068 (zsk), size = 1024b}")
-    verifier = Dnsruby::SingleVerifier.new(Dnsruby::SingleVerifier::VerifierType::ANCHOR)
-    key_rrset = Dnsruby::RRSet.new(key)
-    verifier.add_trusted_key(key_rrset);
-    sig = Dnsruby::RR.create("all.rr.org.	86400	IN	RRSIG	NAPTR 7 3 86400 20100727230632 20090919145743 43068 all.rr.org. RpyBsaLiaZ/OqX5twE0SoMhlVZVAHuAlS4FZqmnAg+udF3EwrY6N/POt3nPCtgwf7tczaxrMK6zWkOldfv37iyIgXIxDQvhoCb7IoffI5TsBL5CWl5n7pg8BNAMpLxd8HIu1DShWvlplpFbBWIaC6tZCR6ft/iP+uhU7dYcqTHg= ;{id = 43068}")
-    naptr = Dnsruby::RR.create('all.rr.org.	86400	IN	NAPTR	100 10 "" "" "!^urn:cid:.+@([^\\\\.]+\\\\.)(.*)$!\\\\2!i" .')
-    rrset = Dnsruby::RRSet.new(naptr)
-    rrset.add(sig)
-    verifier.verify_rrset(rrset, key_rrset)
+    begin
+      begin
+        require 'rubygems'
+      rescue LoadError
+      end
+      require 'timecop'
+    rescue LoadError
+      return
+    end
+    Timecop.travel(2010, 03, 24, 0, 0, 0) {
+      key = Dnsruby::RR.create("all.rr.org.	2678400	IN	DNSKEY	256 3 7 AwEAAcW1ZJxnMxZAAfsQ0JJQPHOlVNeGzs/AWVSGXiIYsg9UUSsvRTiK/Wy2wD7XC6osZpgy4Blhm846wktPbCwHpkxxbjxpaMABjbhH14gRol1Gpzf+gOr8vpdii8c2y6VMN9kIXZyaZUWcshLii19ysSGlqY1a1g2XZjogFtvzDHjH ;{id = 43068 (zsk), size = 1024b}")
+      verifier = Dnsruby::SingleVerifier.new(Dnsruby::SingleVerifier::VerifierType::ANCHOR)
+      key_rrset = Dnsruby::RRSet.new(key)
+      verifier.add_trusted_key(key_rrset);
+      sig = Dnsruby::RR.create("all.rr.org.	86400	IN	RRSIG	NAPTR 7 3 86400 20100727230632 20090919145743 43068 all.rr.org. RpyBsaLiaZ/OqX5twE0SoMhlVZVAHuAlS4FZqmnAg+udF3EwrY6N/POt3nPCtgwf7tczaxrMK6zWkOldfv37iyIgXIxDQvhoCb7IoffI5TsBL5CWl5n7pg8BNAMpLxd8HIu1DShWvlplpFbBWIaC6tZCR6ft/iP+uhU7dYcqTHg= ;{id = 43068}")
+      naptr = Dnsruby::RR.create('all.rr.org.	86400	IN	NAPTR	100 10 "" "" "!^urn:cid:.+@([^\\\\.]+\\\\.)(.*)$!\\\\2!i" .')
+      rrset = Dnsruby::RRSet.new(naptr)
+      rrset.add(sig)
+      verifier.verify_rrset(rrset, key_rrset)
+    }
   end
 
   def test_txt_rr
-    txt = 'txt2.all.rr.org.        86400   IN      TXT     "Net-DNS\\\\; complicated $tuff" "sort of \\" text\\\\; and binary \\000 data"'
-    rr = Dnsruby::RR.create(txt)
-    assert(rr.to_s.index('"Net-DNS\\\\; complicated $tuff" "sort of \\" text\\\\; and binary \\000 data"'), rr.to_s)
+    begin
+      begin
+        require 'rubygems'
+      rescue LoadError
+      end
+      require 'timecop'
+    rescue LoadError
+      return
+    end
+    Timecop.travel(2010, 03, 24, 0, 0, 0) {
+      txt = 'txt2.all.rr.org.        86400   IN      TXT     "Net-DNS\\\\; complicated $tuff" "sort of \\" text\\\\; and binary \\000 data"'
+      rr = Dnsruby::RR.create(txt)
+      assert(rr.to_s.index('"Net-DNS\\\\; complicated $tuff" "sort of \\" text\\\\; and binary \\000 data"'), rr.to_s)
 
-    key = Dnsruby::RR.create("all.rr.org.	2678400	IN	DNSKEY	256 3 7 AwEAAcW1ZJxnMxZAAfsQ0JJQPHOlVNeGzs/AWVSGXiIYsg9UUSsvRTiK/Wy2wD7XC6osZpgy4Blhm846wktPbCwHpkxxbjxpaMABjbhH14gRol1Gpzf+gOr8vpdii8c2y6VMN9kIXZyaZUWcshLii19ysSGlqY1a1g2XZjogFtvzDHjH ;{id = 43068 (zsk), size = 1024b}")
-    verifier = Dnsruby::SingleVerifier.new(Dnsruby::SingleVerifier::VerifierType::ANCHOR)
-    key_rrset = Dnsruby::RRSet.new(key)
-    verifier.add_trusted_key(key_rrset);
-    sig = Dnsruby::RR.create("txt2.all.rr.org.        86400   IN      RRSIG   TXT 7 4 86400 20100813002344 20091006093439 43068 all.rr.org. LJv/ccd2JHyT6TK74Dtu/zH4jdeR4ScyrB8cGwaqeCjwxG4H5FY88Sk/U0JUQyxnUificnyZQwcyXAItn7QjBMHQO4ftVxl/gDCyt6MEXy9JKK/rfvXcAceo5prmlVrb8WxT5YnvPha3CxjK7f+YIs5cqppRVaZTQTxsAsJyJ20= ;{id = 43068}")
-    txt = Dnsruby::RR.create('txt2.all.rr.org.        86400   IN      TXT     "Net-DNS\\\\; complicated $tuff" "sort of \\" text\\\\; and binary \\000 data"')
-    rrset = Dnsruby::RRSet.new(txt)
-    rrset.add(sig)
-    verifier.verify_rrset(rrset, key_rrset)
+      key = Dnsruby::RR.create("all.rr.org.	2678400	IN	DNSKEY	256 3 7 AwEAAcW1ZJxnMxZAAfsQ0JJQPHOlVNeGzs/AWVSGXiIYsg9UUSsvRTiK/Wy2wD7XC6osZpgy4Blhm846wktPbCwHpkxxbjxpaMABjbhH14gRol1Gpzf+gOr8vpdii8c2y6VMN9kIXZyaZUWcshLii19ysSGlqY1a1g2XZjogFtvzDHjH ;{id = 43068 (zsk), size = 1024b}")
+      verifier = Dnsruby::SingleVerifier.new(Dnsruby::SingleVerifier::VerifierType::ANCHOR)
+      key_rrset = Dnsruby::RRSet.new(key)
+      verifier.add_trusted_key(key_rrset);
+      sig = Dnsruby::RR.create("txt2.all.rr.org.        86400   IN      RRSIG   TXT 7 4 86400 20100813002344 20091006093439 43068 all.rr.org. LJv/ccd2JHyT6TK74Dtu/zH4jdeR4ScyrB8cGwaqeCjwxG4H5FY88Sk/U0JUQyxnUificnyZQwcyXAItn7QjBMHQO4ftVxl/gDCyt6MEXy9JKK/rfvXcAceo5prmlVrb8WxT5YnvPha3CxjK7f+YIs5cqppRVaZTQTxsAsJyJ20= ;{id = 43068}")
+      txt = Dnsruby::RR.create('txt2.all.rr.org.        86400   IN      TXT     "Net-DNS\\\\; complicated $tuff" "sort of \\" text\\\\; and binary \\000 data"')
+      rrset = Dnsruby::RRSet.new(txt)
+      rrset.add(sig)
+      verifier.verify_rrset(rrset, key_rrset)
+    }
   end
 
+#  def test_txt_zonefile
+#     reader = Dnsruby::ZoneReader.new("cacert.org.")
+#     zone = reader.process_file("cacert.txt")
+#     reader2 = Dnsruby::ZoneReader.new("cacert.org.")
+#     zone2 = reader.process_file("cacert.signed.txt")
+#     assert(zone[1].to_s.index("DAQAB\""))
+#     assert(zone2[1].to_s.index("DAQAB\""))
+#
+#     assert(zone[1].to_s == zone2[1].to_s)
+#  end
+#
   #  def test_txt_from_zone
   #    reader = Dnsruby::ZoneReader.new("all.rr.org.")
   #    zone = reader.process_file("zone.txt")
@@ -329,4 +362,5 @@ class VerifierTest < Test::Unit::TestCase
   #     verifier = Dnsruby::SingleVerifier.new(Dnsruby::SingleVerifier::VerifierType::ANCHOR)
   #    verifier.verify_rrset(rrset, key_rrset)
   #  end
-end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnsruby
 version: !ruby/object:Gem::Version 
-  version: "1.48"
+  version: "1.49"
 platform: ruby
 authors: 
 - AlexD
@@ -9,7 +9,7 @@ autorequire: dnsruby
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 +01:00
+date: 2010-08-24 00:00:00 +01:00
 default_executable: 
 dependencies: []