dnsruby 1.60.0 → 1.60.1

data/test/spec_helper.rb

@@ -4,9 +4,9 @@ if ENV['RUN_EXTRA_TASK'] == 'TRUE'
 
   require 'simplecov'
 
-  SimpleCov.formatter =
-    SimpleCov::Formatter::MultiFormatter[SimpleCov::Formatter::HTMLFormatter,
-                                         Coveralls::SimpleCov::Formatter]
+  # SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+      # [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter])
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
   SimpleCov.start do
     add_filter 'test/'
   end

data/test/tc_caa.rb

@@ -0,0 +1,49 @@
+
+# --
+# 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 'pry'
+
+class TestCAA < Minitest::Test
+
+  include Dnsruby
+
+  def test_caa
+    {'foo.com. IN CAA 0 issue "ca.example.net"' => [0, 'issue', 'ca.example.net'],
+     'foo.com. IN CAA 1 issue "ca.example.net"' => [1, 'issue', 'ca.example.net'],
+     'foo.com. IN CAA 0 issuewild "ca.example.net"' => [0, 'issuewild', 'ca.example.net'],
+     'foo.com. IN CAA 0 iodef "mailto:security@example.com"' => [0, 'iodef', 'mailto:security@example.com'],
+     'foo.com. IN CAA 0 issue "ca.example.net; account=230123"' => [0, 'issue', 'ca.example.net; account=230123']
+    }.each do |text, data|
+      caa = RR.create(text)
+      assert_equal(data[0], caa.flag)
+      assert_equal(data[1], caa.property_tag)
+      assert_equal(data[2], caa.property_value)
+      m = Dnsruby::Message.new
+      m.add_additional(caa)
+      data = m.encode
+      m2 = Dnsruby::Message.decode(data)
+      caa2 = m2.additional()[0]
+      assert(caa.flag == caa2.flag)
+      assert(caa.property_tag == caa2.property_tag)
+      assert(caa.property_value == caa2.property_value)
+      assert(caa == caa2)
+    end
+  end
+
+end
+

data/test/tc_cache.rb

@@ -16,9 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
-
 class TestCache < Minitest::Test
+
+  include Dnsruby
+
   def test_cache
     cache = Cache.new
     m1 = Message.new("example.com.", Types.A, Classes.IN)
@@ -93,27 +94,16 @@ class TestCache < Minitest::Test
   def test_resolver_do_caching
     #  Get the records back from the test zone
     Dnsruby::PacketSender.clear_caches
-    res = Resolver.new("ns.nlnetlabs.nl.")
-    # res = Resolver.new("ns0.validation-test-servers.nominet.org.uk.")
+    res = Resolver.new()
     res.do_caching = false
     assert(!res.do_caching)
-    res.udp_size = 4096
-    ret = res.query("net-dns.org", Types.TXT)
-    # ret = res.query("overflow.dnsruby.validation-test-servers.nominet.org.uk", Types.TXT)
-#    print "#{ret}\n"
+    ret = res.query("example.com")
     assert(!ret.cached)
     assert(ret.rcode == RCode.NoError)
-    assert(ret.header.aa)
-    #  Store the ttls
-    first_ttls = ret.answer.rrset(
-      "net-dns.org", Types.TXT).ttl
-      # "overflow.dnsruby.validation-test-servers.nominet.org.uk", Types.TXT).ttl
     #  Wait a while
     sleep(1)
     #  Ask for the same records
-    ret = res.query("net-dns.org", Types.TXT)
-    # ret = res.query("overflow.dnsruby.validation-test-servers.nominet.org.uk", Types.TXT)
-#    print "#{ret}\n"
+    ret = res.query("example.com")
     assert(ret.rcode == RCode.NoError)
     assert(!ret.cached)
   end

data/test/tc_dlv.rb

@@ -16,9 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
-
 class TestDlv < Minitest::Test
+
+  include Dnsruby
+
   def test_dlv
     #  Enable DLV (only) for validation.
     #  Try to validate some records which can only be done through dlv

data/test/tc_dns.rb

@@ -16,8 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestDNS < Minitest::Test
+
+  include Dnsruby
+
   def setup
     Dnsruby::Config.reset
   end

data/test/tc_ds.rb

@@ -20,6 +20,9 @@ require 'openssl'
 require 'digest/sha2'
 
 class DsTest < Minitest::Test
+
+  include Dnsruby
+
   DLVINPUT = "dskey.example.com. 86400 IN DLV 60485 5 1 ( 2BB183AF5F22588179A53B0A" +
     "98631FAD1A292118 )"
   INPUT = "dskey.example.com. 86400 IN DS 60485 5 1 ( 2BB183AF5F22588179A53B0A" +
@@ -37,7 +40,7 @@ class DsTest < Minitest::Test
       DS2 = "dskey.example.com. 86400 IN DS 60485 5 2   ( D4B7D520E7BB5F0F67674A0C"+
                                                 "CEB1E3E0614B93C4F9E99B83"+
                                                 "83F6A1E4469DA50A )"
-  include Dnsruby
+
   def test_ds_from_string
     ds = Dnsruby::RR.create(INPUT)
     assert_equal(60485, ds.key_tag)

data/test/tc_escapedchars.rb

@@ -16,8 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestEscapedChars < Minitest::Test
+
+  include Dnsruby
+
   def test_one
     Name::Label.set_max_length(150)
     # 

data/test/tc_gpos.rb

@@ -2,11 +2,11 @@ require_relative 'spec_helper'
 
 require_relative '../lib/dnsruby/resource/GPOS.rb'
 
-include Dnsruby
-
 # Tests GPOS resource record.  See bottom of file for sample zone file.
 class TestGPOS < Minitest::Test
 
+  include Dnsruby
+
   EXAMPLE_LONGITUDE  = '10.0'
   EXAMPLE_LATITUDE   = '20.0'
   EXAMPLE_ALTITUDE   = '30.0'

data/test/tc_header.rb

@@ -16,8 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestHeader < Minitest::Test
+
+  include Dnsruby
+
   def test_header
     header = Header.new();
     assert(header, "new() returned something")

data/test/tc_hip.rb

@@ -17,8 +17,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestHIP < Minitest::Test
+
+  include Dnsruby
+
   def test_hip
     [{"www.example.com.      IN  HIP ( 2 200100107B1A74DF365639CC39F1D578
                                 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D )" =>

data/test/tc_hs.rb

@@ -1,7 +1,5 @@
 require_relative 'spec_helper'
 
-include Dnsruby
-
 class TestDNS < Minitest::Test
 
   def setup

data/test/tc_ipseckey.rb

@@ -17,8 +17,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestIPSECKEY < Minitest::Test
+
+  include Dnsruby
+
   def test_ipseckey
     [{"38.1.0.192.in-addr.arpa. 7200 IN     IPSECKEY ( 10 3 2
                     mygateway.example.com.

data/test/tc_message.rb

@@ -85,22 +85,6 @@ class TestMessage < Minitest::Test
     #  TODO: Add more tests.
   end
 
-  def test_class_corruption
-    assert(Classes.new('IN') == "IN")
-    response_as_string = "\x00\x04\x00\x01\x00\x06\xfa\x17\x4e\x9a\xf6\xdb\x00\x00\x08\x00\x45\x00\x00\x45\x06\xb4\x00\x00\x40\x11\xf1\x54\xc0\xa8\x00\xbc\xc0\xa8\x00\x93\x00\x35\x8a\x63\x00\x31\x00\x00\xa8\x05\x81\x81\x00\x01\x00\x00\x00\x00\x00\x00\x06\x67\x6f\x6f\x67\x6c\x65\x10\x63\x6f\x6d\x00\x00\x12\x00\x01\x00\x00\x29\x10\x00\x00\x00\x00\x00\x00\x0b\x00\x08"
-    assert(Classes.new('IN') == "IN")
-    begin
-      message = Message.decode(response_as_string)
-    rescue
-    end
-    assert(Classes.new('IN') == "IN")
-
-    msg = Message.new("bbc.co.uk", 'A', 8)
-    msg = Message.new("bbc.co.uk", 'A', 1)
-    assert(Classes.new('IN') == "IN")
-
-  end
-
   def test_equals
     response_as_string = "\x10\a\x81\x90\x00\x01\x00\x04\x00\x00\x00\x06\x03cnn\x03com\x00\x00\x02\x00\x01\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x14\x03ns3\ntimewarner\x03net\x00\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x11\x03ns2\x03p42\x06dynect\xC04\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x06\x03ns1\xC0)\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x06\x03ns1\xC0I\xC0%\x00\x01\x00\x01\x00\x001\xA2\x00\x04\xC7\aD\xEE\xC0E\x00\x01\x00\x01\x00\x00\xB1\x0E\x00\x04\xCC\r\xFA*\xC0b\x00\x01\x00\x01\x00\x009`\x00\x04\xCCJl\xEE\xC0t\x00\x01\x00\x01\x00\x00\xBDg\x00\x04\xD0NF*\xC0t\x00\x1C\x00\x01\x00\x00\x00\xBB\x00\x10 \x01\x05\x00\x00\x90\x00\x01\x00\x00\x00\x00\x00\x00\x00B\x00\x00)\x0F\xA0\x00\x00\x80\x00\x00\x00".force_encoding("ASCII-8BIT")
     message = Message.decode(response_as_string)

data/test/tc_name.rb

@@ -16,8 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestName < Minitest::Test
+
+  include Dnsruby
+
   def test_label_length
     Name::Label.set_max_length(Name::Label::MaxLabelLength) # Other tests may have changed this
     #  Test max label length = 63

data/test/tc_naptr.rb

@@ -16,8 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestNAPTR < Minitest::Test
+
+  include Dnsruby
+
   def test_naptr
     txt = "example.com. IN NAPTR 100  50  \"s\"  \"z3950+I2L+I2C\"     \"\"  _z3950._tcp.gatech.edu."
     naptr = RR.create(txt)

data/test/tc_nsec.rb

@@ -16,12 +16,12 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
-
 class NsecTest < Minitest::Test
+
+  include Dnsruby
+
   INPUT = "alfa.example.com. 86400 IN NSEC host.example.com. ( " +
     "A MX RRSIG NSEC TYPE1234 )"
-  include Dnsruby
   def test_nsec_from_string
     nsec = Dnsruby::RR.create(INPUT)
     assert_equal("host.example.com", nsec.next_domain.to_s)

data/test/tc_nsec3.rb

@@ -17,11 +17,13 @@
 require_relative 'spec_helper'
 
 class Nsec3Test < Minitest::Test
+
+  include Dnsruby
+
   INPUT = "2t7b4g4vsa5smi47k61mv5bv1a22bojr.example. 3600 IN NSEC3 1 1 12 aabbccdd ( " +
     "2vptu5timamqttgl4luu9kg21e0aor3s A RRSIG )"
   INPUT2 = "2t7b4g4vsa5smi47k61mv5bv1a22bojr.example. 3600 IN NSEC3 1 1 12 aabbccdd " +
     "2vptu5timamqttgl4luu9kg21e0aor3s"
-  include Dnsruby
   def test_nsec_from_string
     nsec = Dnsruby::RR.create(INPUT)
 #    assert_equal(H("x.y.w.example"), nsec.next_hashed.to_s)

data/test/tc_nsec3param.rb

@@ -17,9 +17,11 @@
 require_relative 'spec_helper'
 
 class Nsec3ParamTest < Minitest::Test
-  INPUT = "example. 3600 IN NSEC3PARAM 1 0 12 aabbccdd"
 
   include Dnsruby
+
+  INPUT = "example. 3600 IN NSEC3PARAM 1 0 12 aabbccdd"
+
   def test_nsec_from_string
     nsec = Dnsruby::RR.create(INPUT)
 

data/test/tc_nxt.rb

@@ -3,11 +3,11 @@ require_relative 'spec_helper'
 require_relative '../lib/dnsruby/resource/NXT'
 require_relative '../lib/dnsruby/code_mappers'
 
-include Dnsruby
-
 # Tests NXT resource record.  See bottom of file for sample zone file.
 class TestNXT < Minitest::Test
 
+  include Dnsruby
+
   # Get this by running the following script:
   # require 'dnsruby'
   # include Dnsruby

data/test/tc_packet.rb

@@ -16,8 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestPacket < Minitest::Test
+
+  include Dnsruby
+
   def test_packet
     domain = "example.com."
     type = "MX"
@@ -294,5 +296,4 @@ f4 00 31 04 64 6e 73 31 05 69 63 61 6e 6e 03 6f
     assert_equal(m.to_s, m2.to_s, "Clone to_s failed")
     assert_equal(m, m2, "Clone failed")
   end
-
 end

data/test/tc_packet_unique_push.rb

@@ -16,8 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestPacketUniquePush < Minitest::Test
+
+  include Dnsruby
+
   #   def test_packUniquePush
   # 
   # 

data/test/tc_ptrin.rb

@@ -1,8 +1,9 @@
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestPtrIn < Minitest::Test
 
+  include Dnsruby
+
   # Tests that message raises no error when decoded, encoded, and decoded again.
   def verify(message_data_as_hex_string, canonical = false)
     # Dnsruby.log.level = Logger::DEBUG

data/test/tc_question.rb

@@ -16,8 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestQuestion < Minitest::Test
+
+  include Dnsruby
+
   def test_question
     domain = "example.com"
     type = Types.MX

data/test/tc_res_env.rb

@@ -16,8 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestResolverEnv < Minitest::Test
+
+  include Dnsruby
+
 # @todo@ Dnsruby does not provide this functionality
   def test_res_env
     ENV['RES_NAMESERVERS'] = '10.0.1.128 10.0.2.128';

data/test/tc_res_opt.rb

@@ -16,8 +16,10 @@
 
 require_relative 'spec_helper'
 
-include Dnsruby
 class TestResOpt < Minitest::Test
+
+  include Dnsruby
+
   def test_dns_file
 
     #  .txt because this test will run under windows, unlike the other file

data/test/tc_resolv.rb

@@ -17,7 +17,6 @@
 require_relative 'spec_helper'
 require_relative '../lib/dnsruby/resolv'
 
-include Dnsruby
 class TestResolv < Minitest::Test
 
   RELATIVE_NAME = 'google-public-dns-a.google.com'
@@ -56,7 +55,7 @@ class TestResolv < Minitest::Test
 
     assert_equal(RELATIVE_NAME, Dnsruby::Resolv.getname(IPV4_ADDR).to_s)
 
-    assert_raises(Dnsruby::Resolv::ResolvError) do
+    assert_raises(Dnsruby::ResolvError) do
       Dnsruby::Resolv.getname(RELATIVE_NAME)
     end
 

data/test/tc_resolver.rb

@@ -17,7 +17,6 @@ require_relative 'spec_helper'
 
 require 'socket'
 
-include Dnsruby
 # @TODO@ We also need a test server so we can control behaviour of server to test
 # different aspects of retry strategy.
 # Of course, with Ruby's limit of 256 open sockets per process, we'd need to run
@@ -180,7 +179,7 @@ class TestResolver < Minitest::Test
       #  Work out what time should be, then time it to check
       expected = ((2**(retry_times-1))*retry_delay) + packet_timeout
       begin
-        res = Resolver.new({:nameserver => "10.0.1.128"})
+        res = Dnsruby::Resolver.new({:nameserver => "10.0.1.128"})
         #       res = Resolver.new({:nameserver => "213.248.199.17"})
         res.packet_timeout=packet_timeout
         res.retry_times=retry_times
@@ -191,13 +190,13 @@ class TestResolver < Minitest::Test
       rescue ResolvTimeout
         stop=Time.now
         time = stop-start
-        assert(time <= expected *1.3 && time >= expected *0.9, "Wrong time take, expected #{expected}, took #{time}")
+        assert(time <= expected * 1.3 && time >= expected * 0.9, "Wrong time take, expected #{expected}, took #{time}")
       end
   end
   end
 
   def test_packet_timeout
-        res = Resolver.new({:nameserver => []})
+        res = Dnsruby::Resolver.new({:nameserver => []})
 #      res = Resolver.new({:nameserver => "10.0.1.128"})
       start=stop=0
       retry_times = retry_delay = packet_timeout= 10
@@ -212,16 +211,16 @@ class TestResolver < Minitest::Test
         start=Time.now
         m = res.send_message(Message.new("a.t.dnsruby.validation-test-servers.nominet.org.uk", Types.A))
         fail
-      rescue ResolvTimeout
+      rescue Dnsruby::ResolvTimeout
         stop=Time.now
         time = stop-start
-        assert(time <= expected *1.3 && time >= expected *0.9, "Wrong time take, expected #{expected}, took #{time}")
+        assert(time <= expected * 1.3 && time >= expected * 0.9, "Wrong time take, expected #{expected}, took #{time}")
       end    #
   end
 
   def test_queue_packet_timeout
 #    if (!RUBY_PLATFORM=~/darwin/)
-      res = Resolver.new({:nameserver => "10.0.1.128"})
+      res = Dnsruby::Resolver.new({:nameserver => "10.0.1.128"})
 #      bad = SingleResolver.new("localhost")
       res.add_server("localhost")
       expected = 2
@@ -235,14 +234,14 @@ class TestResolver < Minitest::Test
       assert(ret==nil)
       assert(err.class == ResolvTimeout, "#{err.class}, #{err}")
       time = stop-start
-      assert(time <= expected *1.3 && time >= expected *0.9, "Wrong time take, expected #{expected}, took #{time}")
+      assert(time <= expected * 1.3 && time >= expected * 0.9, "Wrong time take, expected #{expected}, took #{time}")
 #    end
   end
 
   def test_illegal_src_port
     #  Also test all singleresolver ports ok
     #  Try to set src_port to an illegal value - make sure error raised, and port OK
-    res = Resolver.new
+    res = Dnsruby::Resolver.new
     res.port = 56789
     tests = [53, 387, 1265, 3210, 48619]
     tests.each do |bad_port|
@@ -300,7 +299,7 @@ class TestRawQuery < Minitest::Test
   # Returns a new resolver whose send_plain_message method always returns
   # nil for the response, and a RuntimeError for the error.
   def resolver_returning_error
-    resolver = Resolver.new
+    resolver = Dnsruby::Resolver.new
     def resolver.send_plain_message(_message)
       [nil, CustomError.new]
     end
@@ -311,7 +310,7 @@ class TestRawQuery < Minitest::Test
   # :response_from_send_plain_message instead of a real Dnsruby::Message,
   # for easy comparison in the tests.
   def resolver_returning_response
-    resolver = Resolver.new
+    resolver = Dnsruby::Resolver.new
     def resolver.send_plain_message(_message)
       [:response_from_send_plain_message, nil]
     end
@@ -322,7 +321,7 @@ class TestRawQuery < Minitest::Test
   # an ArgumentError is raised.
   def test_bad_strategy
     assert_raises(ArgumentError) do
-      resolver_returning_error.query_raw(Message.new, :invalid_strategy)
+      resolver_returning_error.query_raw(Dnsruby::Message.new, :invalid_strategy)
     end
   end
 
@@ -330,47 +329,47 @@ class TestRawQuery < Minitest::Test
   # and the error strategy is :raise, query_raw raises an error.
   def test_raise_error
     assert_raises(CustomError) do
-      resolver_returning_error.query_raw(Message.new, :raise)
+      resolver_returning_error.query_raw(Dnsruby::Message.new, :raise)
     end
   end
 
   # Tests that if you don't specify an error strategy, an error will be
   # returned rather than raised (i.e. strategy defaults to :return).
   def test_return_error_is_default
-    _response, error = resolver_returning_error.query_raw(Message.new)
+    _response, error = resolver_returning_error.query_raw(Dnsruby::Message.new)
     assert error.is_a?(CustomError)
   end
 
   # Tests that when no error is returned, no error is raised.
   def test_raise_no_error
-    response, _error = resolver_returning_response.query_raw(Message.new, :raise)
+    response, _error = resolver_returning_response.query_raw(Dnsruby::Message.new, :raise)
     assert_equal :response_from_send_plain_message, response
   end
 
   # Test that when send_plain_message returns an error, and the error strategy
   # is set to :return, then an error is returned.
   def test_return_error
-    _response, error = resolver_returning_error.query_raw(Message.new, :return)
+    _response, error = resolver_returning_error.query_raw(Dnsruby::Message.new, :return)
     assert error.is_a?(CustomError)
   end
 
   # Test that when send_plain_message returns a valid and response
   # and nil error, the same are returned by query_raw.
   def test_return_no_error
-    response, error = resolver_returning_response.query_raw(Message.new, :return)
+    response, error = resolver_returning_response.query_raw(Dnsruby::Message.new, :return)
     assert_nil error
     assert_equal :response_from_send_plain_message, response
   end
 
   def test_2_args_init
-    options = Resolver.create_tsig_options(KEY_NAME, KEY)
+    options = Dnsruby::Resolver.create_tsig_options(KEY_NAME, KEY)
     assert_equal KEY_NAME, options[:name]
     assert_equal KEY, options[:key]
     assert_nil options[:algorithm]
   end
 
   def test_3_args_init
-    options = Resolver.create_tsig_options(KEY_NAME,KEY,ALGO)
+    options = Dnsruby::Resolver.create_tsig_options(KEY_NAME,KEY,ALGO)
     assert_equal KEY_NAME, options[:name]
     assert_equal KEY, options[:key]
     assert_equal ALGO, options[:algorithm]