dnsruby 1.73.1 → 2.0.0

data/lib/dnsruby/serial_time.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Dnsruby
+  # RRSIG times are serial numbers, not absolute Unix timestamps (RFC 4034
+  # section 3.1.5). Resolve each field into the era nearest the current time
+  # before comparing it with ordinary, absolute cache deadlines.
+  module SerialTime #:nodoc: all
+    MASK = (1 << 32) - 1
+    HALF = 1 << 31
+
+    def self.absolute(value, reference)
+      distance = (value.to_i - reference.to_i) & MASK
+      # RFC 1982 deliberately leaves this ordering undefined.
+      return nil if distance == HALF
+      distance -= MASK + 1 if distance > HALF
+      reference.to_i + distance
+    end
+
+    def self.valid?(inception, expiration, now = Time.now.to_i)
+      starts = absolute(inception, now)
+      ends = absolute(expiration, now)
+      starts && ends && starts <= now && now <= ends
+    end
+  end
+end

data/lib/dnsruby/single_resolver.rb

@@ -20,8 +20,8 @@ module Dnsruby
   #  This class has been deprecated.
   #  This implementation exists for legacy clients. New code should use the Dnsruby::Resolver class.
   #  The SingleResolver class targets a single resolver, and controls the sending of a single
-  #  packet with a packet timeout. It performs no retries. Only two threads are used - the client
-  #  thread and a select thread (which is reused across all queries).
+  #  packet with a packet timeout. It performs no retries. Responses share one
+  #  select thread; TCP sends initiated by that thread use a shared worker pool.
   # 
   # == Methods
   # 
@@ -63,6 +63,9 @@ module Dnsruby
       @udp_size = Resolver::DefaultUDPSize
       @dnssec = Resolver::DefaultDnssec
       @use_tcp = false
+      @tcp_pipelining = false
+      @tcp_pipelining_max_queries = :infinite
+      @tcp_idle_timeout = Resolver::DefaultTcpIdleTimeout
       @no_tcp = false
       @tsig = nil
       @ignore_truncation = false
@@ -107,7 +110,8 @@ module Dnsruby
           else
             begin
               send(attr.to_s+"=", arg[attr])
-            rescue Exception
+            rescue Exception => error
+              raise if attr.to_s == 'tsig' || ValidationBudget.abort?(error)
               Dnsruby.log.error{"Argument #{attr} not valid\n"}
             end
           end
@@ -116,11 +120,16 @@ module Dnsruby
 
       isr = PacketSender.new({:server=>@server, :port=>@port, :dnssec=>@dnssec,
           :use_tcp=>@use_tcp, :no_tcp=>@no_tcp, :packet_timeout=>@packet_timeout,
+          :tcp_pipelining=>@tcp_pipelining, :tcp_pipelining_max_queries=>@tcp_pipelining_max_queries,
+          :tcp_idle_timeout=>@tcp_idle_timeout,
           :tsig => @tsig, :ignore_truncation=>@ignore_truncation,
           :src_address=>@src_address, :src_address6=>@src_address6, :src_port=>@src_port,
           :recurse=>@recurse, :udp_size=>@udp_size})
 
       @single_resolvers = [isr]
+      @server = isr.server
+      @config.nameserver = [@server]
+      @configured = true
 
       #       ResolverRegister::register_single_resolver(self)
     end
@@ -129,14 +138,23 @@ module Dnsruby
       if (!@configured)
         @config.get_ready
       end
-      @server = Config.resolve_server(s).to_s
-      isr = PacketSender.new({:server=>@server, :dnssec=>@dnssec,
+      server = Config.resolve_server(s).to_s
+      isr = PacketSender.new({:server=>server, :port=>@port, :dnssec=>@dnssec,
           :use_tcp=>@use_tcp, :no_tcp=>@no_tcp, :packet_timeout=>@packet_timeout,
+          :tcp_pipelining=>@tcp_pipelining, :tcp_pipelining_max_queries=>@tcp_pipelining_max_queries,
+          :tcp_idle_timeout=>@tcp_idle_timeout,
           :tsig => @tsig, :ignore_truncation=>@ignore_truncation,
           :src_address=>@src_address, :src_address6=>@src_address6, :src_port=>@src_port,
           :recurse=>@recurse, :udp_size=>@udp_size})
 
-      @single_res_mutex.synchronize {
+      single_res_mutex.synchronize {
+        # Hostname resolution and sender construction can run alongside
+        # setters. Publish the current configuration, not the earlier snapshot.
+        update_internal_res(isr)
+        @config.nameserver = [server]
+        @server = server
+        @configured = true
+        @single_resolvers.compact.each(&:close)
         @single_resolvers = [isr]
       }
     end
@@ -161,6 +179,7 @@ module Dnsruby
     def packet_timeout=(t)
       @packet_timeout = t
       @query_timeout = t
+      update
     end
 
     #  Add the appropriate EDNS OPT RR for the specified packet. This is done