aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-09-10 00:53:37 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-09-10 01:16:01 +0000
commit97253df3ee0b38256ac19ebfafebbc69b162b14c (patch)
tree2849f0afd0595c1b73d523f926c6fbaea00f1f38 /lib
parent7b96d203287a00791b6c118ce453aa8e34f3112d (diff)
downloadpleroma-97253df3ee0b38256ac19ebfafebbc69b162b14c.tar.gz
MRF: simple policy: contain media removal/nsfw ops to create activities only
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/mrf/simple_policy.ex10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
index 7fecb8a4f..49caef5b2 100644
--- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@ -23,7 +23,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
end
@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
child_object = Map.delete(object["object"], "attachment")
object = Map.put(object, "object", child_object)
@@ -33,8 +34,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
end
end
+ defp check_media_removal(actor_info, object), do: {:ok, object}
+
@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"]
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
+ defp check_media_nsfw(actor_info, object), do: {:ok, object}
+
@ftl_removal Keyword.get(@mrf_policy, :federated_timeline_removal)
defp check_ftl_removal(actor_info, object) do
if actor_info.host in @ftl_removal do