projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused dependencies
[akkoma]
/
test
/
pleroma
/
web
/
activity_pub
/
mrf_test.exs
diff --git
a/test/pleroma/web/activity_pub/mrf_test.exs
b/test/pleroma/web/activity_pub/mrf_test.exs
index 6ab27bc8676f91d9c4bc234fbae7c1240e99776f..86ad0ab6b2ed4224e724ae1caa984895b45df2f0 100644
(file)
--- a/
test/pleroma/web/activity_pub/mrf_test.exs
+++ b/
test/pleroma/web/activity_pub/mrf_test.exs
@@
-9,8
+9,8
@@
defmodule Pleroma.Web.ActivityPub.MRFTest do
test "subdomains_regex/1" do
assert MRF.subdomains_regex(["unsafe.tld", "*.unsafe.tld"]) == [
test "subdomains_regex/1" do
assert MRF.subdomains_regex(["unsafe.tld", "*.unsafe.tld"]) == [
- ~r/^
unsafe
.tld$/i,
- ~r/^(.
*\.)*unsafe
.tld$/i
+ ~r/^
(.+\.)?unsafe\
.tld$/i,
+ ~r/^(.
+\.)?unsafe\
.tld$/i
]
end
]
end
@@
-18,7
+18,7
@@
defmodule Pleroma.Web.ActivityPub.MRFTest do
test "common domains" do
regexes = MRF.subdomains_regex(["unsafe.tld", "unsafe2.tld"])
test "common domains" do
regexes = MRF.subdomains_regex(["unsafe.tld", "unsafe2.tld"])
- assert regexes == [~r/^
unsafe.tld$/i, ~r/^unsafe2
.tld$/i]
+ assert regexes == [~r/^
(.+\.)?unsafe\.tld$/i, ~r/^(.+\.)?unsafe2\
.tld$/i]
assert MRF.subdomain_match?(regexes, "unsafe.tld")
assert MRF.subdomain_match?(regexes, "unsafe2.tld")
assert MRF.subdomain_match?(regexes, "unsafe.tld")
assert MRF.subdomain_match?(regexes, "unsafe2.tld")
@@
-27,9
+27,9
@@
defmodule Pleroma.Web.ActivityPub.MRFTest do
end
test "wildcard domains with one subdomain" do
end
test "wildcard domains with one subdomain" do
- regexes = MRF.subdomains_regex(["
*.
unsafe.tld"])
+ regexes = MRF.subdomains_regex(["unsafe.tld"])
- assert regexes == [~r/^(.
*\.)*unsafe
.tld$/i]
+ assert regexes == [~r/^(.
+\.)?unsafe\
.tld$/i]
assert MRF.subdomain_match?(regexes, "unsafe.tld")
assert MRF.subdomain_match?(regexes, "sub.unsafe.tld")
assert MRF.subdomain_match?(regexes, "unsafe.tld")
assert MRF.subdomain_match?(regexes, "sub.unsafe.tld")
@@
-38,9
+38,9
@@
defmodule Pleroma.Web.ActivityPub.MRFTest do
end
test "wildcard domains with two subdomains" do
end
test "wildcard domains with two subdomains" do
- regexes = MRF.subdomains_regex(["
*.
unsafe.tld"])
+ regexes = MRF.subdomains_regex(["unsafe.tld"])
- assert regexes == [~r/^(.
*\.)*unsafe
.tld$/i]
+ assert regexes == [~r/^(.
+\.)?unsafe\
.tld$/i]
assert MRF.subdomain_match?(regexes, "unsafe.tld")
assert MRF.subdomain_match?(regexes, "sub.sub.unsafe.tld")
assert MRF.subdomain_match?(regexes, "unsafe.tld")
assert MRF.subdomain_match?(regexes, "sub.sub.unsafe.tld")
@@
-51,7
+51,7
@@
defmodule Pleroma.Web.ActivityPub.MRFTest do
test "matches are case-insensitive" do
regexes = MRF.subdomains_regex(["UnSafe.TLD", "UnSAFE2.Tld"])
test "matches are case-insensitive" do
regexes = MRF.subdomains_regex(["UnSafe.TLD", "UnSAFE2.Tld"])
- assert regexes == [~r/^
UnSafe.TLD$/i, ~r/^UnSAFE2
.Tld$/i]
+ assert regexes == [~r/^
(.+\.)?UnSafe\.TLD$/i, ~r/^(.+\.)?UnSAFE2\
.Tld$/i]
assert MRF.subdomain_match?(regexes, "UNSAFE.TLD")
assert MRF.subdomain_match?(regexes, "UNSAFE2.TLD")
assert MRF.subdomain_match?(regexes, "UNSAFE.TLD")
assert MRF.subdomain_match?(regexes, "UNSAFE2.TLD")
@@
-77,7
+77,7
@@
defmodule Pleroma.Web.ActivityPub.MRFTest do
clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.NoOpPolicy])
expected = %{
clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.NoOpPolicy])
expected = %{
- mrf_policies: ["NoOpPolicy", "HashtagPolicy"],
+ mrf_policies: ["NoOpPolicy", "HashtagPolicy"
, "InlineQuotePolicy", "NormalizeMarkup"
],
mrf_hashtag: %{
federated_timeline_removal: [],
reject: [],
mrf_hashtag: %{
federated_timeline_removal: [],
reject: [],
@@
-93,7
+93,7
@@
defmodule Pleroma.Web.ActivityPub.MRFTest do
clear_config([:mrf, :policies], [MRFModuleMock])
expected = %{
clear_config([:mrf, :policies], [MRFModuleMock])
expected = %{
- mrf_policies: ["MRFModuleMock", "HashtagPolicy"],
+ mrf_policies: ["MRFModuleMock", "HashtagPolicy"
, "InlineQuotePolicy", "NormalizeMarkup"
],
mrf_module_mock: "some config data",
mrf_hashtag: %{
federated_timeline_removal: [],
mrf_module_mock: "some config data",
mrf_hashtag: %{
federated_timeline_removal: [],