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

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

View File

@ -30,7 +30,7 @@ def remote(conn, %{"sig" => sig64, "url" => url64} = params) do
def filename_matches(%{"filename" => _} = _, path, url) do def filename_matches(%{"filename" => _} = _, path, url) do
filename = MediaProxy.filename(url) filename = MediaProxy.filename(url)
if filename && Path.basename(path) != filename do if filename && does_not_match(path, filename) do
{:wrong_filename, filename} {:wrong_filename, filename}
else else
:ok :ok
@ -38,4 +38,9 @@ def filename_matches(%{"filename" => _} = _, path, url) do
end end
def filename_matches(_, _, _), do: :ok 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 end

View File

@ -114,6 +114,17 @@ test "filename_matches preserves the encoded or decoded path" do
) == {:wrong_filename, "my%2Flong%2Furl%2F2019%2F07%2FS.jpg"} ) == {:wrong_filename, "my%2Flong%2Furl%2F2019%2F07%2FS.jpg"}
end end
test "encoded url are tried to match for proxy as `conn.request_path` encodes the url" do
# conn.request_path will return encoded url
request_path = "/ANALYSE-DAI-_-LE-STABLECOIN-100-D%C3%89CENTRALIS%C3%89-BQ.jpg"
assert MediaProxyController.filename_matches(
true,
request_path,
"https://mydomain.com/uploads/2019/07/ANALYSE-DAI-_-LE-STABLECOIN-100-DÉCENTRALISÉ-BQ.jpg"
) == :ok
end
test "uses the configured base_url" do test "uses the configured base_url" do
base_url = Pleroma.Config.get([:media_proxy, :base_url]) base_url = Pleroma.Config.get([:media_proxy, :base_url])