diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-03 16:14:58 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-03 16:14:58 +0000 |
| commit | 42ef7cd227ba075fbd05e9625dc880feddee4417 (patch) | |
| tree | affd2cc83846f64b0c01102f661eba3d2a8cfcec /lib | |
| parent | a3f9cca78c16026025f0cbadc50c7683d7444e86 (diff) | |
| parent | 43d5e4f7fa4cfe9da8b3969847a1132e62a9e68b (diff) | |
| download | pleroma-42ef7cd227ba075fbd05e9625dc880feddee4417.tar.gz | |
Merge branch 'fix-media-proxy-defaults' into 'develop'
Fix media proxy config defaults
See merge request pleroma/pleroma!495
Diffstat (limited to 'lib')
| -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)) |