diff options
| author | lain <lain@soykaf.club> | 2018-12-05 21:27:56 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-12-05 21:27:56 +0100 |
| commit | 76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed (patch) | |
| tree | 5308f2d4c169085dfbe22a95a86c5271e4285ace /lib/pleroma/web/media_proxy | |
| parent | 3ea4476445a5e9b6ec1625d7caa537f79254e9d0 (diff) | |
| parent | 5f0c2372bc8be3763b649b13ee142c273583329e (diff) | |
| download | pleroma-76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed.tar.gz | |
Merge remote-tracking branch 'origin' into follower-hiding
Diffstat (limited to 'lib/pleroma/web/media_proxy')
| -rw-r--r-- | lib/pleroma/web/media_proxy/controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/media_proxy/controller.ex b/lib/pleroma/web/media_proxy/controller.ex index 81ea5d510..e1b87e026 100644 --- a/lib/pleroma/web/media_proxy/controller.ex +++ b/lib/pleroma/web/media_proxy/controller.ex @@ -5,12 +5,12 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do @default_proxy_opts [max_body_length: 25 * 1_048_576] def remote(conn, params = %{"sig" => sig64, "url" => url64}) do - with config <- Pleroma.Config.get([:media_proxy]), + with config <- Pleroma.Config.get([:media_proxy], []), true <- Keyword.get(config, :enabled, false), {:ok, url} <- MediaProxy.decode_url(sig64, url64), filename <- Path.basename(URI.parse(url).path), :ok <- filename_matches(Map.has_key?(params, "filename"), conn.request_path, url) do - ReverseProxy.call(conn, url, Keyword.get(config, :proxy_opts, @default_proxy_length)) + ReverseProxy.call(conn, url, Keyword.get(config, :proxy_opts, @default_proxy_opts)) else false -> send_resp(conn, 404, Plug.Conn.Status.reason_phrase(404)) |