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

Merge branch 'match-file-name' into 'develop'

Browse source 
try to always match the filename for proxy url

See merge request pleroma/pleroma!1405
This commit is contained in:
feld 2019-07-15 22:04:58 +00:00
commit 9f987dd017
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/media_proxy_controller.ex
View file

@ -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