http.rb 1.3.9 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ba4b45f56c0470076fa4e969e51f0e251f33c67a817aedc5a3e300a7d52d2a3
-  data.tar.gz: 4b882af236ee2c41c736cc4e256d1ee566a7e6cb4f81099c87f443c726a98f13
+  metadata.gz: 4df4290326561e27192344f8c932e0e6df4474080d8f2986c89591abb87ce7b2
+  data.tar.gz: ad38951e186650e88d4ff40dc3ce646cd5932d1c779a869c0842f642e0d15c70
 SHA512:
-  metadata.gz: ec0592b2b3892f668d2a42a7b3d1d29ae56d4dc6743eda80ced5b8b9ea56b995a770e82b31c6dafc22c6245a4c85044f478bb64b71c5c8b930205dfedc17233f
-  data.tar.gz: 13b8ab56ab66abb3a17447b87ec82af1a509cf2a137266c728f04a8536b81db15b7f4711319f9eaae327b15d593abedd41929fff341e970263b6bf1f7eb4b71b
+  metadata.gz: 34cbe673b63634c80b6acdcbac2be9cd4d72687a50a4fdc3e9412d004eda92975bf72cf3699e1a65f71221519d79255232b7af22360388434cf6b874b16a33cb
+  data.tar.gz: f09778ee10dc83dfc30047965b9c5d8ca3a671c1af19c4146d2241a8a5b7675b2aff3ac3025bd49bb58b4f94428373f2a1d6cb47a4d056ac119561c9ba9ded4f

data/CHANGELOG

@@ -1,5 +1,29 @@
 # CHANGELOG
 
+## 20261011
+
+1.3.11: A repeated body keeps the Content-Type it was sent with.
+
+A 307 or 308 repeats the request with its body, and form data, `HTTP.post(uri, {a: 1})`, was repeated without its Content-Type: `form_data=` sets application/x-www-form-urlencoded upon the request object rather than among the headers given, and the request repeated is a new one, made from those headers. So the server was sent `a=1` and no type to read it by. A body sent with a Content-Type among its headers, JSON or XML, kept it, which is why it went unnoticed. As old as the 307 handling: 1.3.2 does the same.
+
+1. ~ lib/HTTP/REDIRECT.rb: + HTTP.body_headers, which adds the request object's Content-Type to the headers where they carry none of their own.
+2. ~ HTTP.request: a 307 or 308 is followed with body_headers, and then redirect_headers, rather than redirect_headers alone.
+3. ~ test/HTTP/REDIRECT_test.rb: + form data's Content-Type kept through a 307 and through a 308, both failing against 1.3.10, and a Content-Type given among the headers kept in preference to it, which passes either way, being a guard.
+4. ~ HTTP::VERSION: /1.3.10/1.3.11/
+
+
+## 20261011
+
+1.3.10: A block is yielded to once, with the response.
+
+With a block, a followed redirect yielded the final response to it, and then yielded again whatever the block had returned, since that is what the redirected request returned and it was taken for the response: a block which returned an Array was handed that Array. With no_redirect set, the block was yielded the redirect and the redirect was then followed regardless, the branch yielding without returning, so the block was yielded to three times and a request was made which had been asked not to be.
+
+1. ~ HTTP.request: a followed redirect returns what the redirected request returns, which has already been yielded where there is a block, rather than yielding it again.
+2. ~ HTTP.request: no_redirect is a condition of following rather than a branch of its own, so that the redirect is yielded or returned as any other response is, and not followed.
+3. ~ test/HTTP/REDIRECT_test.rb: + one yield with the final response when a redirect is followed, and one with the redirect when no_redirect is set. Both fail against 1.3.9.
+4. ~ HTTP::VERSION: /1.3.9/1.3.10/
+
+
 ## 20261011
 
 1.3.9: Only a 301, 302, 303, 307, or 308 with a Location is followed.

data/lib/HTTP/REDIRECT.rb

@@ -29,6 +29,15 @@ module HTTP
   end
   module_function :redirect_headers
 
+  # A body repeated carries the type it was sent with, which form data sets upon the
+  # request object rather than among the headers given.
+  def body_headers(headers, request_object)
+    return headers unless request_object['content-type']
+    return headers if headers.any?{|k, v| k.downcase == 'content-type'}
+    headers.merge('Content-Type' => request_object['content-type'])
+  end
+  module_function :body_headers
+
   def redirect_options(options, from_uri, to_uri)
     return options if same_origin?(from_uri, to_uri)
     options.reject{|k, v| %i{username password}.include?(k)}

data/lib/HTTP/VERSION.rb

@@ -2,5 +2,5 @@
 # HTTP::VERSION
 
 module HTTP
-  VERSION = '1.3.9'
+  VERSION = '1.3.11'
 end

data/lib/HTTP/request.rb

@@ -40,19 +40,14 @@ module HTTP
         http.request(request_object)
       end
     )
-    if redirect?(response)
-      if block_given? && no_redirect
-        yield response
-      elsif no_redirect
-        return response
-      end
+    if !no_redirect && redirect?(response)
       redirect_uri = uri.merge(response['location'])
       onward_options = redirect_options(given_options, uri, redirect_uri)
       if response.code =~ /^30[78]$/
         data = METHODS::WITH_BODY.include?(request_method) ? request_object.body : {}
-        response = send(request_method, redirect_uri.to_s, data, redirect_headers(headers, uri, redirect_uri), onward_options, &block)
+        return send(request_method, redirect_uri.to_s, data, redirect_headers(body_headers(headers, request_object), uri, redirect_uri), onward_options, &block)
       else
-        response = get(redirect_uri.to_s, {}, redirect_headers(headers, uri, redirect_uri, drop_content_type: true), onward_options, &block)
+        return get(redirect_uri.to_s, {}, redirect_headers(headers, uri, redirect_uri, drop_content_type: true), onward_options, &block)
       end
     end
     if block_given?

data/test/HTTP/REDIRECT_test.rb

@@ -111,4 +111,38 @@ describe "redirect behaviour" do
       _(HTTP.get(uri).code).must_equal('302')
     end
   end
+
+  describe "with a block" do
+    it "yields once when a redirect is followed" do
+      stub_request(:get, uri).to_return(status: 302, headers: {'location' => other_origin_uri})
+      stub_request(:get, other_origin_uri).to_return(status: 200)
+      yielded = []
+      HTTP.get(uri){|response| yielded << response.code}
+      _(yielded).must_equal(['200'])
+    end
+
+    it "yields once, with the redirect, when no_redirect is set" do
+      stub_request(:get, uri).to_return(status: 302, headers: {'location' => other_origin_uri})
+      yielded = []
+      HTTP.get(uri, {}, {}, {no_redirect: true}){|response| yielded << response.code}
+      _(yielded).must_equal(['302'])
+      assert_not_requested(:get, other_origin_uri)
+    end
+  end
+
+  describe "a repeated body" do
+    %w{307 308}.each do |code|
+      it "keeps the Content-Type form data was sent with via #{code}" do
+        stub_request(:post, uri).with(headers: {'Content-Type' => 'application/x-www-form-urlencoded'}).to_return(status: code.to_i, headers: {'location' => same_origin_uri})
+        stub_request(:post, same_origin_uri).with(body: 'a=1', headers: {'Content-Type' => 'application/x-www-form-urlencoded'}).to_return(status: 200)
+        _(HTTP.post(uri, {a: 1}).success?).must_equal(true)
+      end
+    end
+
+    it "keeps the Content-Type it was given rather than that of form data" do
+      stub_request(:post, uri).to_return(status: 307, headers: {'location' => same_origin_uri})
+      stub_request(:post, same_origin_uri).with(body: '{"a":1}', headers: {'Content-Type' => 'application/json'}).to_return(status: 200)
+      _(HTTP.post(uri, {a: 1}, {'Content-Type' => 'application/json'}).success?).must_equal(true)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http.rb
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.11
 platform: ruby
 authors:
 - thoran