mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 00:26:30 +00:00
try to always match the filename for proxy url
This commit is contained in:
parent
b6567c9f4e
commit
f8e3ae6154
2 changed files with 17 additions and 1 deletions
|
@ -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
|
||||
|
|
|
@ -108,6 +108,17 @@ defmodule Pleroma.MediaProxyTest do
|
|||
) == :ok
|
||||
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])
|
||||
|
||||
|
|
Loading…
Reference in a new issue