httpx 0.19.1 → 0.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e51d7951de9e5964eb1106d8829504e1d0fbac2ca7906b64f6139467159403
-  data.tar.gz: 6b7726c50101f8356cf04628ee9ff32cbd6babd3bf98f426d768ae52d835f4a0
+  metadata.gz: c1c8ae2cc46f5a4033ea5c776bef1a7703cfc27834818cded1487101b8a6bbbe
+  data.tar.gz: ea445112ce42d2d81c4465f646687d605da855e3248838d26075388463250d9b
 SHA512:
-  metadata.gz: d29f216b4176e5085d7495d3ac015eb4b9f7e76f4dd064ae1f822890cc44d1718ec14fe9a3935515af6c7882762ebd875a0e15983d5707a2c9f68d069bfd084c
-  data.tar.gz: 30537730f11c0bfffd43882abd430c8a006a2a863b7ef247286f085440781d1b44e048d031df2c3af95fffc9d5ce04fcaad6bd0d05d039fc77023a0dc95a7508
+  metadata.gz: effaefc6365aa24fe86a62bca9bdbfed701dc9c19354c6bf7f046ea2bf84b94f908e1924381f2e27cfe748c7ad4e0b8d97dfa0a6d695775cec8d1b8a92760fe7
+  data.tar.gz: 55f846f8412acb99008cd18834ce50fe73ae072a0446d5d4fdf76fe2c48be4b2a863721b18191ca406a60b6883a8e35cba2f856c07ce9fa8ba808476b5b66887

data/doc/release_notes/0_19_2.md

@@ -0,0 +1,7 @@
+# 0.19.2
+
+## Bugfixes
+
+* skip resolution delay path for early resolve cases
+
+when the early resolve path (using IP, /etc/hosts IP, IP from cache) is followed, emit_addresses is called, and in a particular case (dual-stack network but using an IPv4 address), the happy eyeballs resolution delay path was activated when it shouldn't (it's meant to be used only for DNS network requests), and resulted in @pool being called before it was ever set. This simple check ensures that it doesn't happen before it must.

data/doc/release_notes/0_19_3.md

@@ -0,0 +1,6 @@
+# 0.19.3
+
+## Bugfixes
+
+* `retries` plugin: allow passing floats to `:retry_after` option.
+* dns: fixing cache lookups filtering by IP family which was causing socket connect handshake to start with no IP.

data/doc/release_notes/0_19_4.md

@@ -0,0 +1,13 @@
+# 0.19.3
+
+## Improvements
+
+### Jruby: HTTP/2 with jruby-openssl (>= 0.12.2)
+
+The (optional) FFI-based TLS module for jruby was deleted. Besides it being cumbersome and hard to maintain, `jruby`'s own `openssl` released support for ALPN negotiation (in v0.12.2), which solves the problem the deleted module was supposed to address.
+
+## Bugfixes
+
+* `webmock` integration was fixed to take the mocked URI query string into account.
+* fix internal codepath where mergeable-but-not-coalescable connections were still triggering the coalesce branch.
+* fixed after-use mutation of connection addresses array which was making it empty after initial usage.

data/lib/httpx/adapters/webmock.rb

@@ -19,6 +19,7 @@ module WebMock
       class << self
         def build_webmock_request_signature(request)
           uri = WebMock::Util::URI.heuristic_parse(request.uri)
+          uri.query = request.query
           uri.path = uri.normalized_path.gsub("[^:]//", "/")
 
           WebMock::RequestSignature.new(

data/lib/httpx/io.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require "socket"
+require "httpx/io/udp"
 require "httpx/io/tcp"
 require "httpx/io/unix"
-require "httpx/io/udp"
+require "httpx/io/ssl"
 
 module HTTPX
   module IO
@@ -11,20 +12,6 @@ module HTTPX
     register "udp", UDP
     register "unix", HTTPX::UNIX
     register "tcp", TCP
-
-    if RUBY_ENGINE == "jruby"
-      begin
-        require "httpx/io/tls"
-        register "ssl", TLS
-      rescue LoadError
-        # :nocov:
-        require "httpx/io/ssl"
-        register "ssl", SSL
-        # :nocov:
-      end
-    else
-      require "httpx/io/ssl"
-      register "ssl", SSL
-    end
+    register "ssl", SSL
   end
 end

data/lib/httpx/plugins/retries.rb

@@ -41,7 +41,7 @@ module HTTPX
         def option_retry_after(value)
           # return early if callable
           unless value.respond_to?(:call)
-            value = Integer(value)
+            value = Float(value)
             raise TypeError, ":retry_after must be positive" unless value.positive?
           end
 

data/lib/httpx/pool.rb

@@ -133,7 +133,7 @@ module HTTPX
 
       if found_connection.open?
         coalesce_connections(found_connection, connection)
-        throw(:coalesced, found_connection)
+        throw(:coalesced, found_connection) unless @connections.include?(connection)
       else
         found_connection.once(:open) do
           coalesce_connections(found_connection, connection)

data/lib/httpx/resolver/native.rb

@@ -119,7 +119,11 @@ module HTTPX
     private
 
     def calculate_interests
-      !@write_buffer.empty? || @queries.empty? ? :w : :r
+      return :w unless @write_buffer.empty?
+
+      return :r unless @queries.empty?
+
+      nil
     end
 
     def consume

data/lib/httpx/resolver/resolver.rb

@@ -49,7 +49,8 @@ module HTTPX
         address.is_a?(IPAddr) ? address : IPAddr.new(address.to_s)
       end
       log { "resolver: answer #{connection.origin.host}: #{addresses.inspect}" }
-      if !connection.io &&
+      if @pool && # if triggered by early resolve, pool may not be here yet
+         !connection.io &&
          connection.options.ip_families.size > 1 &&
          family == Socket::AF_INET &&
          addresses.first.to_s != connection.origin.host.to_s
@@ -71,7 +72,9 @@ module HTTPX
 
       return unless addresses
 
-      addresses.select! { |addr| addr.family == @family }
+      addresses = addresses.select { |addr| addr.family == @family }
+
+      return if addresses.empty?
 
       emit_addresses(connection, @family, addresses)
     end

data/lib/httpx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTPX
-  VERSION = "0.19.1"
+  VERSION = "0.19.4"
 end

data/sig/resolver/native.rbs

@@ -21,7 +21,7 @@ module HTTPX
 
       def call: () -> void
 
-      def interests: () -> io_interests
+      def interests: () -> (:r | :w | nil)
 
       def <<: (Connection) -> void
 
@@ -31,7 +31,7 @@ module HTTPX
 
       def initialize: (ip_family family, options options) -> void
 
-      def calculate_interests: () -> (:r | :w)
+      def calculate_interests: () -> (:r | :w | nil)
 
       def consume: () -> void
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.4
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -72,6 +72,9 @@ extra_rdoc_files:
 - doc/release_notes/0_18_7.md
 - doc/release_notes/0_19_0.md
 - doc/release_notes/0_19_1.md
+- doc/release_notes/0_19_2.md
+- doc/release_notes/0_19_3.md
+- doc/release_notes/0_19_4.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
@@ -137,6 +140,9 @@ files:
 - doc/release_notes/0_18_7.md
 - doc/release_notes/0_19_0.md
 - doc/release_notes/0_19_1.md
+- doc/release_notes/0_19_2.md
+- doc/release_notes/0_19_3.md
+- doc/release_notes/0_19_4.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
@@ -177,10 +183,6 @@ files:
 - lib/httpx/io.rb
 - lib/httpx/io/ssl.rb
 - lib/httpx/io/tcp.rb
-- lib/httpx/io/tls.rb
-- lib/httpx/io/tls/box.rb
-- lib/httpx/io/tls/context.rb
-- lib/httpx/io/tls/ffi.rb
 - lib/httpx/io/udp.rb
 - lib/httpx/io/unix.rb
 - lib/httpx/loggable.rb

data/lib/httpx/io/tls/box.rb

@@ -1,365 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2004-2013 Cotag Media
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is furnished
-# to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-
-class HTTPX::TLS
-  class Box
-    InstanceLookup = ::Concurrent::Map.new
-
-    READ_BUFFER = 2048
-    SSL_VERIFY_PEER = 0x01
-    SSL_VERIFY_CLIENT_ONCE = 0x04
-
-    VerifyCB = FFI::Function.new(:int, %i[int pointer]) do |preverify_ok, x509_store|
-      x509 = SSL.X509_STORE_CTX_get_current_cert(x509_store)
-      ssl = SSL.X509_STORE_CTX_get_ex_data(x509_store, SSL.SSL_get_ex_data_X509_STORE_CTX_idx)
-
-      bio_out = SSL.BIO_new(SSL.BIO_s_mem)
-      ret = SSL.PEM_write_bio_X509(bio_out, x509)
-      if ret
-        len = SSL.BIO_pending(bio_out)
-        buffer = FFI::MemoryPointer.new(:char, len, false)
-        size = SSL.BIO_read(bio_out, buffer, len)
-
-        # THis is the callback into the ruby class
-        cert = buffer.read_string(size)
-        SSL.BIO_free(bio_out)
-        # InstanceLookup[ssl.address].verify(cert) || preverify_ok.zero? ? 1 : 0
-        depth = SSL.X509_STORE_CTX_get_error_depth(ssl)
-        box = InstanceLookup[ssl.address]
-        if preverify_ok == 1
-
-          hostname_verify = box.verify(cert)
-          if hostname_verify
-            1
-          else
-            # SSL.X509_STORE_CTX_set_error(x509_store, SSL::X509_V_ERR_HOSTNAME_MISMATCH)
-            0
-          end
-        else
-          1
-        end
-      else
-        SSL.BIO_free(bio_out)
-        SSL.X509_STORE_CTX_set_error(x509_store, SSL::X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT)
-        0
-      end
-    end
-
-    attr_reader :is_server, :context, :handshake_completed, :hosts, :ssl_version, :cipher, :verify_peer
-
-    def initialize(is_server, transport, options = {})
-      @ready = true
-
-      @handshake_completed = false
-      @handshake_signaled = false
-      @alpn_negotiated = false
-      @transport = transport
-
-      @read_buffer = FFI::MemoryPointer.new(:char, READ_BUFFER, false)
-
-      @is_server = is_server
-      @context = Context.new(is_server, options)
-
-      @bioRead = SSL.BIO_new(SSL.BIO_s_mem)
-      @bioWrite = SSL.BIO_new(SSL.BIO_s_mem)
-      @ssl = SSL.SSL_new(@context.ssl_ctx)
-      SSL.SSL_set_bio(@ssl, @bioRead, @bioWrite)
-
-      @write_queue = []
-
-      InstanceLookup[@ssl.address] = self
-
-      @verify_peer = options[:verify_peer]
-      
-      if @verify_peer
-        SSL.SSL_set_verify(@ssl, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, VerifyCB)
-      end
-
-      # Add Server Name Indication (SNI) for client connections
-      if (hostname = options[:hostname])
-        if is_server
-          @hosts = ::Concurrent::Map.new
-          @hosts[hostname.to_s] = @context
-          @context.add_server_name_indication
-        else
-          SSL.SSL_set_tlsext_host_name(@ssl, hostname)
-        end
-      end
-
-      SSL.SSL_connect(@ssl) unless is_server
-    end
-
-    def add_host(hostname:, **options)
-      raise Error, "Server Name Indication (SNI) not configured for default host" unless @hosts
-      raise Error, "only valid for server mode context" unless @is_server
-
-      context = Context.new(true, options)
-      @hosts[hostname.to_s] = context
-      context.add_server_name_indication
-      nil
-    end
-
-    # Careful with this.
-    # If you remove all the hosts you'll end up with a segfault
-    def remove_host(hostname)
-      raise Error, "Server Name Indication (SNI) not configured for default host" unless @hosts
-      raise Error, "only valid for server mode context" unless @is_server
-
-      context = @hosts[hostname.to_s]
-      if context
-        @hosts.delete(hostname.to_s)
-        context.cleanup
-      end
-      nil
-    end
-
-    def get_peer_cert
-      return "" unless @ready
-
-      SSL.SSL_get_peer_certificate(@ssl)
-    end
-
-    def start
-      return unless @ready
-
-      dispatch_cipher_text
-    end
-
-    def encrypt(data)
-      return unless @ready
-
-      wrote = put_plain_text data
-      if wrote < 0
-        @transport.close_cb
-      else
-        dispatch_cipher_text
-      end
-    end
-
-    SSL_ERROR_WANT_READ = 2
-    SSL_ERROR_SSL = 1
-    def decrypt(data)
-      return unless @ready
-
-      put_cipher_text data
-
-      unless SSL.is_init_finished(@ssl)
-        resp = @is_server ? SSL.SSL_accept(@ssl) : SSL.SSL_connect(@ssl)
-
-        if resp < 0
-          err_code = SSL.SSL_get_error(@ssl, resp)
-          if err_code != SSL_ERROR_WANT_READ
-            if err_code == SSL_ERROR_SSL
-              verify_msg = SSL.X509_verify_cert_error_string(SSL.SSL_get_verify_result(@ssl))
-              @transport.close_cb(verify_msg)
-            end
-            return
-          end
-        end
-
-        @handshake_completed = true
-        @ssl_version = SSL.get_version(@ssl)
-        @cipher = SSL.get_current_cipher(@ssl)
-        signal_handshake unless @handshake_signaled
-      end
-
-      loop do
-        size = get_plain_text(@read_buffer, READ_BUFFER)
-        if size > 0
-          @transport.dispatch_cb @read_buffer.read_string(size)
-        else
-          break
-        end
-      end
-
-      dispatch_cipher_text
-    end
-
-    def signal_handshake
-      @handshake_signaled = true
-
-      # Check protocol support here
-      if @context.alpn_set
-        proto = alpn_negotiated_protocol
-
-        if proto == :failed
-          if @alpn_negotiated
-            # We should shutdown if this is the case
-            # TODO: send back proper error message
-            @transport.close_cb
-            return
-          end
-        end
-        @transport.alpn_protocol_cb(proto)
-      end
-
-      @transport.handshake_cb
-    end
-
-    def alpn_negotiated!
-      @alpn_negotiated = true
-    end
-
-    SSL_RECEIVED_SHUTDOWN = 2
-    def cleanup
-      return unless @ready
-
-      @ready = false
-
-      InstanceLookup.delete @ssl.address
-
-      if (SSL.SSL_get_shutdown(@ssl) & SSL_RECEIVED_SHUTDOWN) != 0
-        SSL.SSL_shutdown @ssl
-      else
-        SSL.SSL_clear @ssl
-      end
-
-      SSL.SSL_free @ssl
-
-      if @hosts
-        @hosts.each_value(&:cleanup)
-        @hosts = nil
-      else
-        @context.cleanup
-      end
-    end
-
-    # Called from class level callback function
-    def verify(cert)
-      @transport.verify_cb(cert)
-    end
-
-    def close(msg)
-      @transport.close_cb(msg)
-    end
-
-    private
-
-    def alpn_negotiated_protocol
-      return nil unless @context.alpn_set
-
-      proto = FFI::MemoryPointer.new(:pointer, 1, true)
-      len = FFI::MemoryPointer.new(:uint, 1, true)
-      SSL.SSL_get0_alpn_selected(@ssl, proto, len)
-
-      resp = proto.get_pointer(0)
-
-      return :failed if resp.address == 0
-
-      length = len.get_uint(0)
-      resp.read_string(length)
-    end
-
-    def get_plain_text(buffer, ready)
-      # Read the buffered clear text
-      size = SSL.SSL_read(@ssl, buffer, ready)
-      if size >= 0
-        size
-      else
-        SSL.SSL_get_error(@ssl, size) == SSL_ERROR_WANT_READ ? 0 : -1
-      end
-    end
-
-    def pending_data(bio)
-      SSL.BIO_pending(bio)
-    end
-
-    def get_cipher_text(buffer, length)
-      SSL.BIO_read(@bioWrite, buffer, length)
-    end
-
-    def put_cipher_text(data)
-      len = data.bytesize
-      wrote = SSL.BIO_write(@bioRead, data, len)
-      wrote == len
-    end
-
-    SSL_ERROR_WANT_WRITE = 3
-    def put_plain_text(data)
-      @write_queue.push(data) if data
-      return 0 unless SSL.is_init_finished(@ssl)
-
-      fatal = false
-      did_work = false
-
-      until @write_queue.empty?
-        data = @write_queue.pop
-        len = data.bytesize
-
-        wrote = SSL.SSL_write(@ssl, data, len)
-
-        if wrote > 0
-          did_work = true
-        else
-          err_code = SSL.SSL_get_error(@ssl, wrote)
-          if (err_code != SSL_ERROR_WANT_READ) && (err_code != SSL_ERROR_WANT_WRITE)
-            fatal = true
-          else
-            # Not fatal - add back to the queue
-            @write_queue.unshift data
-          end
-
-          break
-        end
-      end
-
-      if did_work
-        1
-      elsif fatal
-        -1
-      else
-        0
-      end
-    end
-
-    CIPHER_DISPATCH_FAILED = "Cipher text dispatch failed"
-    def dispatch_cipher_text
-      loop do
-        did_work = false
-
-        # Get all the encrypted data and transmit it
-        pending = pending_data(@bioWrite)
-        if pending > 0
-          buffer = FFI::MemoryPointer.new(:char, pending, false)
-
-          resp = get_cipher_text(buffer, pending)
-          raise Error, CIPHER_DISPATCH_FAILED unless resp > 0
-
-          @transport.transmit_cb(buffer.read_string(resp))
-          did_work = true
-        end
-
-        # Send any queued out going data
-        unless @write_queue.empty?
-          resp = put_plain_text nil
-          if resp > 0
-            did_work = true
-          elsif resp < 0
-            @transport.close_cb
-          end
-        end
-        break unless did_work
-      end
-    end
-  end
-end