X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmedia_proxy%2Fcontroller.ex;h=8195a665edc1c7da5ab5bd4f0d7e09db5f0694ee;hb=f6cb963df208a1f24aa195fda4ed894caac9e7bc;hp=0ac70c9d817080754d566e8eed9b56927d4190aa;hpb=35ac549a99f325d2e73c03d7c2951f3d6570b7b4;p=akkoma diff --git a/lib/pleroma/web/media_proxy/controller.ex b/lib/pleroma/web/media_proxy/controller.ex index 0ac70c9d8..8195a665e 100644 --- a/lib/pleroma/web/media_proxy/controller.ex +++ b/lib/pleroma/web/media_proxy/controller.ex @@ -2,48 +2,61 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do use Pleroma.Web, :controller require Logger - @max_body_length 25 * 1048576 + @httpoison Application.get_env(:pleroma, :httpoison) + + @max_body_length 25 * 1_048_576 @cache_control %{ default: "public, max-age=1209600", - error: "public, must-revalidate, max-age=160", + error: "public, must-revalidate, max-age=160" } def remote(conn, %{"sig" => sig, "url" => url}) do config = Application.get_env(:pleroma, :media_proxy, []) - with \ - true <- Keyword.get(config, :enabled, false), - {:ok, url} <- Pleroma.Web.MediaProxy.decode_url(sig, url), - url = URI.encode(url), - {:ok, content_type, body} <- proxy_request(url) - do + + with true <- Keyword.get(config, :enabled, false), + {:ok, url} <- Pleroma.Web.MediaProxy.decode_url(sig, url), + {:ok, content_type, body} <- proxy_request(url) do conn |> put_resp_content_type(content_type) |> set_cache_header(:default) |> send_resp(200, body) else - false -> send_error(conn, 404) - {:error, :invalid_signature} -> send_error(conn, 403) - {:error, {:http, _, url}} -> redirect_or_error(conn, url, Keyword.get(config, :redirect_on_failure, true)) + false -> + send_error(conn, 404) + + {:error, :invalid_signature} -> + send_error(conn, 403) + + {:error, {:http, _, url}} -> + redirect_or_error(conn, url, Keyword.get(config, :redirect_on_failure, true)) end end defp proxy_request(link) do - headers = [{"user-agent", "Pleroma/MediaProxy; #{Pleroma.Web.base_url()} <#{Application.get_env(:pleroma, :instance)[:email]}>"}] - options = [:insecure, {:follow_redirect, true}] - with \ - {:ok, 200, headers, client} <- :hackney.request(:get, link, headers, "", options), - headers = Enum.into(headers, Map.new), - {:ok, body} <- proxy_request_body(client), - content_type <- proxy_request_content_type(headers, body) - do + headers = [ + {"user-agent", + "Pleroma/MediaProxy; #{Pleroma.Web.base_url()} <#{ + Application.get_env(:pleroma, :instance)[:email] + }>"} + ] + + options = + @httpoison.process_request_options([:insecure, {:follow_redirect, true}]) ++ + [{:pool, :default}] + + with {:ok, 200, headers, client} <- :hackney.request(:get, link, headers, "", options), + headers = Enum.into(headers, Map.new()), + {:ok, body} <- proxy_request_body(client), + content_type <- proxy_request_content_type(headers, body) do {:ok, content_type, body} else {: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, error} -> - Logger.warn "MediaProxy: request failed, error #{inspect error}, link: #{link}" + Logger.warn("MediaProxy: request failed, error #{inspect(error)}, link: #{link}") {:error, {:http, error, link}} end end @@ -62,13 +75,15 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do 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, <>) + {:ok, data} -> proxy_request_body(client, <>) :done -> {:ok, body} {:error, reason} -> {:error, reason} end end + defp proxy_request_body(client, _) do :hackney.close(client) {:error, :body_too_large} @@ -79,5 +94,4 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do defp proxy_request_content_type(headers, _body) do headers["Content-Type"] || headers["content-type"] || "image/jpeg" end - end