dmarcator 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d31aa779b69d26db7ac26ef788eca2f9eca47cf5a9fc92e6522df2854e49f1f
-  data.tar.gz: 9100503cce7569587904afa95e680bd9fa0703863873a509475283c7a7f00b0a
+  metadata.gz: 48797112128c5187471c9c2ad1f907c73450cf8ef0f6910e2a22815d74221222
+  data.tar.gz: 89727b4555cc67beddbcb53dbbfb4845dc69e6cb8c66e37b8549fa7a4ec2ec36
 SHA512:
-  metadata.gz: 3fe6fd5ba876573069c9802643e90c79f88ff07840f60abf00addb94564a7c4bb2ce9e6180bc1bbb0960def6fb7d36686815f9938cf8b43136927b040390cfed
-  data.tar.gz: 6238af25582f02123bf5a444522cc42b65947a443dcbcfd5cf251afa1c089a99287011dcc957e07cbc124b9d8511651541dd79ac1d6e47f852c2c827a451ace0
+  metadata.gz: b6305c8a45f78711592f6a68b61236241d68a45410de08eaeeaa8e158b6337421e9b5d6c78b21ace4b0b38109fa74f3eec198ba4b5bbe6c2a49e5127ff2e69ff
+  data.tar.gz: 20111fdcf9bd38ff20f48a2be10ffdf4aa946850643fca2a48696fa10c041f5b3a4d49d37f6deed32f9767ed758828fce1ade967a8c12fc52cd0c1adc2ede6a2

data/ChangeLog.md

@@ -1,3 +1,10 @@
+### 1.2.0 / 2026-10-30
+
+* Plaintext lookups now use DNS over TCP (`DMARCator::Resolver::Plain`) instead of `Resolv::DNS`. `Resolv` reads UDP replies into a 512-byte buffer, so a larger answer cannot be decoded, is discarded, and the resulting timeout is swallowed. Any TXT set over 512 bytes — common for SPF and for domains with several DKIM keys — was therefore returned as an empty array, which is indistinguishable from "no records published". TCP has no such limit, and failures raise `ResolutionError`.
+* `DMARCATOR_DNS_TIMEOUT` now applies to plaintext lookups as well (default 5 seconds).
+* `DMARCator::DNS_TIMEOUTS` is no longer used and is deprecated; it will be removed in 2.0.
+* An injected `Resolv::DNS` still works, but carries the same 512-byte UDP limitation. Use `DMARCator::Resolver::Plain`, DoH, or DoT for SPF and DKIM accuracy.
+
 ### 1.1.0 / 2026-10-30
 
 * Replace the Parslet grammar with a hand-written parser in `DMARCator::Internal`. Parsing behaviour is unchanged, verified differentially against the previous parser over 128 real-world and 47 edge-case records in both lenient and strict modes; record parsing is roughly 30x faster (0.84 ms to 0.03 ms per record).

data/README.md

@@ -12,7 +12,7 @@ DMARCator is a Ruby library for parsing and querying [DMARC] records.
 
 [DMARC] policies are published as DNS TXT records at `_dmarc.<domain>`. This
 library parses those records into a structured `DMARCator::Record`, queries them
-directly through Ruby's `Resolv` DNS client, and parses the XML aggregate
+over DNS, and parses the XML aggregate
 reports those policies generate.
 
 ## Installation
@@ -173,9 +173,9 @@ end
 ```
 
 Notes for large scans: `Record.lookup` adds a parse per domain (~0.4 ms, far
-more than the lookup on a fast resolver); `Resolv::DNS` does not lock per query,
-so use one resolver per thread when parallelising; and DoT/DoH open a new TLS
-connection per lookup, so plaintext is the better choice for bulk work.
+more than the lookup on a fast resolver); each lookup opens its own TCP
+connection, so keep one resolver per thread when parallelising; and DoT/DoH add
+a TLS handshake per lookup, so plaintext is the better choice for bulk work.
 
 ### SPF and DKIM
 
@@ -205,9 +205,8 @@ DMARCator.configure do |config|
 end
 ```
 
-A resolver object is shared by every thread, and `Resolv::DNS` does not
-serialise concurrent lookups, so threaded applications should configure a
-factory instead:
+A resolver object is shared by every thread, so threaded applications should
+configure a factory instead:
 
 ```ruby
 DMARCator.configure do |config|
@@ -251,8 +250,9 @@ report.records.first.source_ip
 
 ## DNS transport
 
-By default, DMARC lookups use plain DNS through `Resolv`. Encrypted transports
-can be selected with environment variables; no DNS provider is baked in:
+By default, lookups use plain DNS over **TCP** (`DMARCator::Resolver::Plain`).
+Encrypted transports can be selected with environment variables; no DNS provider
+is baked in:
 
 ```sh
 # DNS over HTTPS (RFC 8484)
@@ -271,7 +271,15 @@ export DMARCATOR_DNS_TIMEOUT=5
 
 Certificates are always verified. `DMARCATOR_DOH_IP` pins the address so the
 DoH endpoint does not have to be resolved first; TLS still verifies the URL's
-hostname.
+hostname. `DMARCATOR_DNS_TIMEOUT` applies to every transport, including
+plaintext (default 5 seconds).
+
+Plaintext uses TCP rather than UDP deliberately. `Resolv::DNS` reads UDP replies
+into a 512-byte buffer, so a larger answer cannot be decoded, is discarded, and
+the resulting timeout is swallowed — meaning any TXT set over 512 bytes (common
+for SPF, and for domains with several DKIM keys) came back as an empty result,
+indistinguishable from "no records published". TCP has no such limit, and
+failures raise `DMARCator::ResolutionError`.
 
 Encrypted transports fail closed: a transport failure raises
 `DMARCator::ResolutionError` instead of being reported as a domain without a
@@ -300,9 +308,10 @@ XML helper, the internal resolver plumbing — may change in a minor release.
 * `DMARCator::Record`, `DMARCator::Report` and the parsed value objects are
   read-only after construction and safe to share between threads.
 * The memoized parser and transform are shared, and safe for concurrent use.
-* Resolvers are not necessarily safe for concurrent lookups: `Resolv::DNS` does
-  not serialise queries. Use one resolver per thread, or configure a factory
-  with `DMARCator.configure` so each lookup builds its own.
+* Resolvers are not necessarily safe for concurrent lookups: each lookup opens
+  its own connection, but `Resolv::DNS` (if you inject one) does not serialise
+  queries. Use one resolver per thread, or configure a factory with
+  `DMARCator.configure` so each lookup builds its own.
 * `DMARCator.configure` mutates process-wide state. Call it during boot rather
   than per request.
 

data/lib/dmarcator/query.rb

@@ -18,8 +18,9 @@ module DMARCator
   #
   # DNS query timeouts in seconds, tried in order.
   #
-  # Applied when the library builds a plaintext resolver. Timeouts on an
-  # injected resolver are left alone.
+  # @deprecated No longer used. Plaintext lookups use a single timeout
+  #   ({Resolver::Plain}), configurable with `DMARCATOR_DNS_TIMEOUT`.
+  #   Removed in 2.0.
   #
   DNS_TIMEOUTS = [2, 4, 8].freeze
 

data/lib/dmarcator/resolver/plain.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+require 'resolv'
+require 'socket'
+
+require_relative '../exceptions'
+require_relative 'encrypted'
+
+module DMARCator
+  module Resolver
+    #
+    # Plain DNS over TCP ([RFC 1035] section 4.2.2).
+    #
+    # TCP rather than UDP on purpose. `Resolv::DNS` reads UDP replies into a
+    # 512-byte buffer, so a larger answer cannot be decoded, is discarded, and
+    # the resulting timeout is swallowed unless `raise_timeout_errors` is set.
+    # Large TXT sets - SPF records, several DKIM keys - therefore came back as
+    # an empty result, which looks exactly like "no records published". TCP has
+    # no such limit, and failures here raise {ResolutionError}.
+    #
+    # [RFC 1035]: https://www.rfc-editor.org/rfc/rfc1035#section-4.2.2
+    #
+    # @since 1.2.0
+    #
+    class Plain < Encrypted
+      # Default DNS port.
+      DEFAULT_PORT = 53
+
+      # Default connect/read timeout in seconds.
+      DEFAULT_TIMEOUT = 5
+
+      # @return [Array<Array(String, Integer)>] the nameservers to try.
+      attr_reader :nameservers
+
+      # @return [Integer] connect/read timeout in seconds.
+      attr_reader :timeout
+
+      #
+      # Builds a resolver from environment variables.
+      #
+      # @param [Hash] env
+      #
+      # @return [Plain]
+      #
+      # @raise [ArgumentError]
+      #   `DMARCATOR_DNS_TIMEOUT` is not an integer.
+      #
+      def self.from_env(env = ENV)
+        new(timeout: timeout_from(env))
+      end
+
+      def self.timeout_from(env)
+        value = env['DMARCATOR_DNS_TIMEOUT']
+
+        value.nil? || value.empty? ? DEFAULT_TIMEOUT : Integer(value, 10)
+      end
+
+      #
+      # The nameservers from the system resolver configuration.
+      #
+      # @return [Array<Array(String, Integer)>]
+      #
+      def self.system_nameservers
+        config = Resolv::DNS::Config.default_config_hash
+
+        if (ports = config[:nameserver_port]) && !ports.empty?
+          return ports.map { |host, port| [host, port || DEFAULT_PORT] }
+        end
+
+        servers = Array(config[:nameserver])
+        servers = ['127.0.0.1'] if servers.empty?
+
+        servers.map { |host| [host, DEFAULT_PORT] }
+      end
+
+      def initialize(nameservers: nil, timeout: DEFAULT_TIMEOUT)
+        @nameservers = (nameservers || self.class.system_nameservers).freeze
+        @timeout = timeout
+
+        raise ArgumentError, 'no nameservers configured' if @nameservers.empty?
+      end
+
+      private
+
+      def exchange(query)
+        wire = query.encode
+        last_error = nil
+
+        @nameservers.each do |host, port|
+          begin
+            return request(host, port, wire)
+          rescue StandardError => error
+            last_error = error
+          end
+        end
+
+        raise ResolutionError,
+              "DNS lookup failed: #{last_error&.message || 'no nameservers'}"
+      end
+
+      def request(host, port, wire)
+        socket = Socket.tcp(host, port, connect_timeout: @timeout)
+        socket.timeout = @timeout if socket.respond_to?(:timeout=)
+
+        socket.write([wire.bytesize].pack('n') + wire)
+
+        header = socket.read(2)
+        raise ResolutionError, 'short DNS response' if header.nil? || header.bytesize < 2
+
+        body = socket.read(header.unpack1('n'))
+        raise ResolutionError, 'short DNS response' if body.nil?
+
+        body
+      ensure
+        socket&.close
+      end
+    end
+  end
+end

data/lib/dmarcator/resolver.rb

@@ -4,6 +4,7 @@ require 'resolv'
 
 require_relative 'exceptions'
 require_relative 'resolver/encrypted'
+require_relative 'resolver/plain'
 require_relative 'resolver/doh'
 require_relative 'resolver/dot'
 
@@ -14,7 +15,7 @@ module DMARCator
   # The transport is chosen with the `DMARCATOR_DNS` environment variable, or
   # explicitly via {.build}:
   #
-  #   DMARCATOR_DNS=plaintext          # default: Resolv::DNS (UDP/TCP)
+  #   DMARCATOR_DNS=plaintext          # default: TCP (Resolver::Plain)
   #   DMARCATOR_DNS=doh                # requires DMARCATOR_DOH_URL
   #   DMARCATOR_DNS=dot                # requires DMARCATOR_DOT_SERVER
   #
@@ -61,9 +62,7 @@ module DMARCator
 
       case name
       when 'plaintext'
-        resolver = Resolv::DNS.new
-        resolver.timeouts = DNS_TIMEOUTS
-        resolver
+        Plain.from_env(env)
       when 'doh'
         DoH.from_env(env)
       when 'dot'

data/lib/dmarcator/version.rb

@@ -2,5 +2,5 @@
 
 module DMARCator
   # dmarcator version
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dmarcator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Noah Berman
@@ -51,6 +51,7 @@ files:
 - lib/dmarcator/resolver/doh.rb
 - lib/dmarcator/resolver/dot.rb
 - lib/dmarcator/resolver/encrypted.rb
+- lib/dmarcator/resolver/plain.rb
 - lib/dmarcator/uri.rb
 - lib/dmarcator/version.rb
 homepage: https://github.com/bermannoah/dmarcator