MRF: simple policy: contain media removal/nsfw ops to create activities only

This commit is contained in:
William Pitcock 2018-09-10 00:53:37 +00:00
parent 7b96d20328
commit 97253df3ee

View File

@ -23,7 +23,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
end end
@media_removal Keyword.get(@mrf_policy, :media_removal) @media_removal Keyword.get(@mrf_policy, :media_removal)
defp check_media_removal(actor_info, object) do defp check_media_removal(actor_info, %{"type" => activity_type} = object)
when activity_type == "Create" do
if actor_info.host in @media_removal do if actor_info.host in @media_removal do
child_object = Map.delete(object["object"], "attachment") child_object = Map.delete(object["object"], "attachment")
object = Map.put(object, "object", child_object) object = Map.put(object, "object", child_object)
@ -33,8 +34,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
end end
end end
defp check_media_removal(actor_info, object), do: {:ok, object}
@media_nsfw Keyword.get(@mrf_policy, :media_nsfw) @media_nsfw Keyword.get(@mrf_policy, :media_nsfw)
defp check_media_nsfw(actor_info, object) do defp check_media_nsfw(actor_info, %{"type" => activity_type} = object)
when activity_type == "Create" do
child_object = object["object"] child_object = object["object"]
if actor_info.host in @media_nsfw and child_object["attachment"] != nil and if actor_info.host in @media_nsfw and child_object["attachment"] != nil and
@ -49,6 +53,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
end end
end end
defp check_media_nsfw(actor_info, object), do: {:ok, object}
@ftl_removal Keyword.get(@mrf_policy, :federated_timeline_removal) @ftl_removal Keyword.get(@mrf_policy, :federated_timeline_removal)
defp check_ftl_removal(actor_info, object) do defp check_ftl_removal(actor_info, object) do
if actor_info.host in @ftl_removal do if actor_info.host in @ftl_removal do