httpx 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06cc2e51d9b985b5df5b830bcfcdbcde9170253cc90b914dbb54c903106e8627
-  data.tar.gz: c1cd4de4e8ef8b1792b4b9e2ef12ff4abda3e101a82add4aeb580953ea641460
+  metadata.gz: b31d47dee309cce01caf25b3bc2f9fe51f602e9e2b07318c0903dee4b6d5b0c2
+  data.tar.gz: 18d8eb569ef7b5cf989ee61a85ed747cf9ceb1098d37e102fe7a721ae00675d8
 SHA512:
-  metadata.gz: da578cf07f612ab7af2f499aad38aa71e8b8cb447da80f2c0274e75e2364599e1bcccde9cd5ef82ca14078d3a3a7bce9ee533f3ad11f35efba448761b492a496
-  data.tar.gz: 1c339abaf5e9f56641546b814c0b073867db4d0aa2c7b44dc5bc7049552b8a8c11dd0743b66f21a8d99bf7bab855b98768c1eb292c3e89400863a9abe1a8f53f
+  metadata.gz: c2fd3831074357bc36389c299f257f1b14cd70f94d3491125bc54ef67e485dac66f9f2457b013a25c7b298a6926cb0bb92436cf07f3e9bd1d9f5e850f63fa443
+  data.tar.gz: 498440a319ff97e08236dde05cd6413723e17f6be9b4d4ce110b59fe88e4da0a9254cbd639adc28a6c81a6183eb70fbd7dd38719716c480d00addfed409ca446

data/lib/httpx/connection.rb

@@ -80,7 +80,16 @@ module HTTPX
     def match?(uri, options)
       return false if @state == :closing || @state == :closed
 
-      (@origins.include?(uri.origin) || match_altsvcs?(uri)) && @options == options
+      (
+        (
+          @origins.include?(uri.origin) &&
+          # if there is more than one origin to match, it means that this connection
+          # was the result of coalescing. To prevent blind trust in the case where the
+          # origin came from an ORIGIN frame, we're going to verify the hostname with the
+          # SSL certificate
+          (@origins.size == 1 || @origin == uri.origin || (@io && @io.verify_hostname(uri.host)))
+        ) || match_altsvcs?(uri)
+      ) && @options == options
     end
 
     def mergeable?(connection)
@@ -102,8 +111,8 @@ module HTTPX
     def merge(connection)
       @origins += connection.instance_variable_get(:@origins)
       pending = connection.instance_variable_get(:@pending)
-      pending.each do |req, args|
-        send(req, args)
+      pending.each do |req|
+        send(req)
       end
     end
 
@@ -121,7 +130,7 @@ module HTTPX
     def purge_pending
       [@parser.pending, @pending].each do |pending|
         pending.reject! do |request, *args|
-          yield(request, args)
+          yield(request, args) if block_given?
         end
       end
     end
@@ -129,10 +138,11 @@ module HTTPX
     # checks if this is connection is an alternative service of
     # +uri+
     def match_altsvcs?(uri)
-      AltSvc.cached_altsvc(@origin).any? do |altsvc|
-        origin = altsvc["origin"]
-        origin.altsvc_match?(uri.origin)
-      end
+      @origins.any? { |origin| uri.altsvc_match?(origin) } ||
+        AltSvc.cached_altsvc(@origin).any? do |altsvc|
+          origin = altsvc["origin"]
+          origin.altsvc_match?(uri.origin)
+        end
     end
 
     def connecting?
@@ -274,6 +284,9 @@ module HTTPX
       parser.on(:promise) do |request, stream|
         request.emit(:promise, parser, stream)
       end
+      parser.on(:origin) do |origin|
+        @origins << origin
+      end
       parser.on(:close) do
         transition(:closing)
       end

data/lib/httpx/connection/http1.rb

@@ -9,6 +9,8 @@ module HTTPX
 
     CRLF = "\r\n"
 
+    attr_reader :pending
+
     def initialize(buffer, options)
       @options = Options.new(options)
       @max_concurrent_requests = @options.max_concurrent_requests

data/lib/httpx/connection/http2.rb

@@ -41,7 +41,7 @@ module HTTPX
 
     def send(request, **)
       if !@handshake_completed ||
-         @connection.active_stream_count >= @max_concurrent_requests
+         @streams.size >= @max_concurrent_requests
         @pending << request
         return
       end
@@ -107,6 +107,7 @@ module HTTPX
       @connection.on(:frame, &method(:on_frame))
       @connection.on(:frame_sent, &method(:on_frame_sent))
       @connection.on(:frame_received, &method(:on_frame_received))
+      @connection.on(:origin, &method(:on_origin))
       @connection.on(:promise, &method(:on_promise))
       @connection.on(:altsvc) { |frame| on_altsvc(frame[:origin], frame) }
       @connection.on(:settings_ack, &method(:on_settings))
@@ -224,7 +225,7 @@ module HTTPX
           emit(:error, request, ex)
         end
       end
-      return unless @connection.state == :closed && @connection.active_stream_count.zero?
+      return unless @connection.state == :closed && @streams.size.zero?
 
       emit(:close)
     end
@@ -265,6 +266,10 @@ module HTTPX
       emit(:promise, @streams.key(stream.parent), stream)
     end
 
+    def on_origin(origin)
+      emit(:origin, origin)
+    end
+
     def respond_to_missing?(meth, *args)
       @connection.respond_to?(meth, *args) || super
     end

data/lib/httpx/extensions.rb

@@ -67,10 +67,11 @@ module HTTPX
 
       def altsvc_match?(uri)
         uri = URI.parse(uri)
-        self == uri || begin
+
+        origin == uri.origin || begin
           case scheme
-          when 'h2'
-            uri.scheme == "https" &&
+          when "h2"
+            (uri.scheme == "https" || uri.scheme == "h2") &&
             host == uri.host &&
             (port || default_port) == (uri.port || uri.default_port)
           else

data/lib/httpx/io/ssl.rb

@@ -30,7 +30,7 @@ module HTTPX
 
     def verify_hostname(host)
       return false if @ctx.verify_mode == OpenSSL::SSL::VERIFY_NONE
-      return false if @io.peer_cert.nil?
+      return false if !@io.respond_to?(:peer_cert) || @io.peer_cert.nil?
 
       OpenSSL::SSL.verify_certificate_identity(@io.peer_cert, host)
     end

data/lib/httpx/pool.rb

@@ -90,6 +90,7 @@ module HTTPX
 
       if found_connection.state == :open
         coalesce_connections(found_connection, connection)
+        throw(:coalesced, found_connection)
       else
         found_connection.once(:open) do
           coalesce_connections(found_connection, connection)

data/lib/httpx/resolver/resolver_mixin.rb

@@ -32,7 +32,7 @@ module HTTPX
         end
         log(label: "resolver: ") { "answer #{connection.origin.host}: #{addresses.inspect}" }
         connection.addresses = addresses
-        emit(:resolve, connection)
+        catch(:coalesced) { emit(:resolve, connection) }
       end
 
       def early_resolve(connection, hostname: connection.origin.host)

data/lib/httpx/session.rb

@@ -93,15 +93,12 @@ module HTTPX
       # incidentally, all requests will be re-routed to the first
       # advertised alt-svc, which incidentally follows the spec.
       existing_connection.purge_pending do |request|
-        is_idle = request.origin == origin &&
-                  request.state == :idle &&
-                  !request.headers.key?("alt-used")
-        if is_idle
-          log(level: 1) { "#{origin} alt-svc: sending #{request.uri} to #{alt_origin}" }
-          connection.send(request)
-        end
-        is_idle
+        request.origin == origin &&
+          request.state == :idle &&
+          !request.headers.key?("alt-used")
       end
+
+      connection.merge(existing_connection)
     rescue UnsupportedSchemeError
       altsvc["noop"] = true
     end
@@ -137,18 +134,17 @@ module HTTPX
         case uri.scheme
         when "http"
           "tcp"
-        when "https"
-          "ssl"
-        when "h2"
-          options = options.merge(ssl: { alpn_protocols: %w[h2] })
+        when "https", "h2"
           "ssl"
         else
           raise UnsupportedSchemeError, "#{uri}: #{uri.scheme}: unsupported URI scheme"
         end
       end
       connection = options.connection_class.new(type, uri, options)
-      pool.init_connection(connection, options)
-      connection
+      catch(:coalesced) do
+        pool.init_connection(connection, options)
+        connection
+      end
     end
 
     def send_requests(*requests, options)

data/lib/httpx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2019-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next