projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/1072-muting-notifications' into 'develop'
[akkoma]
/
test
/
media_proxy_test.exs
diff --git
a/test/media_proxy_test.exs
b/test/media_proxy_test.exs
index 13922fe4ae3f4ef433b1695f5f94eeb6b915cb6c..fbf2009310382a3f4cd70da33b0b5166006689a2 100644
(file)
--- a/
test/media_proxy_test.exs
+++ b/
test/media_proxy_test.exs
@@
-88,10
+88,10
@@
defmodule Pleroma.MediaProxyTest do
assert decode_url(sig, base64) == {:error, :invalid_signature}
end
assert decode_url(sig, base64) == {:error, :invalid_signature}
end
- test "filename_matches
matches url encoded paths
" do
+ test "filename_matches
preserves the encoded or decoded path
" do
assert MediaProxyController.filename_matches(
true,
assert MediaProxyController.filename_matches(
true,
- "/Hello
%20
world.jpg",
+ "/Hello
world.jpg",
"http://pleroma.social/Hello world.jpg"
) == :ok
"http://pleroma.social/Hello world.jpg"
) == :ok
@@
-100,19
+100,11
@@
defmodule Pleroma.MediaProxyTest do
"/Hello%20world.jpg",
"http://pleroma.social/Hello%20world.jpg"
) == :ok
"/Hello%20world.jpg",
"http://pleroma.social/Hello%20world.jpg"
) == :ok
- end
-
- test "filename_matches matches non-url encoded paths" do
- assert MediaProxyController.filename_matches(
- true,
- "/Hello world.jpg",
- "http://pleroma.social/Hello%20world.jpg"
- ) == :ok
assert MediaProxyController.filename_matches(
true,
assert MediaProxyController.filename_matches(
true,
- "/
Hello world
.jpg",
- "http://pleroma.social/
Hello world
.jpg"
+ "/
my%2Flong%2Furl%2F2019%2F07%2FS
.jpg",
+ "http://pleroma.social/
my%2Flong%2Furl%2F2019%2F07%2FS
.jpg"
) == :ok
end
) == :ok
end
@@
-156,6
+148,13
@@
defmodule Pleroma.MediaProxyTest do
assert decode_result(encoded) == url
end
assert decode_result(encoded) == url
end
+ test "preserve unicode characters" do
+ url = "https://ko.wikipedia.org/wiki/위키백과:대문"
+
+ encoded = url(url)
+ assert decode_result(encoded) == url
+ end
+
test "does not change whitelisted urls" do
upload_config = Pleroma.Config.get([Pleroma.Upload])
media_url = "https://media.pleroma.social"
test "does not change whitelisted urls" do
upload_config = Pleroma.Config.get([Pleroma.Upload])
media_url = "https://media.pleroma.social"