diff options
| -rw-r--r-- | lib/pleroma/web/media_proxy/media_proxy_controller.ex | 7 | ||||
| -rw-r--r-- | test/web/media_proxy/media_proxy_test.exs | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex index 1e9520d46..8403850ff 100644 --- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex +++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex @@ -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 diff --git a/test/web/media_proxy/media_proxy_test.exs b/test/web/media_proxy/media_proxy_test.exs index cb4807e0b..edbbf9b66 100644 --- a/test/web/media_proxy/media_proxy_test.exs +++ b/test/web/media_proxy/media_proxy_test.exs @@ -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]) |