fixes raw_post being empty for chunked request

rails · Dec 30, 2019 · a1375fd · a1375fd
1 parent 22483b8
commit a1375fd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
@@ -321,12 +321,23 @@ def server_software
     def raw_post
       unless has_header? "RAW_POST_DATA"
         raw_post_body = body
-        set_header("RAW_POST_DATA", raw_post_body.read(content_length))
+        set_header("RAW_POST_DATA",
+          if chunked?
+            raw_post_body.rewind if raw_post_body.respond_to?(:rewind)
+            raw_post_body.read
+          else
+            raw_post_body.read(content_length)
+          end
+        )
         raw_post_body.rewind if raw_post_body.respond_to?(:rewind)
       end
       get_header "RAW_POST_DATA"
     end
 
+    def chunked?
+      headers["Transfer-Encoding"] =~ /chunked/i
+    end
+
     # The request body is an IO input stream. If the RAW_POST_DATA environment
     # variable is already set, wrap it in a StringIO.
     def body

diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
@@ -990,6 +990,12 @@ def test_parsed_body_with_as_option
     post :render_json, body: { foo: "heyo" }.to_json, as: :json
     assert_equal({ "foo" => "heyo" }, response.parsed_body)
   end
+
+  def test_chunked_request
+    @request.headers["Transfer-Encoding"] = "chunked"
+    post :test_params, params: { foo: "heyo" }, xhr: true
+    assert_equal("foo=heyo", @request.raw_post)
+  end
 end
 
 class ResponseDefaultHeadersTest < ActionController::TestCase