hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

try to always match the filename for proxy url

Browse source
This commit is contained in:
Sachin Joshi 2019-07-12 22:19:30 +05:45
commit f8e3ae6154
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/media_proxy/controller.ex
View file

@ -30,10 +30,15 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
def filename_matches(has_filename, path, url) do
filename = url |> MediaProxy.filename()
if has_filename && filename && Path.basename(path) != filename do
if has_filename && filename && does_not_match(path, filename) do
{:wrong_filename, filename}
else
:ok
end
end
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