projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1276
[akkoma]
/
test
/
web
/
activity_pub
/
mrf
/
simple_policy_test.exs
diff --git
a/test/web/activity_pub/mrf/simple_policy_test.exs
b/test/web/activity_pub/mrf/simple_policy_test.exs
index 7203b27daaedb07ab9cabf13880033e3b19ba288..5aebbc6757c3101443b2a9ccc06f906f8947750a 100644
(file)
--- a/
test/web/activity_pub/mrf/simple_policy_test.exs
+++ b/
test/web/activity_pub/mrf/simple_policy_test.exs
@@
-8,18
+8,17
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do
alias Pleroma.Config
alias Pleroma.Web.ActivityPub.MRF.SimplePolicy
alias Pleroma.Config
alias Pleroma.Web.ActivityPub.MRF.SimplePolicy
- clear_config([:mrf_simple]) do
- Config.put(:mrf_simple,
- media_removal: [],
- media_nsfw: [],
- federated_timeline_removal: [],
- report_removal: [],
- reject: [],
- accept: [],
- avatar_removal: [],
- banner_removal: []
- )
- end
+ setup do:
+ clear_config(:mrf_simple,
+ media_removal: [],
+ media_nsfw: [],
+ federated_timeline_removal: [],
+ report_removal: [],
+ reject: [],
+ accept: [],
+ avatar_removal: [],
+ banner_removal: []
+ )
describe "when :media_removal" do
test "is empty" do
describe "when :media_removal" do
test "is empty" do
@@
-236,7
+235,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do
assert SimplePolicy.filter(remote_message) == {:ok, remote_message}
end
assert SimplePolicy.filter(remote_message) == {:ok, remote_message}
end
- test "has a matching host" do
+ test "
activity
has a matching host" do
Config.put([:mrf_simple, :reject], ["remote.instance"])
remote_message = build_remote_message()
Config.put([:mrf_simple, :reject], ["remote.instance"])
remote_message = build_remote_message()
@@
-244,13
+243,21
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do
assert SimplePolicy.filter(remote_message) == {:reject, nil}
end
assert SimplePolicy.filter(remote_message) == {:reject, nil}
end
- test "
match
with wildcard domain" do
+ test "
activity matches
with wildcard domain" do
Config.put([:mrf_simple, :reject], ["*.remote.instance"])
remote_message = build_remote_message()
assert SimplePolicy.filter(remote_message) == {:reject, nil}
end
Config.put([:mrf_simple, :reject], ["*.remote.instance"])
remote_message = build_remote_message()
assert SimplePolicy.filter(remote_message) == {:reject, nil}
end
+
+ test "actor has a matching host" do
+ Config.put([:mrf_simple, :reject], ["remote.instance"])
+
+ remote_user = build_remote_user()
+
+ assert SimplePolicy.filter(remote_user) == {:reject, nil}
+ end
end
describe "when :accept" do
end
describe "when :accept" do
@@
-264,7
+271,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do
assert SimplePolicy.filter(remote_message) == {:ok, remote_message}
end
assert SimplePolicy.filter(remote_message) == {:ok, remote_message}
end
- test "is not empty but
it
doesn't have a matching host" do
+ test "is not empty but
activity
doesn't have a matching host" do
Config.put([:mrf_simple, :accept], ["non.matching.remote"])
local_message = build_local_message()
Config.put([:mrf_simple, :accept], ["non.matching.remote"])
local_message = build_local_message()
@@
-274,7
+281,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do
assert SimplePolicy.filter(remote_message) == {:reject, nil}
end
assert SimplePolicy.filter(remote_message) == {:reject, nil}
end
- test "has a matching host" do
+ test "
activity
has a matching host" do
Config.put([:mrf_simple, :accept], ["remote.instance"])
local_message = build_local_message()
Config.put([:mrf_simple, :accept], ["remote.instance"])
local_message = build_local_message()
@@
-284,7
+291,7
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do
assert SimplePolicy.filter(remote_message) == {:ok, remote_message}
end
assert SimplePolicy.filter(remote_message) == {:ok, remote_message}
end
- test "
match
with wildcard domain" do
+ test "
activity matches
with wildcard domain" do
Config.put([:mrf_simple, :accept], ["*.remote.instance"])
local_message = build_local_message()
Config.put([:mrf_simple, :accept], ["*.remote.instance"])
local_message = build_local_message()
@@
-293,6
+300,14
@@
defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do
assert SimplePolicy.filter(local_message) == {:ok, local_message}
assert SimplePolicy.filter(remote_message) == {:ok, remote_message}
end
assert SimplePolicy.filter(local_message) == {:ok, local_message}
assert SimplePolicy.filter(remote_message) == {:ok, remote_message}
end
+
+ test "actor has a matching host" do
+ Config.put([:mrf_simple, :accept], ["remote.instance"])
+
+ remote_user = build_remote_user()
+
+ assert SimplePolicy.filter(remote_user) == {:ok, remote_user}
+ end
end
describe "when :avatar_removal" do
end
describe "when :avatar_removal" do