httpx 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9c30e22a2d406a61ef87a58fddd607bb2b1fad7b50d837d8db062d4a538a2d2
-  data.tar.gz: 9c5e1997b9c03434071c59b2deb2b004f7b1a1077c2ccaed03b9e3a1db7aafe5
+  metadata.gz: c67e4695d8ef368321f14a3c113daad0e49280413e3da42272644ad84fe6f622
+  data.tar.gz: 62bb1ab9d91ca69c9b1fa561051ffb0ed137afb53e0b40f71cfd477a84a78773
 SHA512:
-  metadata.gz: 87d99c4971b99f086f7811be81a8453e71bd2535120b5e560a2fc837d50e8a040e70ab1b2b191beee4b481fcea5063576d8895d318a0089183c21cb59fdd0f24
-  data.tar.gz: 85469cf5b5822990367f1e5591798a1512de90a60226853da4b4e6b00dde8816d6218dd2aacc9b5d85f84f6cb1637dd4f7b37836863f44144f05329e4fbdf7f5
+  metadata.gz: 266576dae6b8ed604228b464281239b760df9682d27e9010b18ac7dbab4fb00f23115e5bcae1a0ecee6b191ee03a0eca758c37f8f0baee0e2ad9df5ca0c7eff6
+  data.tar.gz: e355df3c634811d0d8e08bcb10b661a4f486073e6ca808ca3af3585a4d014cd404c8d7a55e38d0d05419f205d9dc81a54fb5a17eab7e1716c38c160297963e0f

data/doc/release_notes/1_7_2.md

@@ -0,0 +1,6 @@
+# 1.7.2
+
+## Bugfixes
+
+* `:stream_bidi` plugin: when used with the `:retries` plugin, it will skip calling callbacks referencing state from the connection/stream the request was moved from.
+* `:auth` plugin: fix issue causing tokens to be concatenated on non-auth errors.

data/lib/httpx/plugins/auth.rb

@@ -69,7 +69,7 @@ module HTTPX
         private
 
         def send_request(request, *)
-          return super if @skip_auth_header_value
+          return super if @skip_auth_header_value || request.authorized?
 
           @auth_header_value ||= generate_auth_token
 
@@ -92,12 +92,31 @@ module HTTPX
       end
 
       module RequestMethods
+        def initialize(*)
+          super
+          @auth_token_value = nil
+        end
+
+        def authorized?
+          !@auth_token_value.nil?
+        end
+
+        def unauthorize!
+          return unless (auth_value = @auth_token_value)
+
+          @headers.get("authorization").delete(auth_value)
+
+          @auth_token_value = nil
+        end
+
         def authorize(auth_value)
           if (auth_type = @options.auth_header_type)
             auth_value = "#{auth_type} #{auth_value}"
           end
 
           @headers.add("authorization", auth_value)
+
+          @auth_token_value = auth_value
         end
       end
 
@@ -119,7 +138,7 @@ module HTTPX
             return unless auth_error?(response, request.options) ||
                           (@options.generate_auth_value_on_retry && @options.generate_auth_value_on_retry.call(response))
 
-            request.headers.get("authorization").pop
+            request.unauthorize!
             @auth_header_value = generate_auth_token
           end
 

data/lib/httpx/plugins/ntlm_auth.rb

@@ -46,7 +46,7 @@ module HTTPX
 
               if probe_response.status == 401 && ntlm.can_authenticate?(probe_response.headers["www-authenticate"])
                 request.transition(:idle)
-                request.headers.get("authorization").pop
+                request.unauthorize!
                 request.authorize(ntlm.authenticate(request, probe_response.headers["www-authenticate"]).encode("utf-8"))
                 super(request)
               else

data/lib/httpx/plugins/stream_bidi.rb

@@ -61,7 +61,7 @@ module HTTPX
         def handle_stream(stream, request)
           return super unless @options.stream
 
-          request.on(:body) do
+          request.flush_buffer_on_body do
             next unless request.headers_sent
 
             handle(request, stream)
@@ -254,9 +254,14 @@ module HTTPX
           super
           @headers_sent = false
           @closed = false
+          @flush_buffer_on_body_cb = nil
           @mutex = Thread::Mutex.new
         end
 
+        def flush_buffer_on_body(&cb)
+          @flush_buffer_on_body_cb = on(:body, &cb)
+        end
+
         def closed?
           return super unless @options.stream
 
@@ -280,6 +285,11 @@ module HTTPX
           case nextstate
           when :idle
             headers_sent = false
+
+            if @flush_buffer_on_body_cb
+              callbacks(:body).delete(@flush_buffer_on_body_cb)
+              @flush_buffer_on_body_cb = nil
+            end
           when :waiting_for_chunk
             return unless @state == :body
           when :body

data/lib/httpx/version.rb

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

data/sig/plugins/auth.rbs

@@ -29,6 +29,12 @@ module HTTPX
       end
 
       module RequestMethods
+        @auth_token_value: String?
+
+        def authorized?: () -> bool
+
+        def unauthorize!: () -> void
+
         def authorize: (String auth_value) -> void
       end
 

data/sig/plugins/stream_bidi.rbs

@@ -47,8 +47,11 @@ module HTTPX
         attr_accessor headers_sent: bool
 
         @closed: bool
+        @flush_buffer_on_body_cb: ^() -> void | nil
         @mutex: Thread::Mutex
 
+        def flush_buffer_on_body: { () -> void } -> void
+
         def closed?: () -> bool
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -161,6 +161,7 @@ extra_rdoc_files:
 - doc/release_notes/1_6_3.md
 - doc/release_notes/1_7_0.md
 - doc/release_notes/1_7_1.md
+- doc/release_notes/1_7_2.md
 files:
 - LICENSE.txt
 - README.md
@@ -294,6 +295,7 @@ files:
 - doc/release_notes/1_6_3.md
 - doc/release_notes/1_7_0.md
 - doc/release_notes/1_7_1.md
+- doc/release_notes/1_7_2.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb