diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-05 19:02:43 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-05 19:02:43 +0300 |
| commit | 9faa63203717e71d666afb6755ff0b781b491823 (patch) | |
| tree | 5a1cb59cc6f9621e9e016eec4481e171cb2a2f32 | |
| parent | 61180ab6f4b85ab78de2eaf1bc1b974c9e7908af (diff) | |
| download | pleroma-9faa63203717e71d666afb6755ff0b781b491823.tar.gz | |
[#2497] Fixed merge issue.
| -rw-r--r-- | lib/pleroma/web/media_proxy/media_proxy_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex index 0f4575e2f..583c177f2 100644 --- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex +++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex @@ -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) |