dnsruby 1.72.4 → 1.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fdfd21c32204b5b7e25176c74fc30b08913ebae7470da9c5310b07d9cf276fe
-  data.tar.gz: 1ea91383c386f569733c3cf25d27b952674e8e30ab2e1c6174567926914f6928
+  metadata.gz: 37430615b19024c80842a7a51b1e3bc062edfc5437aaf635b7284a45193f2cff
+  data.tar.gz: 8c48e7b36abc8ff85fa07c4d367216f63c9043a117985292d76ef5b2c8374db8
 SHA512:
-  metadata.gz: f1a7a0767ba62316d4b5c84e4a944924dca22ddf8a27fbddfc81299362f80ffe72a6a31613a0734a3cb7f49ab8f3bf34af2af9349c04c7c4b3bb732d35f55256
-  data.tar.gz: a1560b6ac411d65b4ccd360a9741c97a585a401bc0ee9ef2bf72e5f61d87844df2af2092fb0c66ee5b6f7caef92646453daae412ad8f0af088659569c754b6c2
+  metadata.gz: 6480cd717d542a445fe756f18fc0a12bb2c46980a5ea828a16d232914a4f77675e239df81b691b775248be0f1598b546392aaa630c96410dfdd073fd2d6d7744
+  data.tar.gz: b89a52ced65d7190964aa96b0acbcfdfabb5b2eced3b5cd2e9b0e2659522610681a8c7a08bb074a38e60d58cd2de6d3bff1d2c61e1429bcfdb7c66a08db54e48

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: alexdalitz

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -8,10 +8,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.1', '3.2', '3.3' ] # , 'ruby-head' ]
+        ruby: [ '3.2', '3.3', '3.4' ] # , 'ruby-head' ]
         rubyopt: ['']
         include:
-          - ruby: '3.3'
+          - ruby: '3.4'
             rubyopt: "--enable-frozen-string-literal --debug-frozen-string-literal"
 
     name: Ruby ${{ matrix.ruby }} tests

data/RELEASE_NOTES.md

@@ -1,5 +1,14 @@
 # Release Notes
 
+## v1.73.0
+
+* Ruby 3.4 updates - thanks @zarqman!
+* Enable setting up a custom UDP size when DNSSEC validation is disabled
+* EDNS OPT RR for udp_size > 512 - thanks @mrideout!
+* Test code improvements - thanks @mrideout!
+* base64 gem version fixes
+* Fix for file descriptor leak on truncated UDP messages
+
 ## v1.72.4
 
 * allow parsing case insensitive property tags for CAA records - thanks ruby-dev!

data/dnsruby.gemspec

@@ -15,7 +15,10 @@ SPEC = Gem::Specification.new do |s|
 stub resolver. It aims to comply with all DNS RFCs, including
 DNSSEC NSEC3 support.'
   s.license = "Apache License, Version 2.0"
-  
+
+  # Add explicit Ruby version requirement
+  s.required_ruby_version = '>= 2.8.0'
+
   s.files = `git ls-files -z`.split("\x0")
 
   s.post_install_message = \
@@ -36,18 +39,14 @@ DNSSEC NSEC3 support.'
   }
 
   s.add_development_dependency 'rake', '>= 13.0.6'
-  s.add_development_dependency 'minitest', '~> 5.18.0'
+  s.add_development_dependency 'minitest', '~> 5.25'
   s.add_development_dependency 'rubydns', '>= 2.0.2'
   s.add_development_dependency 'nio4r', '>= 2.5.8'
   s.add_development_dependency 'minitest-display', '>= 0.3.1'
-  s.add_development_dependency('yard', '>= 0.9')
-  # s.add_development_dependency('io-event', '>=1.1.7')
-
-  if RUBY_VERSION >= "1.9.3"
-    s.add_development_dependency 'coveralls', '~> 0.8.23'
-  end
+  s.add_development_dependency 'yard', '>= 0.9'
+  s.add_development_dependency 'coveralls', '~> 0.8.23'
 
-  s.add_runtime_dependency 'base64', '~> 0.2.0'
-  s.add_runtime_dependency 'logger', '~> 1.6.5'
+  s.add_runtime_dependency 'base64', '>= 0.2'
+  s.add_runtime_dependency 'logger', '~> 1.6'
   s.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 end

data/lib/dnsruby/config.rb

@@ -318,11 +318,6 @@ module Dnsruby
         f.each {|line|
           line.sub!(/[#;].*/, '')
           keyword, *args = line.split(/\s+/)
-            if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.8")
-              args.each { |arg|
-                arg.untaint
-              }
-            end
           next unless keyword
           case keyword
           when 'port'

data/lib/dnsruby/hosts.rb

@@ -57,19 +57,12 @@ module Dnsruby
                 line.sub!(/#.*/, '')
                 addr, hostname, *aliases = line.split(/\s+/)
                 next unless addr
-                if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.8")
-                  addr.untaint
-                  hostname.untaint
-                end
                 @addr2name[addr] = [] unless @addr2name.include? addr
                 @addr2name[addr] << hostname
                 @addr2name[addr] += aliases
                 @name2addr[hostname] = [] unless @name2addr.include? hostname
                 @name2addr[hostname] << addr
                 aliases.each {|n|
-                  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.8")
-                    n.untaint
-                  end
                   @name2addr[n] = [] unless @name2addr.include? n
                   @name2addr[n] << addr
                 }

data/lib/dnsruby/resolver.rb

@@ -299,15 +299,17 @@ module Dnsruby
     #  is sent (TSIG signatures will be applied if configured on the Resolver).
     #  Retries are handled as the Resolver is configured to do.
     #  Incoming responses to the query are not cached or validated (although TCP
-    #  fallback will be performed if the TC bit is set and the (Single)Resolver has
-    #  ignore_truncation set to false).
-    #  Note that the Message is left untouched - this means that no OPT records are
-    #  added, even if the UDP transport for the server is specified at more than 512
-    #  bytes. If it is desired to use EDNS for this packet, then you should call
-    #  the Dnsruby::PacketSender#prepare_for_dnssec(msg), or
-    #  Dnsruby::PacketSender#add_opt_rr(msg)
-    #  The return value from this method is the [response, error] tuple. Either of
-    #  these values may be nil - it is up to the client to check.
+    #  fallback will be performed if the TC bit is set and the (Single)Resolver
+    #  has ignore_truncation set to false).
+    #  Note that the Message may be modified before sending: if the configured
+    #  udp_size is >512 bytes, DNSSEC is not set, and no OPT record is already
+    #  present, then an OPT record will be added automatically to support EDNS
+    #  per RFC 6891.
+    #  If it is desired to customize the OPT record or use EDNS in other cases,
+    #  then you should call the Dnsruby::PacketSender#prepare_for_dnssec(msg),
+    #  or Dnsruby::PacketSender#add_opt_rr(msg).
+    #  The return value from this method is the [response, error] tuple. Either
+    #  of these values may be nil - it is up to the client to check.
     #
     #  example :
     #
@@ -888,6 +890,13 @@ module Dnsruby
         return
       end
 
+      # According to RFC 6891, a UDP payload size >512 bytes requires an
+      # EDNS OPT RR in the message.
+      if @parent.udp_size > 512 && !msg.get_opt
+        TheLog.debug("Automatically adding EDNS OPT RR for udp_size=#{ @parent.udp_size }")
+        msg.add_additional(Dnsruby::RR::OPT.new(@parent.udp_size))
+      end
+
       begin
         msg.encode
       rescue EncodeError => err

data/lib/dnsruby/resource/DNSKEY.rb

@@ -383,7 +383,7 @@ module Dnsruby
           ]
         )
 
-        pkey = OpenSSL::PKey::DSA.new(asn1.to_der)
+        OpenSSL::PKey::DSA.new(asn1.to_der)
       end
 
       # RFC6605, section 4

data/lib/dnsruby/select_thread.rb

@@ -372,21 +372,25 @@ module Dnsruby
     end
 
     def remove_id(id)
-
       @@mutex.synchronize do
-        socket = @@query_hash[id].socket
-        @@timeouts.delete(id)
-        @@query_hash.delete(id)
-        @@socket_hash[socket].delete(id)
-
-        decrement_remaining_queries(socket) if persistent?(socket)
-
-        if !persistent?(socket) || max_attained?(socket)
-          @@sockets.delete(socket)
-          @@socket_hash.delete(socket)
-          Dnsruby.log.debug("Closing socket #{socket}")
-          socket.close rescue nil
-        end
+        remove_id_from_mutex_synchronized_block(id)
+      end
+    end
+
+    # THIS MUST BE CALLED FROM INSIDE A @@mutex SYNCHRONISED BLOCK!
+    def remove_id_from_mutex_synchronized_block(id)
+      socket = @@query_hash[id].socket
+      @@timeouts.delete(id)
+      @@query_hash.delete(id)
+      @@socket_hash[socket].delete(id)
+
+      decrement_remaining_queries(socket) if persistent?(socket)
+
+      if !persistent?(socket) || max_attained?(socket)
+        @@sockets.delete(socket)
+        @@socket_hash.delete(socket)
+        Dnsruby.log.debug("Closing socket #{socket}")
+        socket.close rescue nil
       end
     end
 
@@ -550,12 +554,10 @@ module Dnsruby
               query_header_id = @@query_hash[id].query.header.id
               if (query_header_id == e.partial_message.header.id)
                 #  process the response
-                client_queue = nil
-                res = nil
-                query=nil
                 client_queue = @@query_hash[id].client_queue
                 res = @@query_hash[id].single_resolver
                 query = @@query_hash[id].query
+                remove_id_from_mutex_synchronized_block(id)
 
                 #  NOW RESEND OVER TCP!
                 Thread.new {

data/lib/dnsruby/version.rb

@@ -1,3 +1,3 @@
 module Dnsruby
-  VERSION = '1.72.4'
+  VERSION = '1.73.0'
 end

data/test/spec_helper.rb

@@ -26,7 +26,7 @@ require 'minitest'
 require 'minitest/autorun'
 require 'minitest/display'
 
-MiniTest::Display.options = {
+Minitest::Display.options = {
   suite_names: true,
   color: true,
   print: {
@@ -43,3 +43,18 @@ MiniTest::Display.options = {
   require_relative '../lib/dnsruby'
   require_relative 'test_utils'
 end.()
+
+def with_retries(max_attempts: 5, exceptions: [Dnsruby::ServFail, Dnsruby::ResolvTimeout], success_check: ->(result) { result }, &block)
+  attempts = 0
+  while attempts < max_attempts
+    begin
+      result = block.call
+      return result if success_check.call(result)  # e.g., for nil-check: ->(r) { r }
+    rescue *exceptions => e
+      puts "Retry #{attempts + 1}/#{max_attempts}: #{e.class} - #{e.message}" if ENV['DEBUG_TESTS']
+    end
+    sleep(1)
+    attempts += 1
+  end
+  raise Minitest::Assertion, "Failed after #{max_attempts} retries"
+end

data/test/tc_dns.rb

@@ -167,9 +167,9 @@ class TestDNS < Minitest::Test
   end # test_online
 
   def test_search_query_reverse
-    # 
+    #
     #  test that getname() DTRT with reverse lookups
-    # 
+    #
     tests = [
     {
       :ip => '198.41.0.4',
@@ -183,7 +183,7 @@ class TestDNS < Minitest::Test
 
     res = DNS.new
     tests.each do |test|
-      name = res.getname(test[:ip])
+      name = with_retries { res.getname(test[:ip]) }
 
       assert_instance_of(Name,name)
 
@@ -235,7 +235,7 @@ class TestDNS < Minitest::Test
         res.config.apply_search_list=true
       end
 
-      ans, query = res.send_query(test[:name])
+      ans, _ = res.send_query(test[:name])
 
       assert_instance_of(Message, ans)
 
@@ -249,14 +249,14 @@ class TestDNS < Minitest::Test
     end
   end
 
-    def test_port
-      d = DNS.new({:port => 5353})
-      assert(d.to_s.include?"5353")
-    end
+  def test_port
+    d = DNS.new({:port => 5353})
+    assert(d.to_s.include?"5353")
+  end
 
-    def test_port_nil
-        d = DNS.new({:port => nil})
-        assert(d.to_s.include? Dnsruby::Config::DEFAULT_PORT.to_s)
-      end
+  def test_port_nil
+    d = DNS.new({:port => nil})
+    assert(d.to_s.include? Dnsruby::Config::DEFAULT_PORT.to_s)
+  end
 
 end

data/test/tc_escapedchars.rb

@@ -350,7 +350,7 @@ d0
     packet     = Message.decode(packetdata)
     assert_equal( '\\\\e.eg.secret-wg.org',(packet.answer)[0].name.to_s,"Correctly dealt escaped backslash from wireformat \\\..eg.secret-wg.org")
 
-    testrr=RR.create(
+    RR.create(
                            :name => '\\e.eg.secret-wg.org',
     :type         => 'TXT',
     :txtdata      => '"WildCard Match"',
@@ -360,7 +360,6 @@ d0
 
 
 
-    klass = "IN"
     ttl = 43200
     name = 'def0au&lt.example.com'
 
@@ -471,17 +470,17 @@ d0
       type = data[:type]
       # 		foreach my $meth (keys %{$data}) {
        (data.keys.each do |meth|
-        if (meth == :type)
-          assert_equal(Types.new(data[meth]).to_s, rr.send(meth).to_s, "#{type} - #meth() correct")
-        else
-          assert_equal(data[meth].to_s, rr.send(meth).to_s, "#{type} - #meth() correct")
-        end
+          if (meth == :type)
+            assert_equal(Types.new(data[meth]).to_s, rr.send(meth).to_s, "#{type} - #meth() correct")
+          else
+            assert_equal(data[meth].to_s, rr.send(meth).to_s, "#{type} - #meth() correct")
+          end
         end)
 
         rr2 = RR.new_from_string(rr.to_s)
         assert_equal(rr.to_s,   rr2.to_s, "#{type} - Parsing from string works")
-      end
+    end
 
     Name::Label.set_max_length(Name::Label::MaxLabelLength)
-    end
   end
+end

data/test/tc_hs.rb

@@ -2,11 +2,6 @@ require_relative 'spec_helper'
 
 class TestDNS < Minitest::Test
 
-  def setup
-    Dnsruby::Config.reset
-  end
-
-
   # Illustrates that when a message whose class is 'HS' is sent to
   # a DNS server that does not support the HS class, using send_plain_message,
   # the response returns with an rcode of NOTIMP and a Dnsruby::NotImp error.

data/test/tc_message.rb

@@ -49,7 +49,7 @@ class TestMessage < Minitest::Test
   def test_rd_flag_displayed_when_true
     message = sample_message
     message.header.instance_variable_set(:@rd, true)
-    assert /;; flags(.+)rd/.match(message.to_s), message
+    assert(/;; flags(.+)rd/.match(message.to_s), message)
   end
 
   def test_header_line_contains_opcode_and_status_and_id

data/test/tc_name.rb

@@ -24,7 +24,7 @@ class TestName < Minitest::Test
     Name::Label.set_max_length(Name::Label::MaxLabelLength) # Other tests may have changed this
     #  Test max label length = 63
     begin
-      name = Name.create("a.b.12345678901234567890123456789012345678901234567890123456789012345.com")
+      Name.create("a.b.12345678901234567890123456789012345678901234567890123456789012345.com")
       assert(false, "Label of more than max=63 allowed")
     rescue ResolvError
     end
@@ -33,7 +33,7 @@ class TestName < Minitest::Test
   def test_name_length
     #  Test max name length=255
     begin
-      name = Name.create("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123.com")
+      Name.create("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123.com")
       assert(false, "Name of length > 255 allowed")
     rescue ResolvError
     end

data/test/tc_nxt.rb

@@ -60,7 +60,6 @@ class TestNXT < Minitest::Test
   def test_binary_string_to_codes
     test_type_codes_as_code_array = [1, 6, 28, 100]
     test_type_codes_as_name_array = %w(A  SOA  AAAA  UINFO)
-    test_type_codes_as_number = 1267650600228229401496971640898  # (2 ** 1) + (2 ** 6) + (2 ** 28) + (2 ** 100)
     test_type_codes_as_binary_string = "\x10\x0\x0\x0\x0\x0\x0\x0\x0\x10\x0\x0\x42"
     assert_equal(test_type_codes_as_code_array, RR::NXT::NxtTypes.binary_string_to_codes(test_type_codes_as_binary_string))
     assert_equal(test_type_codes_as_name_array, RR::NXT::NxtTypes.binary_string_to_names(test_type_codes_as_binary_string))

data/test/tc_recur.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.
@@ -20,10 +20,7 @@ class TestRecur < Minitest::Test
   def test_recur
     Dnsruby::PacketSender.clear_caches
     r = Dnsruby::Recursor.new
-#    Dnsruby::TheLog.level = Logger::DEBUG
-    ret = r.query("uk", Dnsruby::Types.DNSKEY)
-#    print ret
-    assert ret, "Query result was nil."
+    ret = with_retries(max_attempts: 10, exceptions: [Dnsruby::ResolvError]) { r.query("uk", Dnsruby::Types.DNSKEY) }
     assert ret.answer.length > 0, "Answer length should > 0, but was #{ret.answer.length}."
 #    ret = r.query_dorecursion("aaa.bigzone.uk-dnssec.nic.uk", Dnsruby::Types.DNSKEY)
 #    ret = r.query_dorecursion("uk-dnssec.nic.uk", Dnsruby::Types.DNSKEY)

data/test/tc_resolv.rb

@@ -51,19 +51,26 @@ class TestResolv < Minitest::Test
     end
   end
 
-
   def test_resolv_address_to_name
 
-    assert_equal(SHORT_ABSOLUTE_NAME, Dnsruby::Resolv.getname(IPV4_ADDR).to_s(true))
+    name = with_retries { Dnsruby::Resolv.getname(IPV4_ADDR) }
+    assert_equal(SHORT_ABSOLUTE_NAME, name.to_s(true))
 
     assert_raises(Dnsruby::ResolvError) do
       Dnsruby::Resolv.getname(SHORT_ABSOLUTE_NAME)
     end
 
-    names = Dnsruby::Resolv.getnames(IPV4_ADDR)
+    names = with_retries { Dnsruby::Resolv.getnames(IPV4_ADDR) }
     assert_equal(1, names.size)
     assert_equal(SHORT_ABSOLUTE_NAME, names.first.to_s(true))
-    Dnsruby::Resolv.each_name(IPV4_ADDR) { |name| assert_equal(SHORT_ABSOLUTE_NAME, name.to_s(true))}
+
+    found_names = with_retries(success_check: ->(_) { true }) do
+      names = []
+      Dnsruby::Resolv.each_name(IPV4_ADDR) { |name| names << name }
+      names
+    end
+
+    assert_equal(SHORT_ABSOLUTE_NAME, found_names.first.to_s(true))
   end
 
   def test_resolv_address_to_address

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

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,14 @@
 --- !ruby/object:Gem::Specification
 name: dnsruby
 version: !ruby/object:Gem::Version
-  version: 1.72.4
+  version: 1.73.0
 platform: ruby
 authors:
 - Alex Dalitz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-01 00:00:00.000000000 Z
+date: 2025-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,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
@@ -112,30 +112,30 @@ dependencies:
   name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: simpleidn
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,8 @@ extra_rdoc_files:
 - EVENTMACHINE
 files:
 - ".coveralls.yml"
+- ".github/FUNDING.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".yardopts"
@@ -357,14 +359,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.2.30
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Ruby DNS(SEC) implementation