Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'

Fix recipient count in hellthread policy

See merge request pleroma/pleroma!836
This commit is contained in:
lambda 2019-02-17 16:57:57 +00:00
commit ae84af4ad0
2 changed files with 47 additions and 24 deletions

View File

@ -12,14 +12,14 @@ defp delist_message(message, threshold) when threshold > 0 do
follower_collection? = Enum.member?(message["to"] ++ message["cc"], follower_collection) follower_collection? = Enum.member?(message["to"] ++ message["cc"], follower_collection)
message = message =
case recipients = get_recipient_count(message) do case get_recipient_count(message) do
{:public, _} {:public, recipients}
when follower_collection? and recipients > threshold -> when follower_collection? and recipients > threshold ->
message message
|> Map.put("to", [follower_collection]) |> Map.put("to", [follower_collection])
|> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"]) |> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])
{:public, _} when recipients > threshold -> {:public, recipients} when recipients > threshold ->
message message
|> Map.put("to", []) |> Map.put("to", [])
|> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"]) |> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])

View File

@ -8,7 +8,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicyTest do
import Pleroma.Web.ActivityPub.MRF.HellthreadPolicy import Pleroma.Web.ActivityPub.MRF.HellthreadPolicy
describe "hellthread filter tests" do
setup do setup do
user = insert(:user) user = insert(:user)
@ -18,22 +17,38 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicyTest do
"type" => "Create", "type" => "Create",
"to" => [ "to" => [
"https://www.w3.org/ns/activitystreams#Public", "https://www.w3.org/ns/activitystreams#Public",
"https://instace.tld/users/user1", "https://instance.tld/users/user1",
"https://instace.tld/users/user2", "https://instance.tld/users/user2",
"https://instace.tld/users/user3" "https://instance.tld/users/user3"
] ]
} }
[user: user, message: message] [user: user, message: message]
end end
test "reject test", %{message: message} do describe "reject" do
test "rejects the message if the recipient count is above reject_threshold", %{
message: message
} do
Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 0, reject_threshold: 2}) Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 0, reject_threshold: 2})
{:reject, nil} = filter(message) {:reject, nil} = filter(message)
end end
test "delist test", %{user: user, message: message} do test "does not reject the message if the recipient count is below reject_threshold", %{
message: message
} do
Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 0, reject_threshold: 3})
assert {:ok, ^message} = filter(message)
end
end
describe "delist" do
test "delists the message if the recipient count is above delist_threshold", %{
user: user,
message: message
} do
Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 2, reject_threshold: 0}) Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 2, reject_threshold: 0})
{:ok, message} = filter(message) {:ok, message} = filter(message)
@ -41,10 +56,18 @@ test "delist test", %{user: user, message: message} do
assert "https://www.w3.org/ns/activitystreams#Public" in message["cc"] assert "https://www.w3.org/ns/activitystreams#Public" in message["cc"]
end end
test "does not delist the message if the recipient count is below delist_threshold", %{
message: message
} do
Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 4, reject_threshold: 0})
assert {:ok, ^message} = filter(message)
end
end
test "excludes follower collection and public URI from threshold count", %{message: message} do test "excludes follower collection and public URI from threshold count", %{message: message} do
Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 0, reject_threshold: 3}) Pleroma.Config.put([:mrf_hellthread], %{delist_threshold: 0, reject_threshold: 3})
{:ok, _} = filter(message) assert {:ok, ^message} = filter(message)
end
end end
end end