diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/media_proxy/media_proxy_controller.ex | 7 |
1 files changed, 6 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 1e9520d46..8403850ff 100644 --- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex +++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex @@ -30,7 +30,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do def filename_matches(%{"filename" => _} = _, path, url) do filename = MediaProxy.filename(url) - if filename && Path.basename(path) != filename do + if filename && does_not_match(path, filename) do {:wrong_filename, filename} else :ok @@ -38,4 +38,9 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do end def filename_matches(_, _, _), do: :ok + + defp does_not_match(path, filename) do + basename = Path.basename(path) + basename != filename and URI.decode(basename) != filename and URI.encode(basename) != filename + end end |