dnsruby 1.55 → 1.56.0

data/test/tc_sshfp.rb

@@ -1,27 +1,24 @@
- 
-#--
-#Copyright 2007 Nominet UK
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
-#
+
+# --
+# Copyright 2007 Nominet UK
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
 #     http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#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'
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+require_relative 'spec_helper'
+
 include Dnsruby
-class TestSSHFP < Test::Unit::TestCase
+class TestSSHFP < Minitest::Test
   def test_sshfp
     txt = "apt-blade6.nominet.org.uk. 85826 IN	SSHFP	1 1 6D4CF7C68E3A959990855099E15D6E0D4DEA4FFF"
     sshfp = RR.create(txt)
@@ -29,7 +26,7 @@ class TestSSHFP < Test::Unit::TestCase
     assert(sshfp.alg == RR::SSHFP::Algorithms.RSA)
     assert(sshfp.fptype == RR::SSHFP::FpTypes.SHA1)
     assert(sshfp.fp.unpack("H*")[0].upcase == "6D4CF7C68E3A959990855099E15D6E0D4DEA4FFF")
-    
+
     m = Dnsruby::Message.new
     m.add_additional(sshfp)
     data = m.encode

data/test/tc_tcp.rb

@@ -1,26 +1,23 @@
-#--
-#Copyright 2007 Nominet UK
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License. 
-#You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0 
-#
-#Unless required by applicable law or agreed to in writing, software 
-#distributed under the License is distributed on an "AS IS" BASIS, 
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-#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'
+# --
+# Copyright 2007 Nominet UK
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+require_relative 'spec_helper'
+
 require 'socket'
-class TestTcp < Test::Unit::TestCase
+class TestTcp < Minitest::Test
   def test_TCP
     res = Dnsruby::Resolver.new()
     res.use_tcp = true
@@ -28,7 +25,7 @@ class TestTcp < Test::Unit::TestCase
     assert(ret.is_a?(Dnsruby::Message))
   end
   def test_TCP_port
-    # Need a test server so we can tell what port this message was actually sent on!
+    #  Need a test server so we can tell what port this message was actually sent on!
     port = nil
     src_port = 57923
     Dnsruby::PacketSender.clear_caches
@@ -37,7 +34,7 @@ class TestTcp < Test::Unit::TestCase
       ts = TCPServer.new(0)
       port = ts.addr[1]
         t = ts.accept
-      # Check that the source port was src_port
+      #  Check that the source port was src_port
       received_port = t.peeraddr()[1]
       packet = t.recvfrom(2)[0]
 
@@ -69,7 +66,7 @@ class TestTcp < Test::Unit::TestCase
     assert(received_port == src_port)
       assert(ret.is_a?(Dnsruby::Message))
   end
-  
+
 #  def test_no_tcp
 #    # Try to get a long response (which is truncated) and check that we have
 #    @TODO@ FIX THIS TEST!!!
@@ -86,7 +83,7 @@ class TestTcp < Test::Unit::TestCase
       @additional = Dnsruby::Message::Section.new(self)
     end
 
-    #Decode the encoded message
+    # Decode the encoded message
     def HackMessage.decode(m)
       o = HackMessage.new()
       begin
@@ -118,9 +115,9 @@ class TestTcp < Test::Unit::TestCase
           }
         }
       rescue Dnsruby::DecodeError => e
-        # So we got a decode error
-        # However, we might have been able to fill in many parts of the message
-        # So let's raise the DecodeError, but add the partially completed message
+        #  So we got a decode error
+        #  However, we might have been able to fill in many parts of the message
+        #  So let's raise the DecodeError, but add the partially completed message
         e.partial_message = o
         raise e
       end
@@ -130,10 +127,10 @@ class TestTcp < Test::Unit::TestCase
   end
 
   def test_bad_truncation
-    # Some servers don't do truncation properly.
-    # Make a UDP server which returns large badly formatted packets (arcount > num_additional), with TC bit set
-    # And make a TCP server which returns large well formatted packets
-    # Then make sure that Dnsruby recieves response correctly.
+    #  Some servers don't do truncation properly.
+    #  Make a UDP server which returns large badly formatted packets (arcount > num_additional), with TC bit set
+    #  And make a TCP server which returns large well formatted packets
+    #  Then make sure that Dnsruby recieves response correctly.
         Dnsruby::PacketSender.clear_caches
     socket = UDPSocket.new
     socket.bind("127.0.0.1", 0)
@@ -176,7 +173,7 @@ class TestTcp < Test::Unit::TestCase
 
 
 
-        # Now send query
+        #  Now send query
     res = Dnsruby::Resolver.new("127.0.0.1")
     res.port = port
     res.udp_size = 4096
@@ -190,5 +187,5 @@ class TestTcp < Test::Unit::TestCase
 
   end
 
-  #@TODO@ Check stuff like persistent sockets
+  # @TODO@ Check stuff like persistent sockets
 end

data/test/tc_tkey.rb

@@ -1,37 +1,34 @@
-#--
-#Copyright 2007 Nominet UK
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License. 
-#You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0 
-#
-#Unless required by applicable law or agreed to in writing, software 
-#distributed under the License is distributed on an "AS IS" BASIS, 
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-#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'
+# --
+# Copyright 2007 Nominet UK
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+require_relative 'spec_helper'
+
 require "digest/md5"
-class TestTKey < Test::Unit::TestCase
+class TestTKey < Minitest::Test
   def is_empty(string)
     return (string == "; no data" || string == "; rdlength = 0")
   end
-  
+
   def test_tkey
-    
-    
-    #------------------------------------------------------------------------------
-    # Canned data.
-    #------------------------------------------------------------------------------
-    
+
+
+    # ------------------------------------------------------------------------------
+    #  Canned data.
+    # ------------------------------------------------------------------------------
+
     zone	= "example.com"
     name	= "123456789-test"
     klass	= "IN"
@@ -39,15 +36,15 @@ class TestTKey < Test::Unit::TestCase
     algorithm   = "fake.algorithm.example.com"
     key         = "fake key"
     inception   = 100000 # use a strange fixed inception time to give a fixed
-    # checksum
+    #  checksum
     expiration  = inception + 24*60*60
-    
+
     rr = nil
-    
-    #------------------------------------------------------------------------------
-    # Packet creation.
-    #------------------------------------------------------------------------------
-    
+
+    # ------------------------------------------------------------------------------
+    #  Packet creation.
+    # ------------------------------------------------------------------------------
+
     rr = Dnsruby::RR.create(
       :name       => name,
       :type       => "TKEY",
@@ -60,20 +57,20 @@ class TestTKey < Test::Unit::TestCase
       :key        => "fake key",
       :other_data => ""
     )
-    
+
     packet = Dnsruby::Message.new(name, Dnsruby::Types.TKEY, "IN")
     packet.add_answer(rr)
-    
+
     z = (packet.zone)[0]
-    
+
     assert(packet,                                'new() returned packet')  #2
-    assert_equal(Dnsruby::OpCode.QUERY,       packet.header.opcode, 'header opcode correct')  #3 
+    assert_equal(Dnsruby::OpCode.QUERY,       packet.header.opcode, 'header opcode correct')  #3
     assert_equal(name,                      z.zname.to_s,  'zname correct')          #4
     assert_equal(Dnsruby::Classes.IN,                       z.zclass, 'zclass correct')         #5
-    assert_equal(Dnsruby::Types.TKEY,                     z.ztype,  'ztype correct')          #6       
-    
-    #@TODO@ Test TKEY against server!
-    
+    assert_equal(Dnsruby::Types.TKEY,                     z.ztype,  'ztype correct')          #6
+
+    # @TODO@ Test TKEY against server!
+
   end
 
   end

data/test/tc_tsig.rb

@@ -1,53 +1,50 @@
-#--
-#Copyright 2007 Nominet UK
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License. 
-#You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0 
-#
-#Unless required by applicable law or agreed to in writing, software 
-#distributed under the License is distributed on an "AS IS" BASIS, 
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-#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'
+# --
+# Copyright 2007 Nominet UK
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+require_relative 'spec_helper'
+
 require "digest/md5"
 include Dnsruby
-class TestTSig < Test::Unit::TestCase
+class TestTSig < Minitest::Test
   KEY_NAME="rubytsig"
   KEY = "8n6gugn4aJ7MazyNlMccGKH1WxD2B3UvN/O/RA6iBupO2/03u9CTa3Ewz3gBWTSBCH3crY4Kk+tigNdeJBAvrw=="
   def is_empty(string)
     return (string == "; no data" || string == "; rdlength = 0")
   end
   def test_signed_update
-    #    Dnsruby::Resolver::use_eventmachine(false)
+    #     Dnsruby::Resolver::use_eventmachine(false)
     run_test_client_signs
     run_test_resolver_signs
   end
-  #  def test_signed_update_em
-  #    begin
-  #      Dnsruby::Resolver::use_eventmachine(true)
-  #    rescue RuntimeError
-  #      Dnsruby.log.error("EventMachine not installed - not running tsig EM tests")
-  #      return
-  #    end
-  #    run_test_client_signs
-  #    run_test_resolver_signs
-  #    Dnsruby::Resolver::use_eventmachine(false)
-  #  end
-  
+  #   def test_signed_update_em
+  #     begin
+  #       Dnsruby::Resolver::use_eventmachine(true)
+  #     rescue RuntimeError
+  #       Dnsruby.log.error("EventMachine not installed - not running tsig EM tests")
+  #       return
+  #     end
+  #     run_test_client_signs
+  #     run_test_resolver_signs
+  #     Dnsruby::Resolver::use_eventmachine(false)
+  #   end
+
   def run_test_client_signs
-    # NOTE - client signing is only appropriate if DNSSEC and EDNS are switched
-    # off. Otherwise, the resolver will attempt to alter the flags and add an
-    # EDNS OPT psuedo-record to the query message, invalidating the signing.
+    #  NOTE - client signing is only appropriate if DNSSEC and EDNS are switched
+    #  off. Otherwise, the resolver will attempt to alter the flags and add an
+    #  EDNS OPT psuedo-record to the query message, invalidating the signing.
     tsig = Dnsruby::RR.create({
         :name        => KEY_NAME,
         :type        => "TSIG",
@@ -58,30 +55,30 @@ class TestTSig < Test::Unit::TestCase
         :key         => KEY,
         :error       => 0
       })
-    
+
     update = Dnsruby::Update.new("validation-test-servers.nominet.org.uk")
-    # Generate update record name, and test it has been made. Then delete it and check it has been deleted
+    #  Generate update record name, and test it has been made. Then delete it and check it has been deleted
     update_name = generate_update_name
     update.absent(update_name)
     update.add(update_name, 'TXT', 100, "test signed update")
     tsig.apply(update)
     assert(update.signed?, "Update has not been signed")
-    
+
     res = Dnsruby::Resolver.new("ns0.validation-test-servers.nominet.org.uk")
     res.udp_size=512 # Or else we needed to add OPT record already
     res.dnssec=false
     res.recurse=false
     res.query_timeout = 20
     response = res.send_message(update)
-    
+
     assert_equal( Dnsruby::RCode.NOERROR, response.rcode)
     assert(response.verified?, "Response has not been verified")
-    
-    # Now check the record exists
+
+    #  Now check the record exists
     rr = res.query(update_name, 'TXT')
     assert_equal("test signed update", rr.answer()[0].strings.join(" "), "TXT record has not been created in zone")
-    
-    # Now delete the record
+
+    #  Now delete the record
     update = Dnsruby::Update.new("validation-test-servers.nominet.org.uk")
     update.present(update_name, 'TXT')
     update.delete(update_name)
@@ -90,17 +87,17 @@ class TestTSig < Test::Unit::TestCase
     response = res.send_message(update)
     assert_equal( Dnsruby::RCode.NOERROR, response.rcode)
     assert(response.verified?, "Response has not been verified")
-    
-    # Now check the record does not exist
+
+    #  Now check the record does not exist
     Dnsruby::PacketSender.clear_caches
-    # Or else the cache will tell us it still deos!
+    #  Or else the cache will tell us it still deos!
     begin
       rr = res.query(update_name, 'TXT')
       assert(false)
     rescue Dnsruby::NXDomain
     end
   end
-  
+
   @@fudge = 0
   def generate_update_name
     update_name = Time.now.to_i.to_s + @@fudge.to_s
@@ -108,29 +105,29 @@ class TestTSig < Test::Unit::TestCase
     update_name += ".update.validation-test-servers.nominet.org.uk"
     return update_name
   end
-  
+
   def run_test_resolver_signs
     res = Dnsruby::Resolver.new("ns0.validation-test-servers.nominet.org.uk")
     res.query_timeout=20
     res.tsig=KEY_NAME, KEY
-    
+
     update = Dnsruby::Update.new("validation-test-servers.nominet.org.uk")
-    # Generate update record name, and test it has been made. Then delete it and check it has been deleted
+    #  Generate update record name, and test it has been made. Then delete it and check it has been deleted
     update_name = generate_update_name
     update.absent(update_name)
     update.add(update_name, 'TXT', 100, "test signed update")
     assert(!update.signed?, "Update has been signed")
-    
+
     response = res.send_message(update)
-    
+
     assert_equal( Dnsruby::RCode.NOERROR, response.rcode)
     assert(response.verified?, "Response has not been verified")
-    
-    # Now check the record exists
+
+    #  Now check the record exists
     rr = res.query(update_name, 'TXT')
     assert_equal("test signed update", rr.answer()[0].strings.join(" "), "TXT record has not been created in zone")
-    
-    # Now delete the record
+
+    #  Now delete the record
     update = Dnsruby::Update.new("validation-test-servers.nominet.org.uk")
     update.present(update_name, 'TXT')
     update.delete(update_name)
@@ -146,42 +143,42 @@ class TestTSig < Test::Unit::TestCase
     response = res.send_message(update)
     assert_equal( Dnsruby::RCode.NOERROR, response.rcode)
     assert(response.verified?, "Response has not been verified")
-    
-    # Now check the record does not exist
+
+    #  Now check the record does not exist
     Dnsruby::PacketSender.clear_caches
-    # Make sure the cache doesn't have an old copy!
+    #  Make sure the cache doesn't have an old copy!
     begin
       rr = res.query(update_name, 'TXT')
       assert(false)
     rescue Dnsruby::NXDomain
     end
   end
-  
+
   def test_message_signing
     m = Dnsruby::Message.new("example.com")
     m.set_tsig("name", "key")
     assert(!m.signed?)
     m.encode
     assert(m.signed?)
-    
+
     m = Dnsruby::Message.new("example.com")
     m.set_tsig("name", "key")
     assert(!m.signed?)
-    m.sign!    
+    m.sign!
     assert(m.signed?)
-    
+
     m = Dnsruby::Message.new("example.com")
     assert(!m.signed?)
     m.sign!("name", "key")
     assert(m.signed?)
   end
-  
+
   def test_signed_zone_transfer
-    # test TSIG over TCP session
+    #  test TSIG over TCP session
     axfr
     ixfr
   end
-  
+
   def axfr
     zt = Dnsruby::ZoneTransfer.new
     zt.transfer_type = Dnsruby::Types.AXFR
@@ -191,31 +188,31 @@ class TestTSig < Test::Unit::TestCase
     assert(zone.length > 0)
     assert(zt.last_tsigstate==:Verified)
   end
-  
-  # We also test IXFR here - this is because we need to update a record (using
-  # TSIG) before we can test ixfr...  
+
+  #  We also test IXFR here - this is because we need to update a record (using
+  #  TSIG) before we can test ixfr...
   def ixfr
-    # Check the SOA serial, do an update, check that the IXFR for that soa serial gives us the update we did,
-    # then delete the updated record
+    #  Check the SOA serial, do an update, check that the IXFR for that soa serial gives us the update we did,
+    #  then delete the updated record
     start_soa_serial = get_soa_serial("validation-test-servers.nominet.org.uk")
-    
-    # Now do an update
+
+    #  Now do an update
     res = Dnsruby::Resolver.new("ns0.validation-test-servers.nominet.org.uk")
     res.query_timeout=10
     res.tsig=KEY_NAME, KEY
-    
+
     update = Dnsruby::Update.new("validation-test-servers.nominet.org.uk")
-    # Generate update record name, and test it has been made. Then delete it and check it has been deleted
+    #  Generate update record name, and test it has been made. Then delete it and check it has been deleted
     update_name = Time.now.to_i.to_s + rand(100).to_s + ".update.validation-test-servers.nominet.org.uk"
     update.absent(update_name)
     update.add(update_name, 'TXT', 100, "test zone transfer")
     assert(!update.signed?, "Update has been signed")
-    
+
     response = res.send_message(update)
     assert(response.rcode == Dnsruby::RCode.NOERROR)
-    
+
     end_soa_serial = get_soa_serial("validation-test-servers.nominet.org.uk")
-    
+
     zt = Dnsruby::ZoneTransfer.new
     zt.transfer_type = Dnsruby::Types.IXFR
     zt.server = "ns0.validation-test-servers.nominet.org.uk"
@@ -225,15 +222,15 @@ class TestTSig < Test::Unit::TestCase
     assert(deltas.last.class == Dnsruby::ZoneTransfer::Delta)
     assert_equal("test zone transfer", deltas.last.adds.last.strings.join(" "))
     assert(zt.last_tsigstate==nil)
-    
-    # Now delete the updated record
+
+    #  Now delete the updated record
     update = Dnsruby::Update.new("validation-test-servers.nominet.org.uk")
     update.present(update_name, 'TXT')
     update.delete(update_name)
     response = res.send_message(update)
     assert_equal( Dnsruby::RCode.NOERROR, response.rcode)
   end
-  
+
   def get_soa_serial(name)
     soa_serial = nil
     Dnsruby::DNS.open {|dns|