moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#2497] Fixed merge issue.

This commit is contained in:
Ivan Tashkinov 2020-07-05 19:02:43 +03:00
parent 61180ab6f4
commit 9faa632037
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/media_proxy/media_proxy_controller.ex
View File

@ -12,8 +12,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
def remote(conn, %{"sig" => sig64, "url" => url64}) do
with {_, true} <- {:enabled, MediaProxy.enabled?()},
{_, false} <- {:in_banned_urls, MediaProxy.in_banned_urls(url)},
{:ok, url} <- MediaProxy.decode_url(sig64, url64),
{_, false} <- {:in_banned_urls, MediaProxy.in_banned_urls(url)},
:ok <- MediaProxy.verify_request_path_and_url(conn, url) do
proxy_opts = Config.get([:media_proxy, :proxy_opts], [])
ReverseProxy.call(conn, url, proxy_opts)