dnsruby 1.73.1 → 1.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2a1396a168f57eb47e7c1c1717234c6339758a1662282ee9d3b20621224080b
-  data.tar.gz: f99e64b08c29d90930dd4fea1159d840f8d942e8670599352a281ce1173f7561
+  metadata.gz: 31fc09cb1cf4b1c2174c67a16e96601eb25c6509e6525c3cef9159da5fd656c2
+  data.tar.gz: e96495f35da0ff50636052f3f27623b4fc620572c0c4109f6c47a5a81eb77801
 SHA512:
-  metadata.gz: b6a9810d20e6a0e159ac5960a290faaa60acb4d8035b67c29c04772cfa8147922708dbef6160cc99de7442e23ed71f177c9d51d2a340f1c24b7d81ad4f9c0071
-  data.tar.gz: 2810fb4b2522d8d97db1803f7ee23d761ee982e71063f970c47ed1d00ea9cf25926d8ee84f2a8747b70a6d5b76cc5f18eaf5b8739307c17a7645cbd3a9e91462
+  metadata.gz: 84c58dc7dbf8d3c33d11ee7ea10d076d806cf1700c327b5e84fbebac08484fba8179734dbe9631c85daec38518b29ca3d8e3a29629d71a69a955f615bdf60346
+  data.tar.gz: 06b7c82e2b1e979f1c18aaa9567596f6724a7fb5eae8da688921958506ab9cc9ed1657f168699ec6a0112c3c25afcba419d333b7f3b4f618537fa6e6f1ee91c7

data/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.2', '3.3', '3.4' ] # , 'ruby-head' ]
+        ruby: [ '3.2.10', '3.3.11', '3.4.10', '4.0.5' ] # , 'ruby-head' ]
         rubyopt: ['']
         include:
           - ruby: '3.4'

data/RELEASE_NOTES.md

@@ -1,6 +1,18 @@
 # Release Notes
 
+## v1.74.0
+
+* Resolve all configured nameservers in parallel
+* Only raise ArgumentError from Resolver if _all_ configured nameservers are invalid - otherwise, just log the bad one(s) and continue
+* print out extra OPT data
+*  Fix wakeup socket deletion on stopping of select thread
+* Make sure to add nameservers if using config_info in Resolver
+* Fix for RRSET pruning and potential cache poisoning - thanks Alexander Tan
+* Fix WKS record protocol field encoding and decoding size according to RFC 1035 Section 3.4.2 where PROTOCOL is an 8 bit (#220)
+* Updating workflows to include Ruby 4, and get rdoc working for it
+
 ## v1.73.1
+
 * fix(caa): add support for issuevmc (#214) - thanks Mark McDonnell!
 
 ## v1.73.0

data/demo/rubydig.rb

@@ -60,6 +60,8 @@ if ARGV[0] =~ /^@/
   else
     puts "Setting nameserver : #{nameserver}"
     resolver.nameserver = (nameserver.sub(/^@/, ''))
+    resolver.dnssec = true
+    resolver.do_validation = true
     puts "nameservers = #{resolver.config.nameserver}"
     zone_transfer.server = (nameserver.sub(/^@/, ''))
   end

data/dnsruby.gemspec

@@ -43,6 +43,7 @@ DNSSEC NSEC3 support.'
   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 'rdoc', '>= 6.5', '< 8.0'
   s.add_development_dependency 'yard', '>= 0.9'
   s.add_development_dependency 'coveralls', '~> 0.8.23'
 

data/lib/dnsruby/cache.rb

@@ -68,14 +68,12 @@ module Dnsruby
     #  This method "fixes up" the response, so that the header and ttls are OK
     #  The resolver will still need to copy the flags and ID across from the query
     def find(qname, qtype, qclass = Classes.IN)
-#      print "CACHE find : #{qname}, #{qtype}\n"
       qn = Name.create(qname)
       qn.absolute = true
       key = CacheKey.new(qn, qtype, qclass).to_s
       @mutex.synchronize {
         data = @cache[key]
         if (!data)
-#          print "CACHE lookup failed\n"
           return nil
         end
         if (data.expiration <= Time.now.to_i)

data/lib/dnsruby/config.rb

@@ -294,6 +294,8 @@ module Dnsruby
                   end
                 }
                 if (!found)
+                  # Log the error, in case Resolver is resolving a set of nameservers, and swallows the exception
+                  TheLog.error{"Recursor can't locate #{server}"}
                   raise ArgumentError.new("Recursor can't locate #{server}")
                 end
               end

data/lib/dnsruby/packet_sender.rb

@@ -204,6 +204,7 @@ module Dnsruby
       @tcp_pipelining_max_queries = :infinite
       @use_counts = {}
 
+      ignore_config_resolv_errors = false;
       if arg.nil?
       elsif arg.kind_of? String
         @server = arg
@@ -212,10 +213,14 @@ module Dnsruby
       elsif arg.kind_of? Hash
         arg.keys.each do |attr|
           begin
-            if ((attr.to_s == "src_address" || attr.to_s == "src_address6") &&
-                (arg[attr] == nil || arg[attr] == ""))
+            if (attr.to_s == "ignore_config_resolv_errors")
+              ignore_config_resolv_errors = arg[attr]
             else
-              send(attr.to_s + "=", arg[attr])
+              if ((attr.to_s == "src_address" || attr.to_s == "src_address6") &&
+                  (arg[attr] == nil || arg[attr] == ""))
+              else
+                send(attr.to_s + "=", arg[attr])
+              end
             end
           rescue Exception => e
             Dnsruby.log.error { "PacketSender : Argument #{attr}, #{arg[attr]} not valid : #{e}\n" }
@@ -223,7 +228,17 @@ module Dnsruby
         end
       end
       # Check server is IP
-      @server=Config.resolve_server(@server)
+      # We should allow the call of PacketSender.new to flag just to log an error if this fails
+      # and then return null
+        if ignore_config_resolv_errors
+          begin
+            @server=Config.resolve_server(@server)
+          rescue ArgumentError
+            return
+          end
+        else
+            @server=Config.resolve_server(@server)
+        end
 
       check_ipv6
       #       ResolverRegister::register_single_resolver(self)

data/lib/dnsruby/recursor.rb

@@ -678,7 +678,8 @@ module Dnsruby
                 if (of.length <= known_zone.length)
                   TheLog.debug(";; _dorecursion() Deadbeat name server did not provide new information.")
                   next
-                elsif (of =~ /#{known_zone}/)
+                # elsif (of =~ /#{known_zone}/)
+                elsif (of == known_zone || known_zone.length == 1 || of.end_with?(".#{known_zone}"))
                   TheLog.debug(";; _dorecursion() FOUND closer authority for [#{of}] at [#{server}].")
                   auth[server] ||= AddressCache.new #[] @TODO@ If there is no additional record for this, then we want to use the authority!
                   if (rr.type == Types.NS)
@@ -688,7 +689,7 @@ module Dnsruby
                       end
                   end
                 else
-                  TheLog.debug(";; _dorecursion() Confused name server [" + @answerfrom + "] thinks [#{of}] is closer than [#{known_zone}]?")
+                  TheLog.debug(";; _dorecursion() Confused name server [" + @answerfrom.to_s + "] thinks " + of.to_s + " is closer than " + known_zone.to_s + "?")
                   return nil
                 end
               else
@@ -750,9 +751,9 @@ module Dnsruby
       #  Now prune the response of any unrelated rrsets (RFC5452 section6)
       #  "One very simple way to achieve this is to only accept data if it is
       #  part of the domain for which the query was intended."
-      if (!packet.header.aa)
-        return
-      end
+      # if (!packet.header.aa)
+      #   return
+      # end
       if (!packet.question()[0])
         return
       end

data/lib/dnsruby/resolver.rb

@@ -401,7 +401,7 @@ module Dnsruby
       if @single_resolvers.length == 0
         Thread.start {
           sleep(@query_timeout == 0 ? 1 : @query_timeout)
-          client_queue.push([client_query_id, nil, ResolvTimeout.new('Query timed out - no nameservers configured')])
+          client_queue.push([client_query_id, nil, ResolvTimeout.new('Query timed out - no valid nameservers configured')])
         }
       end
       client_query_id
@@ -436,7 +436,7 @@ module Dnsruby
     #  * :tcp_pipelining
     #  * :tcp_pipelining_max_queries - can be a number or :infinite symbol
     def initialize(*args)
-      #  @TODO@ Should we allow :namesver to be an RRSet of NS records? Would then need to randomly order them?
+      #  @TODO@ Should we allow :nameserver to be an RRSet of NS records? Would then need to randomly order them?
       @resolver_ruby = nil
       @src_address = nil
       @src_address6 = nil
@@ -453,6 +453,7 @@ module Dnsruby
             begin
               if key == :config_info
                 @config.set_config_info(args[0][:config_info])
+                add_config_nameservers
               elsif key == :nameserver
                 set_config_nameserver(args[0][:nameserver])
               elsif key == :nameservers
@@ -481,10 +482,11 @@ module Dnsruby
         @config.get_ready
       end
       @configured = true
-      @single_res_mutex.synchronize {
         #  Add the Config nameservers
-        @config.nameserver.each do |ns|
-          res = PacketSender.new({
+      threads = []
+      @config.nameserver.each do |ns|
+        threads << Thread.new do
+          PacketSender.new({
               server:             ns,
               port:               @port,
               dnssec:             @dnssec,
@@ -499,10 +501,22 @@ module Dnsruby
               src_address6:       @src_address6,
               src_port:           @src_port,
               recurse:            @recurse,
-              udp_size:           @udp_size})
-          @single_resolvers.push(res) if res
+              udp_size:           @udp_size,
+              ignore_config_resolv_errors: true})
         end
-      }
+      end
+
+      new_resolvers = threads.map(&:value).compact
+      new_resolvers = new_resolvers.select do |resolver|
+        !resolver.nil? && !resolver.server.nil?
+      end
+      # if new_resolvers.empty?
+      #   raise ArgumentError.new("No valid nameservers found in config")
+      # end
+      @single_res_mutex.synchronize { @single_resolvers.concat(new_resolvers) }
+      if @single_resolvers.nil? || @single_resolvers.empty?
+        raise ArgumentError.new("No valid nameservers found")
+      end
     end
 
     def set_config_nameserver(n)

data/lib/dnsruby/resource/IN.rb

@@ -87,13 +87,13 @@ module Dnsruby
 
         def encode_rdata(msg, canonical=false) #:nodoc: all
           msg.put_bytes(@address.address)
-          msg.put_pack("n", @protocol)
+          msg.put_pack("C", @protocol)
           msg.put_bytes(@bitmap)
         end
 
         def self.decode_rdata(msg) #:nodoc: all
           address = IPv4.new(msg.get_bytes(4))
-          protocol, = msg.get_unpack("n")
+          protocol, = msg.get_unpack("C")
           bitmap = msg.get_bytes
           return self.new(address, protocol, bitmap)
         end

data/lib/dnsruby/resource/OPT.rb

@@ -227,13 +227,12 @@ module Dnsruby
         if @options
           @options.each do |opt|
             if opt.code == EDNS_SUBNET_OPTION
-              ret = ret + "CLIENT-SUBNET: #{get_client_subnet(opt)}"
+              ret = ret + "CLIENT-SUBNET: #{get_client_subnet(opt)}\n"
             else
-              ret = ret + " " + opt.to_s
+              ret = ret + "OPT=#{opt.code}: #{opt.data}\n"
             end
           end
         end
-        ret = ret + "\n"
         return ret
       end
 

data/lib/dnsruby/select_thread.rb

@@ -228,17 +228,20 @@ module Dnsruby
           if (unused_loop_count > 10 && @@query_hash.empty? && @@observers.empty?)
             Dnsruby.log.debug("Try stop select loop")
 
+            # We leave the @@wakeup_sockets here, but remove everything else
             non_persistent_sockets = @@sockets.select { |s| ! @@socket_is_persistent[s] }
             non_persistent_sockets.each do |socket|
-              socket.close rescue nil
-              @@sockets.delete(socket)
+              if socket != @@wakeup_sockets[1]
+                socket.close rescue nil
+                @@sockets.delete(socket)
+              end
             end
 
-            Dnsruby.log.debug("Deleted #{non_persistent_sockets.size} non-persistent sockets," +
-                              " #{@@sockets.count} persistent sockets remain.")
+            Dnsruby.log.debug("Deleted #{non_persistent_sockets.size - 1} non-persistent sockets," +
+                              " #{@@sockets.count - 1} persistent sockets remain.")
             @@socket_hash.clear
 
-            if @@sockets.empty?
+            if @@sockets.size == 1
               Dnsruby.log.debug("Stopping select loop")
               return
             end
@@ -251,10 +254,11 @@ module Dnsruby
     # Removes closed sockets from @@sockets, and returns an array containing 1
     # exception for each closed socket contained in @@socket_hash.
     def clean_up_closed_sockets
+      exceptions = []
       @@mutex.synchronize do
         closed_sockets_in_hash = @@sockets.select(&:closed?).select { |s| @@socket_hash[s] }
         @@sockets.delete_if { | socket | socket.closed? }
-        closed_sockets_in_hash.each_with_object([]) do |socket, exceptions|
+        closed_sockets_in_hash.each_with_object([]) do |socket, exception|
           @@socket_hash[socket].each do | client_id |
             exceptions << [SocketEofResolvError.new("TCP socket closed before all answers received"), socket, client_id]
           end
@@ -389,6 +393,9 @@ module Dnsruby
       if !persistent?(socket) || max_attained?(socket)
         @@sockets.delete(socket)
         @@socket_hash.delete(socket)
+        @@socket_remaining_queries.delete(socket)
+        @@socket_is_persistent.delete(socket)
+        @@tcp_buffers.delete(socket)
         Dnsruby.log.debug("Closing socket #{socket}")
         socket.close rescue nil
       end

data/lib/dnsruby/version.rb

@@ -1,3 +1,3 @@
 module Dnsruby
-  VERSION = '1.73.1'
+  VERSION = '1.74.0'
 end

data/test/tc_res_config.rb

@@ -92,4 +92,33 @@ class TestResolverConfig < Minitest::Test
     end;
   end
 
+  def test_bad_ns
+    begin
+      res = Dnsruby::Resolver.new(:nameserver => ["ns32.domiancontrol.com."])
+      res.query("example.com")
+      assert(false, "Should not query with bad nameserver")
+    rescue Exception => e
+      # OK
+    end
+  end
+
+  def test_bad_ns_post_init
+    begin
+      resolver = Dnsruby::Resolver.new(recurse: false, do_caching: false, retry_times: 2)
+      resolver.nameserver = ["ns32.domiancontrol.com."]
+      assert(false, "Should not allow bad nameserver")
+      resolver.query("example.com")
+    rescue ArgumentError
+    end
+  end
+
+  def test_one_good_ns_rest_bad
+    begin
+      resolver = Dnsruby::Resolver.new(recurse: false, do_caching: false, retry_times: 2)
+      resolver.nameserver = ["ns32.domiancontrol.com.", "1.1.1.1"]
+      resolver.query("example.com")
+    rescue ArgumentError
+      assert(false, "Should allow one good nameserver")
+    end
+  end
 end

data/test/tc_resolver.rb

@@ -477,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
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dnsruby
 version: !ruby/object:Gem::Version
-  version: 1.73.1
+  version: 1.74.0
 platform: ruby
 authors:
 - Alex Dalitz
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -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
@@ -159,9 +178,9 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - DNSSEC
+- EVENTMACHINE
 - EXAMPLES
 - README.md
-- EVENTMACHINE
 files:
 - ".coveralls.yml"
 - ".github/FUNDING.yml"
@@ -368,8 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Ruby DNS(SEC) implementation
 test_files: