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

Limit body size to 25MB

Browse Source
This commit is contained in:
href 2017-12-11 02:31:37 +01:00
parent 72f7baa654
commit 077faaed8c
No known key found for this signature in database
GPG Key ID: EE8296C1A152C325
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/pleroma/web/media_proxy/controller.ex
View File

@ -2,6 +2,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
use Pleroma.Web, :controller use Pleroma.Web, :controller
require Logger require Logger
@max_body_length 25 * 1048576
@cache_control %{ @cache_control %{
default: "public, max-age=1209600", default: "public, max-age=1209600",
error: "public, must-revalidate, max-age=160", error: "public, must-revalidate, max-age=160",
@ -29,11 +31,13 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
defp proxy_request(link) do defp proxy_request(link) do
headers = [{"user-agent", "Pleroma/MediaProxy; #{Pleroma.Web.base_url()} <#{Application.get_env(:pleroma, :instance)[:email]}>"}] headers = [{"user-agent", "Pleroma/MediaProxy; #{Pleroma.Web.base_url()} <#{Application.get_env(:pleroma, :instance)[:email]}>"}]
options = [:insecure, {:follow_redirect, true}] options = [:insecure, {:follow_redirect, true}]
case :hackney.request(:get, link, headers, "", options) do with \
{:ok, 200, headers, client} -> {:ok, 200, headers, client} <- :hackney.request(:get, link, headers, "", options),
{:ok, body} <- proxy_request_body(client)
do
headers = Enum.into(headers, Map.new) headers = Enum.into(headers, Map.new)
{:ok, body} = :hackney.body(client)
{:ok, headers["Content-Type"], body} {:ok, headers["Content-Type"], body}
else
{:ok, status, _, _} -> {:ok, status, _, _} ->
Logger.warn "MediaProxy: request failed, status #{status}, link: #{link}" Logger.warn "MediaProxy: request failed, status #{status}, link: #{link}"
{:error, {:http, :bad_status, link}} {:error, {:http, :bad_status, link}}
@ -56,4 +60,18 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
|> send_resp(code, body) |> send_resp(code, body)
end end
defp proxy_request_body(client), do: proxy_request_body(client, <<>>)
defp proxy_request_body(client, body) when byte_size(body) < @max_body_length do
case :hackney.stream_body(client) do
{:ok, data} -> proxy_request_body(client, <<body :: binary, data :: binary>>)
:done -> {:ok, body}
{:error, reason} -> {:error, reason}
end
end
defp proxy_request_body(client, _) do
:hackney.close(client)
{:error, :body_too_large}
end
end end