Commit 42ef7cd2 authored by lain's avatar lain
Browse files

Merge branch 'fix-media-proxy-defaults' into 'develop'

Fix media proxy config defaults

See merge request pleroma/pleroma!495
parents a3f9cca7 43d5e4f7
Pipeline #4868 passed with stages
in 2 minutes and 23 seconds
......@@ -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, url, Keyword.get(config, :proxy_opts, @default_proxy_length)), url, Keyword.get(config, :proxy_opts, @default_proxy_opts))
false ->
send_resp(conn, 404, Plug.Conn.Status.reason_phrase(404))
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment