Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

max_body_size -> max_body_length, as it should be

Browse Source
This commit is contained in:
Mark Felder 2019-08-15 15:34:41 -05:00
parent 4a5b0965a0
commit 6a3b1a526e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/reverse_proxy/reverse_proxy.ex
View File

@ -109,7 +109,7 @@ defmodule Pleroma.ReverseProxy do
end end
with {:ok, code, headers, client} <- request(method, url, req_headers, hackney_opts), with {:ok, code, headers, client} <- request(method, url, req_headers, hackney_opts),
:ok <- header_length_constraint(headers, Keyword.get(opts, :max_body_length)) do :ok <- header_length_constraint(headers, Keyword.get(opts, :max_body_length, @max_body_length)) do
response(conn, client, url, code, headers, opts) response(conn, client, url, code, headers, opts)
else else
{:ok, code, headers} -> {:ok, code, headers} ->
@ -200,7 +200,7 @@ defmodule Pleroma.ReverseProxy do
{:ok, data} <- client().stream_body(client), {:ok, data} <- client().stream_body(client),
{:ok, duration} <- increase_read_duration(duration), {:ok, duration} <- increase_read_duration(duration),
sent_so_far = sent_so_far + byte_size(data), sent_so_far = sent_so_far + byte_size(data),
:ok <- body_size_constraint(sent_so_far, Keyword.get(opts, :max_body_size)), :ok <- body_size_constraint(sent_so_far, Keyword.get(opts, :max_body_length, @max_body_length)),
{:ok, conn} <- chunk(conn, data) do {:ok, conn} <- chunk(conn, data) do
chunk_reply(conn, client, opts, sent_so_far, duration) chunk_reply(conn, client, opts, sent_so_far, duration)
else else

4
test/reverse_proxy_test.exs
View File

@ -108,11 +108,11 @@ defmodule Pleroma.ReverseProxyTest do
end end
end end
test "max_body_size returns error if streaming body more than that option", %{conn: conn} do test "max_body_length returns error if streaming body more than that option", %{conn: conn} do
stream_mock(3, true) stream_mock(3, true)
assert capture_log(fn -> assert capture_log(fn ->
ReverseProxy.call(conn, "/stream-bytes/50", max_body_size: 30) ReverseProxy.call(conn, "/stream-bytes/50", max_body_length: 30)
end) =~ end) =~
"[warn] Elixir.Pleroma.ReverseProxy request to /stream-bytes/50 failed while reading/chunking: :body_too_large" "[warn] Elixir.Pleroma.ReverseProxy request to /stream-bytes/50 failed while reading/chunking: :body_too_large"
end end