sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added checks for public url and follower collections

Browse Source
This commit is contained in:
Karen Konou 2019-02-12 23:25:09 +01:00
parent ac72b578da
commit 1d727cd069
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
View File

@ -14,6 +14,23 @@ defp delist_message(message) do
|> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"]) |> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])
end end
defp get_recipient_count(message) do
recipients = (message["to"] || []) ++ (message["cc"] || [])
cond do
Enum.member?(recipients, "https://www.w3.org/ns/activitystreams#Public") &&
Enum.find(recipients, &String.ends_with?(&1, "/followers")) ->
length(recipients) - 2
Enum.member?(recipients, "https://www.w3.org/ns/activitystreams#Public") ||
Enum.find(recipients, &String.ends_with?(&1, "/followers")) ->
length(recipients) - 1
true ->
length(recipients)
end
end
@impl true @impl true
def filter(%{"type" => "Create"} = message) do def filter(%{"type" => "Create"} = message) do
delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold]) delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
@ -24,13 +41,13 @@ def filter(%{"type" => "Create"} = message) do
Pleroma.Config.get([:mrf_hellthread, :threshold]) Pleroma.Config.get([:mrf_hellthread, :threshold])
) )
recipients = (message["to"] || []) ++ (message["cc"] || []) recipients = get_recipient_count(message)
cond do cond do
length(recipients) > reject_threshold and reject_threshold > 0 -> recipients > reject_threshold and reject_threshold > 0 ->
{:reject, nil} {:reject, nil}
length(recipients) > delist_threshold and delist_threshold > 0 -> recipients > delist_threshold and delist_threshold > 0 ->
if Enum.member?(message["to"], "https://www.w3.org/ns/activitystreams#Public") or if Enum.member?(message["to"], "https://www.w3.org/ns/activitystreams#Public") or
Enum.member?(message["cc"], "https://www.w3.org/ns/activitystreams#Public") do Enum.member?(message["cc"], "https://www.w3.org/ns/activitystreams#Public") do
{:ok, delist_message(message)} {:ok, delist_message(message)}