diff options
| author | lain <lain@soykaf.club> | 2018-03-30 15:01:53 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-03-30 15:01:53 +0200 |
| commit | 4afbef39f49948ddd3b1cd1bbda58ff7e3ac2785 (patch) | |
| tree | 6959e12d9058c981f3b69c77b8b0290049651cd6 /lib/pleroma/web/media_proxy | |
| parent | 480932c8e524e1a80c9c8ef1a1aa23379f633afe (diff) | |
| download | pleroma-4afbef39f49948ddd3b1cd1bbda58ff7e3ac2785.tar.gz | |
Format the code.
Diffstat (limited to 'lib/pleroma/web/media_proxy')
| -rw-r--r-- | lib/pleroma/web/media_proxy/controller.ex | 57 | ||||
| -rw-r--r-- | lib/pleroma/web/media_proxy/media_proxy.ex | 7 |
2 files changed, 39 insertions, 25 deletions
diff --git a/lib/pleroma/web/media_proxy/controller.ex b/lib/pleroma/web/media_proxy/controller.ex index b0bbe8b64..8195a665e 100644 --- a/lib/pleroma/web/media_proxy/controller.ex +++ b/lib/pleroma/web/media_proxy/controller.ex @@ -4,47 +4,59 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do @httpoison Application.get_env(:pleroma, :httpoison) - @max_body_length 25 * 1048576 + @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), - {: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 = @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 + 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 @@ -63,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, <<body :: binary, data :: binary>>) + {: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} @@ -80,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 diff --git a/lib/pleroma/web/media_proxy/media_proxy.ex b/lib/pleroma/web/media_proxy/media_proxy.ex index 23efc18fa..37718f48b 100644 --- a/lib/pleroma/web/media_proxy/media_proxy.ex +++ b/lib/pleroma/web/media_proxy/media_proxy.ex @@ -7,14 +7,15 @@ defmodule Pleroma.Web.MediaProxy do def url(url) do config = Application.get_env(:pleroma, :media_proxy, []) - if !Keyword.get(config, :enabled, false) or String.starts_with?(url, Pleroma.Web.base_url) do + + if !Keyword.get(config, :enabled, false) or String.starts_with?(url, Pleroma.Web.base_url()) do url else secret = Application.get_env(:pleroma, Pleroma.Web.Endpoint)[:secret_key_base] base64 = Base.url_encode64(url, @base64_opts) sig = :crypto.hmac(:sha, secret, base64) sig64 = sig |> Base.url_encode64(@base64_opts) - Keyword.get(config, :base_url, Pleroma.Web.base_url) <> "/proxy/#{sig64}/#{base64}" + Keyword.get(config, :base_url, Pleroma.Web.base_url()) <> "/proxy/#{sig64}/#{base64}" end end @@ -22,11 +23,11 @@ defmodule Pleroma.Web.MediaProxy do secret = Application.get_env(:pleroma, Pleroma.Web.Endpoint)[:secret_key_base] sig = Base.url_decode64!(sig, @base64_opts) local_sig = :crypto.hmac(:sha, secret, url) + if local_sig == sig do {:ok, Base.url_decode64!(url, @base64_opts)} else {:error, :invalid_signature} end end - end |