httpx-patched 1.6.2.1

data/lib/httpx/resolver/entry.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "ipaddr"
+
+module HTTPX
+  module Resolver
+    class Entry < SimpleDelegator
+      attr_reader :address
+
+      def self.convert(address)
+        new(address, rescue_on_convert: true)
+      end
+
+      def initialize(address, expires_in = Float::INFINITY, rescue_on_convert: false)
+        @expires_in = expires_in
+        @address = address.is_a?(IPAddr) ? address : IPAddr.new(address.to_s)
+        super(@address)
+      rescue IPAddr::InvalidAddressError
+        raise unless rescue_on_convert
+
+        @address = address.to_s
+        super(@address)
+      end
+
+      def expired?
+        @expires_in < Utils.now
+      end
+    end
+  end
+end

data/lib/httpx/resolver/https.rb

@@ -0,0 +1,256 @@
+# frozen_string_literal: true
+
+require "resolv"
+require "uri"
+require "forwardable"
+require "httpx/base64"
+
+module HTTPX
+  # Implementation of a DoH name resolver (https://www.youtube.com/watch?v=unMXvnY2FNM).
+  # It wraps an HTTPX::Connection object which integrates with the main session in the
+  # same manner as other performed HTTP requests.
+  #
+  class Resolver::HTTPS < Resolver::Resolver
+    extend Forwardable
+    using URIExtensions
+
+    module DNSExtensions
+      refine Resolv::DNS do
+        def generate_candidates(name)
+          @config.generate_candidates(name)
+        end
+      end
+    end
+    using DNSExtensions
+
+    NAMESERVER = "https://1.1.1.1/dns-query"
+
+    DEFAULTS = {
+      uri: NAMESERVER,
+      use_get: false,
+    }.freeze
+
+    def_delegators :@resolver_connection, :state, :connecting?, :to_io, :call, :close, :terminate, :inflight?, :handle_socket_timeout
+
+    def initialize(_, options)
+      super
+      @resolver_options = DEFAULTS.merge(@options.resolver_options)
+      @queries = {}
+      @requests = {}
+      @uri = URI(@resolver_options[:uri])
+      @uri_addresses = nil
+      @resolver = Resolv::DNS.new
+      @resolver.timeouts = @resolver_options.fetch(:timeouts, Resolver::RESOLVE_TIMEOUT)
+      @resolver.lazy_initialize
+    end
+
+    def <<(connection)
+      return if @uri.origin == connection.peer.to_s
+
+      @uri_addresses ||= HTTPX::Resolver.nolookup_resolve(@uri.host) || @resolver.getaddresses(@uri.host)
+
+      if @uri_addresses.empty?
+        ex = ResolveError.new("Can't resolve DNS server #{@uri.host}")
+        ex.set_backtrace(caller)
+        connection.force_reset
+        throw(:resolve_error, ex)
+      end
+
+      resolve(connection)
+    end
+
+    # This is already indirectly monitored bt the HTTP connection. In order to skip
+    # monitoring, this method returns <tt>true</tt>.
+    def closed?
+      true
+    end
+
+    def empty?
+      true
+    end
+
+    def resolver_connection
+      # TODO: leaks connection object into the pool
+      @resolver_connection ||= @current_session.find_connection(@uri, @current_selector,
+                                                                @options.merge(ssl: { alpn_protocols: %w[h2] })).tap do |conn|
+        emit_addresses(conn, @family, @uri_addresses) unless conn.addresses
+      end
+    end
+
+    private
+
+    def resolve(connection = nil, hostname = nil)
+      @connections.shift until @connections.empty? || @connections.first.state != :closed
+
+      connection ||= @connections.first
+
+      return unless connection
+
+      hostname ||= @queries.key(connection)
+
+      if hostname.nil?
+        hostname = connection.peer.host
+        log do
+          "resolver #{FAMILY_TYPES[@record_type]}: resolve IDN #{connection.peer.non_ascii_hostname} as #{hostname}"
+        end if connection.peer.non_ascii_hostname
+
+        hostname = @resolver.generate_candidates(hostname).each do |name|
+          @queries[name.to_s] = connection
+        end.first.to_s
+      else
+        @queries[hostname] = connection
+      end
+      log { "resolver #{FAMILY_TYPES[@record_type]}: query for #{hostname}" }
+
+      begin
+        request = build_request(hostname)
+        request.on(:response, &method(:on_response).curry(2)[request])
+        request.on(:promise, &method(:on_promise))
+        @requests[request] = hostname
+        resolver_connection.send(request)
+        @connections << connection
+      rescue ResolveError, Resolv::DNS::EncodeError => e
+        reset_hostname(hostname)
+        emit_resolve_error(connection, connection.peer.host, e)
+      end
+    end
+
+    def on_response(request, response)
+      response.raise_for_status
+    rescue StandardError => e
+      hostname = @requests.delete(request)
+      connection = reset_hostname(hostname)
+      emit_resolve_error(connection, connection.peer.host, e)
+    else
+      # @type var response: HTTPX::Response
+      parse(request, response)
+    ensure
+      @requests.delete(request)
+    end
+
+    def on_promise(_, stream)
+      log(level: 2) { "#{stream.id}: refusing stream!" }
+      stream.refuse
+    end
+
+    def parse(request, response)
+      code, result = decode_response_body(response)
+
+      case code
+      when :ok
+        parse_addresses(result, request)
+      when :no_domain_found
+        # Indicates no such domain was found.
+
+        host = @requests.delete(request)
+        connection = reset_hostname(host, reset_candidates: false)
+
+        unless @queries.value?(connection)
+          emit_resolve_error(connection)
+          return
+        end
+
+        resolve
+      when :dns_error
+        host = @requests.delete(request)
+        connection = reset_hostname(host)
+
+        emit_resolve_error(connection)
+      when :decode_error
+        host = @requests.delete(request)
+        connection = reset_hostname(host)
+        emit_resolve_error(connection, connection.peer.host, result)
+      end
+    end
+
+    def parse_addresses(answers, request)
+      if answers.empty?
+        # no address found, eliminate candidates
+        host = @requests.delete(request)
+        connection = reset_hostname(host)
+        emit_resolve_error(connection)
+        return
+
+      else
+        answers = answers.group_by { |answer| answer["name"] }
+        answers.each do |hostname, addresses|
+          addresses = addresses.flat_map do |address|
+            if address.key?("alias")
+              alias_address = answers[address["alias"]]
+              if alias_address.nil?
+                reset_hostname(address["name"])
+                if early_resolve(connection, hostname: address["alias"])
+                  @connections.delete(connection)
+                else
+                  resolve(connection, address["alias"])
+                  return # rubocop:disable Lint/NonLocalExitFromIterator
+                end
+              else
+                alias_address
+              end
+            else
+              address
+            end
+          end.compact
+          next if addresses.empty?
+
+          hostname.delete_suffix!(".") if hostname.end_with?(".")
+          connection = reset_hostname(hostname, reset_candidates: false)
+          next unless connection # probably a retried query for which there's an answer
+
+          @connections.delete(connection)
+
+          # eliminate other candidates
+          @queries.delete_if { |_, conn| connection == conn }
+
+          Resolver.cached_lookup_set(hostname, @family, addresses) if @resolver_options[:cache]
+          catch(:coalesced) { emit_addresses(connection, @family, addresses.map { |a| Resolver::Entry.new(a["data"], a["TTL"]) }) }
+        end
+      end
+      return if @connections.empty?
+
+      resolve
+    end
+
+    def build_request(hostname)
+      uri = @uri.dup
+      rklass = @options.request_class
+      payload = Resolver.encode_dns_query(hostname, type: @record_type)
+
+      if @resolver_options[:use_get]
+        params = URI.decode_www_form(uri.query.to_s)
+        params << ["type", FAMILY_TYPES[@record_type]]
+        params << ["dns", Base64.urlsafe_encode64(payload, padding: false)]
+        uri.query = URI.encode_www_form(params)
+        request = rklass.new("GET", uri, @options)
+      else
+        request = rklass.new("POST", uri, @options, body: [payload])
+        request.headers["content-type"] = "application/dns-message"
+      end
+      request.headers["accept"] = "application/dns-message"
+      request
+    end
+
+    def decode_response_body(response)
+      case response.headers["content-type"]
+      when "application/dns-udpwireformat",
+           "application/dns-message"
+        Resolver.decode_dns_answer(response.to_s)
+      else
+        raise Error, "unsupported DNS mime-type (#{response.headers["content-type"]})"
+      end
+    end
+
+    def reset_hostname(hostname, reset_candidates: true)
+      connection = @queries.delete(hostname)
+
+      return connection unless connection && reset_candidates
+
+      # eliminate other candidates
+      candidates = @queries.select { |_, conn| connection == conn }.keys
+      @queries.delete_if { |h, _| candidates.include?(h) }
+
+      connection
+    end
+  end
+end

data/lib/httpx/resolver/multi.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require "forwardable"
+require "resolv"
+
+module HTTPX
+  class Resolver::Multi
+    include Callbacks
+    using ArrayExtensions::FilterMap
+
+    attr_reader :resolvers, :options
+
+    def initialize(resolver_type, options)
+      @current_selector = @current_session = nil
+      @options = options
+      @resolver_options = @options.resolver_options
+
+      ip_families = options.ip_families || Resolver.supported_ip_families
+
+      @resolvers = ip_families.map do |ip_family|
+        resolver = resolver_type.new(ip_family, options)
+        resolver.multi = self
+        resolver
+      end
+
+      @errors = Hash.new { |hs, k| hs[k] = [] }
+    end
+
+    def current_selector=(s)
+      @current_selector = s
+      @resolvers.each { |r| r.__send__(__method__, s) }
+    end
+
+    def current_session=(s)
+      @current_session = s
+      @resolvers.each { |r| r.__send__(__method__, s) }
+    end
+
+    def log(*args, **kwargs, &blk)
+      @resolvers.each { |r| r.__send__(__method__, *args, **kwargs, &blk) }
+    end
+
+    def closed?
+      @resolvers.all?(&:closed?)
+    end
+
+    def empty?
+      @resolvers.all?(&:empty?)
+    end
+
+    def inflight?
+      @resolvers.any(&:inflight?)
+    end
+
+    def timeout
+      @resolvers.filter_map(&:timeout).min
+    end
+
+    def close
+      @resolvers.each(&:close)
+    end
+
+    def connections
+      @resolvers.filter_map { |r| r.resolver_connection if r.respond_to?(:resolver_connection) }
+    end
+
+    def early_resolve(connection)
+      hostname = connection.peer.host
+      addresses = @resolver_options[:cache] && (connection.addresses || HTTPX::Resolver.nolookup_resolve(hostname))
+      return false unless addresses
+
+      ip_families = connection.options.ip_families
+
+      resolved = false
+      addresses.group_by(&:family).sort { |(f1, _), (f2, _)| f2 <=> f1 }.each do |family, addrs|
+        next unless ip_families.nil? || ip_families.include?(family)
+
+        # try to match the resolver by family. However, there are cases where that's not possible, as when
+        # the system does not have IPv6 connectivity, but it does support IPv6 via loopback/link-local.
+        resolver = @resolvers.find { |r| r.family == family } || @resolvers.first
+
+        next unless resolver # this should ever happen
+
+        # it does not matter which resolver it is, as early-resolve code is shared.
+        resolver.emit_addresses(connection, family, addrs, true)
+
+        resolved = true
+      end
+
+      resolved
+    end
+
+    def lazy_resolve(connection)
+      @resolvers.each do |resolver|
+        resolver << @current_session.try_clone_connection(connection, @current_selector, resolver.family)
+        next if resolver.empty?
+
+        @current_session.select_resolver(resolver, @current_selector)
+      end
+    end
+  end
+end