dnsruby 1.70.0 → 1.74.0

data/test/tc_resolver.rb

@@ -74,13 +74,25 @@ class TestResolver < Minitest::Test
 
   def test_send_plain_message
     resolver = Resolver.new('1.1.1.1')
-    response, error = resolver.send_plain_message(Message.new("example.com", Types.A))
+
+    response, error = with_retries(success_check: ->((res, err)) { err.nil? || ! [Dnsruby::ServFail, Dnsruby::ResolvTimeout].include?(err.class) }) do
+      res, err = resolver.send_plain_message(Message.new("example.com", Types.A))
+      raise err if [Dnsruby::ServFail, Dnsruby::ResolvTimeout].include?(err.class)
+      [res, err]
+    end
+
     assert_nil_error(error)
     assert_valid_response(response)
 
     m = Message.new(BAD_DOMAIN_NAME)
     m.header.rd = true
-    response, error = resolver.send_plain_message(m)
+
+    response, error = with_retries(success_check: ->((res, err)) { err.class == Dnsruby::NXDomain || ! [Dnsruby::ServFail, Dnsruby::ResolvTimeout].include?(err.class) }) do
+      res, err = resolver.send_plain_message(m)
+      raise err if [Dnsruby::ServFail, Dnsruby::ResolvTimeout].include?(err.class)
+      [res, err]
+    end
+
     assert_valid_response(response)
     assert_error_is_exception(error, NXDomain)
   end
@@ -284,8 +296,73 @@ class TestResolver < Minitest::Test
   def test_eventtype_api
     #  @TODO@ TEST THE Resolver::EventType interface!
   end
-end
 
+  def capture_sent_message(res, domain, pre_opt=nil)
+    q = Queue.new
+    res.send_async(Dnsruby::Message.new("test.invalid"), q)
+    q.pop
+    resolver_ruby = res.instance_variable_get("@resolver_ruby")
+    class << resolver_ruby
+      attr_accessor :message
+      alias_method :original_send_async, :send_async
+      def send_async(msg, client_queue, client_query_id=nil)
+        @message = msg
+        original_send_async(msg, client_queue, client_query_id)
+      end
+    end
+    msg = Dnsruby::Message.new(domain)
+    msg.add_additional(pre_opt) if pre_opt
+    res.send_async(msg, q)
+    _id, _response, _error = q.pop
+    resolver_ruby.message
+  end
+
+  def test_custom_udp_size
+    [false, true].each do |dnssec_setting|
+      [512, 513].each do |udp_size_setting|
+        res = Dnsruby::Resolver.new(:udp_size => udp_size_setting, :dnssec => dnssec_setting)
+        sent_msg = capture_sent_message(res, "example.com")
+
+        # The OPT RR is only present if the udp_size is > 512
+        opt = sent_msg.get_opt
+        if dnssec_setting
+          # DNSSEC overrides udp_size to 4096
+          assert(opt)
+          assert_equal(4096, opt.klass.code)
+        else
+          if udp_size_setting <= 512
+            assert_nil(opt)
+          else
+            assert(opt)
+            assert_equal(udp_size_setting, opt.klass.code)
+          end
+        end
+        if opt
+          assert_equal(0, opt.version)
+          assert_equal(0, opt.flags)
+        end
+      end
+    end
+  end
+
+  def test_no_duplicate_opt_when_pre_existing
+    [false, true].each do |dnssec_setting|
+      [512, 513].each do |udp_size_setting|
+        res = Dnsruby::Resolver.new(:udp_size => udp_size_setting, :dnssec => dnssec_setting)
+        pre_size = dnssec_setting ? 4096 : 1024
+        pre_opt = Dnsruby::RR::OPT.new(pre_size)
+        sent_msg = capture_sent_message(res, "example.com", pre_opt)
+
+        opt = sent_msg.get_opt
+        assert(opt)
+        assert_equal(1, sent_msg.additional.length) # No duplicate added
+        assert_equal(pre_size, opt.klass.code) # Original payload size unchanged
+        assert_equal(0, opt.version)
+        assert_equal(0, opt.flags) # Flags unchanged (code doesn't modify existing OPT)
+      end
+    end
+  end
+end
 
 # Tests to see that query_raw handles send_plain_message's return values correctly.
 class TestRawQuery < Minitest::Test
@@ -400,5 +477,18 @@ class TestRawQuery < Minitest::Test
 #          Dnsruby::Cache.delete("googlöe.com", "MX")
           
   end
+
+  def test_config_info
+    res = Dnsruby::Resolver.new(
+      config_info: {
+        # contents here doesn't matter; even setting to {} is enough to cause ResolvTimeout
+        apply_domain: false,
+        apply_search_list: false,
+      },
+      query_timeout: 3, # make the timeout faster
+      )
+    res.do_caching = false
+    res.query("a.root-servers.net.", "A")
+  end
 end
 

data/test/tc_rr-unknown.rb

@@ -58,7 +58,7 @@ class TestRrUnknown < Minitest::Test
     assert_equal('10.0.0.1', rr.address.to_s,'Unknown RR representation for A parsed OK')
 
     begin
-      res=RR.new_from_string('e.example IN A \# 4  0A0000 01 11 ')
+      RR.new_from_string('e.example IN A \# 4  0A0000 01 11 ')
       flunk "Should fail on inconsistent length and hex presentation"
     rescue Exception
       # like($@, '/\\\# 4  0A0000 01 11 assert_equal inconsistent\ length does not match content/', 'Fails on inconsassert_equaltent length and hex presentation')

data/test/tc_rr.rb

@@ -319,10 +319,10 @@ class TestRR < Minitest::Test
   end
 
   def test_cert
-    rr = RR.create("test.kht.se. 60 IN CERT PGP 0 0 mQGiBDnY2vERBAD3cOxqoAYHYzS+xttvuyN9wZS8CrgwLIlT8Ewo/CCFI11PEO+gJyNPvWPRQsyt1SE60reaIsie2bQTg3DYIg0PmH+ZOlNkpKesPULzdlw4Rx3dD/M3Lkrm977h4Y70ZKC+tbvoYKCCOIkUVevny1PVZ+mB94rb0mMgawSTrct03QCg/w6aHNJFQV7O9ZQ1Fir85M3RS8cEAOo4/1ASVudz3qKZQEhU2Z9O2ydXqpEanHfGirjWYi5RelVsQ9IfBSPFaPAWzQ24nvQ18NU7TgdDQhP4meZXiVXcLBR5Mee2kByf2KAnBUF9aah5s8wZbSrC6u8xEZLuiauvWmCUIWe0Ylc1/L37XeDjrBI2pT+k183X119d6Fr1BACGfZVGsot5rxBUEFPPSrBqYXG/0hRYv9Eq8a4rJAHK2IUWYfivZgL4DtrJnHlha+H5EPQVYkIAN3nGjXoHmosY+J3Sk+GyR+dCBHEwCkoHMKph3igczCEfxAWgqKeYd5mf+QQq2JKrkn2jceiIO7s3CrepeEFAjDSGuxhZjPJVm7QoRGFuaWVsIFAuIE1haG9uZXkgPGRhbm1AcHJpbWUuZ3VzaGkub3JnPohOBBARAgAOBQI52NrxBAsDAQICGQEACgkQ+75aMGJLskn6LgCbBXUD7UmGla5e1zyhuY667hP3F+UAoJIeDZJyRFkQAmb+u8KekRyLD1MLtDJEYW5pZWwgTWFob25leSAoU2Vjb25kYXJ5IEVtYWlsKSA8Z3VzaGlAZ3VzaGkub3JnPohgBBMRAgAgBQJF1J/XAhsjBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ+75aMGJLskkVhACggsivQ9qLhfdA1rGm6f8LRJBSC4wAoI930h+/hshClj6AkNwGRtHdf5XJuQINBDnY2vQQCAD2Qle3CH8IF3KiutapQvMF6PlTETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33TGSGSfgMg71l6RfUodNQ+PVZX9x2Uk89PY3bzpnhV5JZzf24rnRPxfx2vIPFRzBhznzJZv8V+bv9kV7HAarTW56NoKVyOtQa8L9GAFgr5fSI/VhOSdvNILSd5JEHNmszbDgNRR0PfIizHHxbLY7288kjwEPwpVsYjY67VYy4XTjTNP18F1dDox0YbN4zISy1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6q6Jew1XpMgs7AAICB/9eGjzF2gDh6U7I72x/6bSdlExx2LvIF92OZKc0S55IOS4Lgzs7Hbfm1aOL4oJt7wBg94xkF4cerxz7y8R9J+k3GNl14KOjbYaMAh1rdxdAzikYMH1p1hS78GMtwxky6jE5en87BGGMmnbC84JlxwN+MD7diu8D0Gkgjj/pxOp32D5jEe02wBPVjFTpFLJjpFniLUY6AohRDEdSuZwWPuoKVWhpeWkasNn5qgwGyDREbXpyPsU02BkwE4JiGs+JMMdOn9KMh5dxiuwsMM9gHiQZS3mSNBBKPWI5ZXsdStVFvapjf2FUFDXLUbTROPv1Xhqf0u7YYORFnWeVtvzKIxVaiEYEGBECAAYFAjnY2vQACgkQ+75aMGJLsklBWgCeN7z9xk52y/aoaCuF6hYb0d+3k98AoMRxvHuXI1Nc2FXY/x65PwHiUbaY")
-    rr = RR.create("all.rr.org.             IN      CERT            6 0 0 FFsAyW1dVK7hIGuvhN56r26UwJx/")
-#    rr = RR.create("all.rr.org.             IN      WKS             128.32.0.10 UDP who route timed domain")
-    rr = RR.create('selector._domainkey.all.rr.org. IN      TXT             "v=DKIM1; n=Use=20DKIM; p=AwEAAZfbYw8SffZwsbrCLbC+JLErREIF6Yfe9aqsa1Pz6tpGWiLxm9rSL6/YoBvNP3UWX91YDF0JMo6lhu3UIZjITvIwDhx+RJYko9vLzaaJKXGf3ygy6z+deWoZJAV1lTY0Ltx9genboe88CSCHw9aSLkh0obN9Ck8R6zAMYR19ciM/; t=s"')
+    RR.create("test.kht.se. 60 IN CERT PGP 0 0 mQGiBDnY2vERBAD3cOxqoAYHYzS+xttvuyN9wZS8CrgwLIlT8Ewo/CCFI11PEO+gJyNPvWPRQsyt1SE60reaIsie2bQTg3DYIg0PmH+ZOlNkpKesPULzdlw4Rx3dD/M3Lkrm977h4Y70ZKC+tbvoYKCCOIkUVevny1PVZ+mB94rb0mMgawSTrct03QCg/w6aHNJFQV7O9ZQ1Fir85M3RS8cEAOo4/1ASVudz3qKZQEhU2Z9O2ydXqpEanHfGirjWYi5RelVsQ9IfBSPFaPAWzQ24nvQ18NU7TgdDQhP4meZXiVXcLBR5Mee2kByf2KAnBUF9aah5s8wZbSrC6u8xEZLuiauvWmCUIWe0Ylc1/L37XeDjrBI2pT+k183X119d6Fr1BACGfZVGsot5rxBUEFPPSrBqYXG/0hRYv9Eq8a4rJAHK2IUWYfivZgL4DtrJnHlha+H5EPQVYkIAN3nGjXoHmosY+J3Sk+GyR+dCBHEwCkoHMKph3igczCEfxAWgqKeYd5mf+QQq2JKrkn2jceiIO7s3CrepeEFAjDSGuxhZjPJVm7QoRGFuaWVsIFAuIE1haG9uZXkgPGRhbm1AcHJpbWUuZ3VzaGkub3JnPohOBBARAgAOBQI52NrxBAsDAQICGQEACgkQ+75aMGJLskn6LgCbBXUD7UmGla5e1zyhuY667hP3F+UAoJIeDZJyRFkQAmb+u8KekRyLD1MLtDJEYW5pZWwgTWFob25leSAoU2Vjb25kYXJ5IEVtYWlsKSA8Z3VzaGlAZ3VzaGkub3JnPohgBBMRAgAgBQJF1J/XAhsjBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ+75aMGJLskkVhACggsivQ9qLhfdA1rGm6f8LRJBSC4wAoI930h+/hshClj6AkNwGRtHdf5XJuQINBDnY2vQQCAD2Qle3CH8IF3KiutapQvMF6PlTETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33TGSGSfgMg71l6RfUodNQ+PVZX9x2Uk89PY3bzpnhV5JZzf24rnRPxfx2vIPFRzBhznzJZv8V+bv9kV7HAarTW56NoKVyOtQa8L9GAFgr5fSI/VhOSdvNILSd5JEHNmszbDgNRR0PfIizHHxbLY7288kjwEPwpVsYjY67VYy4XTjTNP18F1dDox0YbN4zISy1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6q6Jew1XpMgs7AAICB/9eGjzF2gDh6U7I72x/6bSdlExx2LvIF92OZKc0S55IOS4Lgzs7Hbfm1aOL4oJt7wBg94xkF4cerxz7y8R9J+k3GNl14KOjbYaMAh1rdxdAzikYMH1p1hS78GMtwxky6jE5en87BGGMmnbC84JlxwN+MD7diu8D0Gkgjj/pxOp32D5jEe02wBPVjFTpFLJjpFniLUY6AohRDEdSuZwWPuoKVWhpeWkasNn5qgwGyDREbXpyPsU02BkwE4JiGs+JMMdOn9KMh5dxiuwsMM9gHiQZS3mSNBBKPWI5ZXsdStVFvapjf2FUFDXLUbTROPv1Xhqf0u7YYORFnWeVtvzKIxVaiEYEGBECAAYFAjnY2vQACgkQ+75aMGJLsklBWgCeN7z9xk52y/aoaCuF6hYb0d+3k98AoMRxvHuXI1Nc2FXY/x65PwHiUbaY")
+    RR.create("all.rr.org.             IN      CERT            6 0 0 FFsAyW1dVK7hIGuvhN56r26UwJx/")
+    # RR.create("all.rr.org.             IN      WKS             128.32.0.10 UDP who route timed domain")
+    RR.create('selector._domainkey.all.rr.org. IN      TXT             "v=DKIM1; n=Use=20DKIM; p=AwEAAZfbYw8SffZwsbrCLbC+JLErREIF6Yfe9aqsa1Pz6tpGWiLxm9rSL6/YoBvNP3UWX91YDF0JMo6lhu3UIZjITvIwDhx+RJYko9vLzaaJKXGf3ygy6z+deWoZJAV1lTY0Ltx9genboe88CSCHw9aSLkh0obN9Ck8R6zAMYR19ciM/; t=s"')
   end
 
   def test_dhcid

data/test/tc_single_resolver.rb

@@ -1,12 +1,12 @@
 # --
 # 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.
@@ -53,7 +53,7 @@ class TestSingleResolver < Minitest::Test
 
   def test_simple
     res = SingleResolver.new()
-    m = res.query("ns1.google.com.")
+    res.query("ns1.google.com.")
   end
 
   def test_timeout
@@ -71,7 +71,7 @@ class TestSingleResolver < Minitest::Test
         res.port = port
         res.packet_timeout=1
         start_time = Time.now.to_i
-        m = res.query("a.t.net-dns.org")
+        res.query("a.t.net-dns.org")
         fail "Got response when should have got none"
       rescue ResolvTimeout
         stop_time = Time.now.to_i
@@ -87,7 +87,7 @@ class TestSingleResolver < Minitest::Test
         res.packet_timeout=1
         start_time = Time.now.to_i
 #      TheLog.level = Logger::DEBUG
-        m = res.query("a.t.net-dns.org")
+        res.query("a.t.net-dns.org")
         fail "TCP timeouts"
       rescue ResolvTimeout
         #         print "Got Timeout for TCP\n"
@@ -131,15 +131,7 @@ class TestSingleResolver < Minitest::Test
     res = SingleResolver.new
 
     Rrs.each do |data|
-      packet=nil
-      2.times do
-        begin
-          packet = res.query(data[:name], data[:type])
-        rescue ResolvTimeout
-        end
-        break if packet
-      end
-      assert(packet)
+      packet = with_retries { res.query(data[:name], data[:type]) }
       assert_equal(packet.question[0].qclass, 'IN', 'Class correct')
 
       assert(packet, "Got an answer for #{data[:name]} IN #{data[:type]}")
@@ -189,11 +181,11 @@ class TestSingleResolver < Minitest::Test
   def test_res_config
     res = Dnsruby::SingleResolver.new
 
-    res.server=('a.t.net-dns.org')
+    with_retries(exceptions: [ArgumentError], success_check: ->(_) { true }) { res.server=('a.t.net-dns.org') }
     ip = res.server
     assert_equal('10.0.1.128', ip.to_s, 'nameserver() looks up IP.')
 
-    res.server=('cname.t.net-dns.org')
+    with_retries(exceptions: [ArgumentError], success_check: ->(_) { true }) { res.server=('cname.t.net-dns.org') }
     ip = res.server
     assert_equal('10.0.1.128', ip.to_s, 'nameserver() looks up cname.')
   end

data/test/tc_tcp_pipelining.rb

@@ -67,9 +67,9 @@ class TestTCPPipelining < Minitest::Test
 
     # Instantiate a new server that uses our tcp pipelining handler
     # For each query the server sends the query upstream (193.0.14.129)
-    options = {
-        server_class: TCPPipeliningServer,
-    }
+    # options = {
+    #     server_class: TCPPipeliningServer,
+    # }
 
     #RubyDNS::run_server(options) || true
     if !@@server

data/test/tc_tkey.rb

@@ -29,12 +29,7 @@ class TestTKey < Minitest::Test
     #  Canned data.
     # ------------------------------------------------------------------------------
 
-    zone	= "example.com"
-    name	= "123456789-test"
-    klass	= "IN"
-    type	= Dnsruby::Types.TKEY
     algorithm   = "fake.algorithm.example.com"
-    key         = "fake key"
     inception   = 100000 # use a strange fixed inception time to give a fixed
     #  checksum
     expiration  = inception + 24*60*60
@@ -72,5 +67,4 @@ class TestTKey < Minitest::Test
     # @TODO@ Test TKEY against server!
 
   end
-
-  end
+end

data/test/tc_update.rb

@@ -34,7 +34,6 @@ class TestUpdate < Minitest::Test
     zone	= "example.com";
     name	= "foo.example.com";
     klass	= Classes.CLASS32;
-    klass2  = Classes.CH;
     type	= Types.A;
     ttl	    = 43200;
     rdata	= "10.1.2.3";

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dnsruby
 version: !ruby/object:Gem::Version
-  version: 1.70.0
+  version: 1.74.0
 platform: ruby
 authors:
 - Alex Dalitz
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.18.0
+        version: '5.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.18.0
+        version: '5.25'
 - !ruby/object:Gem::Dependency
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +79,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +127,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.23
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: simpleidn
   requirement: !ruby/object:Gem::Requirement
@@ -131,11 +178,13 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - DNSSEC
+- EVENTMACHINE
 - EXAMPLES
 - README.md
-- EVENTMACHINE
 files:
 - ".coveralls.yml"
+- ".github/FUNDING.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".yardopts"
@@ -148,6 +197,7 @@ files:
 - RELEASE_NOTES.md
 - Rakefile
 - SIGNED_UPDATES
+- cache_delay.rb
 - demo/axfr.rb
 - demo/check_soa.rb
 - demo/check_zone.rb
@@ -160,6 +210,7 @@ files:
 - demo/to_resolve.txt
 - demo/trace_dns.rb
 - dnsruby.gemspec
+- fd.ruby
 - lib/dnsruby.rb
 - lib/dnsruby/DNS.rb
 - lib/dnsruby/bit_mapping.rb
@@ -254,6 +305,7 @@ files:
 - test/tc_dns.rb
 - test/tc_dnskey.rb
 - test/tc_ds.rb
+- test/tc_ecdsa.rb
 - test/tc_encoding.rb
 - test/tc_escapedchars.rb
 - test/tc_gpos.rb
@@ -328,15 +380,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.8.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Ruby DNS(SEC) implementation
 test_files: