dnsruby 1.45 → 1.46

data/demo/digdlv.rb

@@ -40,7 +40,10 @@
 #Michael Fuhr <mike@fuhr.org>
 #Alex D <alexd@nominet.org.uk>
 
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'dnsruby'
 include Dnsruby
 

data/demo/digitar.rb

@@ -39,7 +39,10 @@
 #Michael Fuhr <mike@fuhr.org>
 #Alex D <alexd@nominet.org.uk>
 
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'dnsruby'
 include Dnsruby
 

data/lib/Dnsruby/message.rb

@@ -1063,8 +1063,10 @@ module Dnsruby
       put_length16 {rr.encode_rdata(self, canonical)}
     end
 
-    def put_name(d, canonical=false)
-      if (canonical)
+    def put_name(d, canonical=false, downcase = canonical)
+      # DNSSEC requires some records (e.g. NSEC, RRSIG) to be canonicalised, but
+      # not downcased. YUK!
+      if (downcase)
         d = d.downcase
       end
       put_labels(d.to_a, canonical)

data/lib/Dnsruby/resource/DNSKEY.rb

@@ -153,16 +153,16 @@ module Dnsruby
         get_new_key_tag
       end
       
-    def from_hash(hash) #:nodoc: all
-      @make_new_key_tag = false
-      hash.keys.each do |param|
-        send(param.to_s+"=", hash[param])
+      def from_hash(hash) #:nodoc: all
+        @make_new_key_tag = false
+        hash.keys.each do |param|
+          send(param.to_s+"=", hash[param])
+        end
+        @make_new_key_tag = true
+        get_new_key_tag
       end
-      @make_new_key_tag = true
-      get_new_key_tag
-    end
 
-    def from_string(input)
+      def from_string(input)
         if (input.length > 0)
           @make_new_key_tag = false
           data = input.split(" ")
@@ -291,12 +291,16 @@ module Dnsruby
       end
       
       def key=(key_text)
-        key_text.gsub!(/\n/, "")
-        key_text.gsub!(/ /, "")
-        #        @key=Base64.decode64(key_text)        
-        @key=key_text.unpack("m*")[0]
-        public_key
-        get_new_key_tag
+        begin
+          key_text.gsub!(/\n/, "")
+          key_text.gsub!(/ /, "")
+          #        @key=Base64.decode64(key_text)
+          @key=key_text.unpack("m*")[0]
+          public_key
+          get_new_key_tag
+        rescue Exception
+          raise ArgumentError.new("Key #{key_text} invalid")
+        end
       end
       
       def public_key

data/lib/Dnsruby/resource/NSEC.rb

@@ -282,7 +282,7 @@ module Dnsruby
       
       def encode_rdata(msg, canonical=false) #:nodoc: all
         # Canonical
-        msg.put_name(@next_domain, true)
+        msg.put_name(@next_domain, canonical, false) # dnssec-bis-updates says NSEC should not be downcased
         types = encode_types
         msg.put_bytes(types)
       end

data/lib/Dnsruby/resource/RRSIG.rb

@@ -243,7 +243,7 @@ module Dnsruby
         msg.put_pack('ncc', @type_covered.to_i, @algorithm.to_i, @labels)
         msg.put_pack("NNN", @original_ttl, @expiration, @inception)
         msg.put_pack("n", @key_tag)
-        msg.put_name(@signers_name, canonical)
+        msg.put_name(@signers_name, canonical, false)
         msg.put_bytes(@signature)
       end
       

data/lib/Dnsruby/resource/resource.rb

@@ -273,7 +273,7 @@ module Dnsruby
     # This compares the name, type, and class of the Records; the ttl and
     # rdata are not compared.
     def sameRRset(rec)
-      if (@klass != rec.klass || @name != rec.name)
+      if (@klass != rec.klass || @name.downcase != rec.name.downcase)
         return false
       end
       [rec, self].each { |rr|

data/lib/Dnsruby/single_verifier.rb

@@ -687,6 +687,8 @@ module Dnsruby
       sigrecs.each do |sigrec|
         check_rr_data(rrset, sigrec)
       end
+      raise ArgumentError.new("Expecting DNSKEY, DLV, DS, RRSet, Array or nil for keys : got #{keys.class} instead") if
+          (keys && (![Array, RR::IN::DNSKEY, RR::IN::DLV, RR::IN::DS].include?keys.class) && (keys.class != RRSet))
 
       keyrec = nil
       sigrec = nil

data/lib/Dnsruby/zone_reader.rb

@@ -217,23 +217,24 @@ module Dnsruby
       split = line.split(' ') # split on whitespace
       name = split[0].strip
       if (name.index"\\")
-        old_name = name
 
         ls =[]
-        Name.create(name).labels.each {|el| ls.push(Name.decode(RR::TXT.display(el.to_s, false)))}
-        name = ls.join('.')
+        Name.create(name).labels.each {|el| ls.push(Name.decode(el.to_s))}
+        new_name = ls.join('.')
 
 
-        if (/\.\z/ =~ old_name)
-          name += "."
+        if (!(/\.\z/ =~ name))
+          new_name += "." + @origin
+        else
+          new_name += "."
         end
-        line = name + " "
+        line = new_name + " "
         (split.length - 1).times {|i| line += "#{split[i+1]} "}
         line += "\n"
+        name = new_name
         split = line.split
-      end
-      # o add $ORIGIN to it if it is not absolute
-      if !(/\.\z/ =~ name)
+        # o add $ORIGIN to it if it is not absolute
+      elsif !(/\.\z/ =~ name)
         new_name = name + "." + @origin
         line.sub!(name, new_name)
         name = new_name

data/lib/dnsruby.rb

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

data/test/tc_axfr.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 class TestAxfr < Test::Unit::TestCase

data/test/tc_dns.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_dnsruby.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_escapedchars.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_header.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_hip.rb

@@ -14,7 +14,10 @@
 #See the License for the specific language governing permissions and
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_ipseckey.rb

@@ -14,7 +14,10 @@
 #See the License for the specific language governing permissions and
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_misc.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 class TestMisc < Test::Unit::TestCase

data/test/tc_name.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby
@@ -59,9 +62,9 @@ class TestName < Test::Unit::TestCase
     names.push(Name.create("Z.a.example"))
     names.push(Name.create("zABC.a.EXAMPLE"))
     names.push(Name.create("z.example"))
-#    names.push(Name.create("\001.z.example")) # @TODO@ Binary labels in strings
+    names.push(Name.create("\001.z.example"))
     names.push(Name.create("*.z.example"))
-#    names.push(Name.create("\200.z.example")) # @TODO@ Binary labels in strings
+    names.push(Name.create("\200.z.example"))
     names.each_index {|i|
       if (i < (names.length() - 1))
         assert(names[i].canonically_before(names[i+1]))
@@ -71,4 +74,10 @@ class TestName < Test::Unit::TestCase
     assert(Name.create("x.w.example").canonically_before(Name.create("z.w.example")))
     assert(Name.create("x.w.example").canonically_before(Name.create("a.z.w.example")))
   end
+
+  def test_escapes
+    n1 = Name.create("\\nall.all.")
+    n2 = Name.create("nall.all.")
+    assert(n1 == n2, n1)
+  end
 end

data/test/tc_naptr.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_nsec3.rb

@@ -129,9 +129,9 @@ class Nsec3Test < Test::Unit::TestCase
 
   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)
+     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

data/test/tc_packet.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_packet_unique_push.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_question.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_recur.rb

@@ -24,7 +24,7 @@ class TestRecur < Test::Unit::TestCase
 #    Dnsruby::TheLog.level = Logger::DEBUG
     ret = r.query("uk-dnssec.nic.uk", Dnsruby::Types.DNSKEY)
 #    print ret
-    assert(ret.answer.length > 0)
+    assert(ret && ret.answer.length > 0)
 #    ret = r.query_dorecursion("aaa.bigzone.uk-dnssec.nic.uk", Dnsruby::Types.DNSKEY)
 #    ret = r.query_dorecursion("uk-dnssec.nic.uk", Dnsruby::Types.DNSKEY)
   end

data/test/tc_res_config.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 class TestResolverConfig < Test::Unit::TestCase

data/test/tc_res_env.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_res_file.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 class TestAResolverFile < Test::Unit::TestCase

data/test/tc_res_opt.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_rr-opt.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 require 'socket'

data/test/tc_rr-txt.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_rr-unknown.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 class TestRrUnknown < Test::Unit::TestCase

data/test/tc_rr.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_single_resolver.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_soak.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 begin

data/test/tc_soak_base.rb

@@ -14,7 +14,10 @@
 #limitations under the License.
 #++
 
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 

data/test/tc_sshfp.rb

@@ -14,7 +14,10 @@
 #See the License for the specific language governing permissions and
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_tcp.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 class TestTcp < Test::Unit::TestCase

data/test/tc_tkey.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 require "digest/md5"

data/test/tc_tsig.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 require "digest/md5"

data/test/tc_update.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'test/unit'
 require 'dnsruby'
 include Dnsruby

data/test/tc_verifier.rb

@@ -28,9 +28,10 @@ class VerifierTest < Test::Unit::TestCase
     rescue Exception
     end
     if (have_sha2)
-#      print "OpenSSL supports SHA2\n"
+      #      print "OpenSSL supports SHA2\n"
       do_test_sha256
       do_test_sha512
+      do_test_nsec
     else
       print "OpenSSL doesn't support SHA2 - disabling SHA256/SHA512 tests. DNSSEC validation will not work with these type of signatures.\n"
     end
@@ -244,10 +245,33 @@ class VerifierTest < Test::Unit::TestCase
     assert(verified > 0)
   end
 
+  def do_test_nsec
+    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("in-addr-servers.arpa.          3600            IN              DNSKEY          256 3 8 AwEAAcoEdjN6PM57REYLqLCBNfjCbQQU8pSNOz/kRwP75YQzidnaQpCO4+rjOYSAPH5lAjtT+AxuUB33DkOhQHPDSO87JLt1pm65eNNsz10COEExfuokM98qiURN76kv3N1n/gRG2693tpkmVdvSTRCbReyq6BlzKuYABGLD3V3MUB4j ;{id = 12033 (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("b.in-addr-servers.arpa.                3600            IN              RRSIG           NSEC 8 3 3600 20100325113758 20100318052509 12033 in-addr-servers.arpa. uy5aUIhq3eKc24gcoyBoLYaR6kKtG957zpR0G2pf1XPCO2ESzwdIkXK0/XeUkRMmPRnKfGOhwNYIBK26kX3PYxaIPsDZVc5ZAC3uc/+EpCosMn3FJQQDiNx/gznEQZk0JRxTUMMMucCNW2HVU18NVtTQhT0MaAsLyG8OduWuMCI= ;{id = 12033}")
+      nsec = Dnsruby::RR.create("B.in-addr-servers.arpa.          3600            IN              NSEC            C.in-addr-servers.arpa. A AAAA RRSIG NSEC")
+      rrset = Dnsruby::RRSet.new(nsec)
+      rrset.add(sig)
+      verifier.verify_rrset(rrset, key_rrset)
+    }
+  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 = 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" .')
@@ -262,8 +286,8 @@ class VerifierTest < Test::Unit::TestCase
     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 = 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"')
@@ -272,37 +296,37 @@ class VerifierTest < Test::Unit::TestCase
     verifier.verify_rrset(rrset, key_rrset)
   end
 
-#  def test_txt_from_zone
-#    reader = Dnsruby::ZoneReader.new("all.rr.org.")
-#    zone = reader.process_file("zone.txt")
-#    rrset = Dnsruby::RRSet.new
-#    key_rrset = Dnsruby::RRSet.new
-#    zone.each {|rr|
-#      if ( (rr.type == Dnsruby::Types.TXT) || ((rr.type == Dnsruby::Types.RRSIG) && (rr.type_covered == Dnsruby::Types.TXT)))
-#        rrset.add(rr)
-#      end
-#      if (rr.type == Dnsruby::Types.DNSKEY)
-#        key_rrset.add(rr)
-#      end
-#    }
-#     verifier = Dnsruby::SingleVerifier.new(Dnsruby::SingleVerifier::VerifierType::ANCHOR)
-#    verifier.verify_rrset(rrset, key_rrset)
-#  end
+  #  def test_txt_from_zone
+  #    reader = Dnsruby::ZoneReader.new("all.rr.org.")
+  #    zone = reader.process_file("zone.txt")
+  #    rrset = Dnsruby::RRSet.new
+  #    key_rrset = Dnsruby::RRSet.new
+  #    zone.each {|rr|
+  #      if ( (rr.type == Dnsruby::Types.TXT) || ((rr.type == Dnsruby::Types.RRSIG) && (rr.type_covered == Dnsruby::Types.TXT)))
+  #        rrset.add(rr)
+  #      end
+  #      if (rr.type == Dnsruby::Types.DNSKEY)
+  #        key_rrset.add(rr)
+  #      end
+  #    }
+  #     verifier = Dnsruby::SingleVerifier.new(Dnsruby::SingleVerifier::VerifierType::ANCHOR)
+  #    verifier.verify_rrset(rrset, key_rrset)
+  #  end
 
-#  def test_naptr_from_zone
-#    reader = Dnsruby::ZoneReader.new("all.rr.org.")
-#    zone = reader.process_file("zone.txt")
-#    rrset = Dnsruby::RRSet.new
-#    key_rrset = Dnsruby::RRSet.new
-#    zone.each {|rr|
-#      if ((rr.type == Dnsruby::Types.NAPTR) || ((rr.type == Dnsruby::Types.RRSIG) && (rr.type_covered == Dnsruby::Types.NAPTR)))
-#        rrset.add(rr)
-#      end
-#      if (rr.type == Dnsruby::Types.DNSKEY)
-#        key_rrset.add(rr)
-#      end
-#    }
-#     verifier = Dnsruby::SingleVerifier.new(Dnsruby::SingleVerifier::VerifierType::ANCHOR)
-#    verifier.verify_rrset(rrset, key_rrset)
-#  end
+  #  def test_naptr_from_zone
+  #    reader = Dnsruby::ZoneReader.new("all.rr.org.")
+  #    zone = reader.process_file("zone.txt")
+  #    rrset = Dnsruby::RRSet.new
+  #    key_rrset = Dnsruby::RRSet.new
+  #    zone.each {|rr|
+  #      if ((rr.type == Dnsruby::Types.NAPTR) || ((rr.type == Dnsruby::Types.RRSIG) && (rr.type_covered == Dnsruby::Types.NAPTR)))
+  #        rrset.add(rr)
+  #      end
+  #      if (rr.type == Dnsruby::Types.DNSKEY)
+  #        key_rrset.add(rr)
+  #      end
+  #    }
+  #     verifier = Dnsruby::SingleVerifier.new(Dnsruby::SingleVerifier::VerifierType::ANCHOR)
+  #    verifier.verify_rrset(rrset, key_rrset)
+  #  end
 end

data/test/ts_offline.rb

@@ -13,7 +13,10 @@
 #See the License for the specific language governing permissions and 
 #limitations under the License.
 #++
+begin
 require 'rubygems'
+rescue LoadError
+end
 require 'dnsruby'
 Dnsruby.log.level = Logger::FATAL
 require "test/unit"

data/test/ts_online.rb

@@ -41,10 +41,7 @@ if (online)
   print "Running online tests. These tests send UDP packets - some may be lost.\n"
   print "If you get the odd timeout error with these tests, try running them again.\n"
   print "It may just be that some UDP packets got lost the first time...\n"
-  require "test/tc_rr-opt.rb"
-  require "test/tc_res_config.rb"
   require "test/tc_resolver.rb"
-  require "test/tc_dns.rb"
   require "test/tc_dnsruby.rb"
   #  require "test/tc_inet6.rb"
   #  require "test/tc_recurse.rb"
@@ -52,7 +49,6 @@ if (online)
 #  require "test/tc_queue.rb"
   require "test/tc_recur.rb"
   #  require "test/tc_soak.rb"
- require "test/tc_cache.rb"
 
   # Check if we can contact the server - if we can't, then abort the test 
   # (but tell user that test has not been run due to connectivity problems)
@@ -73,6 +69,10 @@ if (online)
 
     require "test/tc_single_resolver.rb"
     require "test/tc_axfr.rb"
+    require "test/tc_cache.rb"
+    require "test/tc_dns.rb"
+    require "test/tc_rr-opt.rb"
+    require "test/tc_res_config.rb"
 
     have_openssl = false
     begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnsruby
 version: !ruby/object:Gem::Version 
-  version: "1.45"
+  version: "1.46"
 platform: ruby
 authors: 
 - AlexD
@@ -9,7 +9,7 @@ autorequire: dnsruby
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +00:00
+date: 2010-04-07 00:00:00 +01:00
 default_executable: 
 dependencies: []