fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-22 22:49:25 +00:00
Code Issues Packages Projects Releases 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
parent 03bcb40883 1d906ffa82
commit 9f987dd017
2 changed files with 17 additions and 1 deletions
Show stats 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

11
test/web/media_proxy/media_proxy_test.exs
View file

@ -114,6 +114,17 @@ defmodule Pleroma.Web.MediaProxyTest do
) == {:wrong_filename, "my%2Flong%2Furl%2F2019%2F07%2FS.jpg"}
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
base_url = Pleroma.Config.get([:media_proxy, :base_url])