Merge branch 'accept-deletes' into 'develop'

Always accept deletions through SimplePolicy, add :reject_deletes group

See merge request pleroma/pleroma!2371
This commit is contained in:
rinpatch 2020-04-20 18:30:01 +00:00
commit e57c1b60e4
6 changed files with 97 additions and 4 deletions

View file

@ -148,6 +148,21 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
defp check_banner_removal(_actor_info, object), do: {:ok, object}
@impl true
def filter(%{"type" => "Delete", "actor" => actor} = object) do
%{host: actor_host} = URI.parse(actor)
reject_deletes =
Pleroma.Config.get([:mrf_simple, :reject_deletes])
|> MRF.subdomains_regex()
if MRF.subdomain_match?(reject_deletes, actor_host) do
{:reject, nil}
else
{:ok, object}
end
end
@impl true
def filter(%{"actor" => actor} = object) do
actor_info = URI.parse(actor)