aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/media_proxy
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2018-12-10 09:39:57 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2018-12-10 13:27:37 +0300
commite94c3442f4b88f4eedf4e4cc67e91a1375df6afd (patch)
tree77166e480633e16fe854a6cce4d7f19981b3766b /lib/pleroma/web/media_proxy
parent074fa790ba6282772cd8b2d40926032228d17c81 (diff)
downloadpleroma-e94c3442f4b88f4eedf4e4cc67e91a1375df6afd.tar.gz
updates
Diffstat (limited to 'lib/pleroma/web/media_proxy')
-rw-r--r--lib/pleroma/web/media_proxy/controller.ex8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/media_proxy/controller.ex b/lib/pleroma/web/media_proxy/controller.ex
index ce4f15be0..63140feb9 100644
--- a/lib/pleroma/web/media_proxy/controller.ex
+++ b/lib/pleroma/web/media_proxy/controller.ex
@@ -8,7 +8,6 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
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_opts))
else
@@ -31,9 +30,10 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
path = URI.decode(path)
- cond do
- has_filename && filename && Path.basename(path) != filename -> {:wrong_filename, filename}
- true -> :ok
+ if has_filename && filename && Path.basename(path) != filename do
+ {:wrong_filename, filename}
+ else
+ :ok
end
end
end