commit: ad28854f477141dc9b6a01f7e4465c07bb0f896c
parent: 90cf75f4a781f2eb7016a4a165a8617d4352451b
Author: lambda <pleromagit@rogerbraun.net>
Date: Thu, 21 Jun 2018 07:09:57 +0000
Merge branch 'feature/mrf-simple-accept-lists' into 'develop'
mrf simple: add accept lists
See merge request pleroma/pleroma!231
Diffstat:
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/CONFIGURATION.md b/CONFIGURATION.md
@@ -49,7 +49,8 @@ Restricts the visibility of posts from certain instances.
media_removal: [],
media_nsfw: [],
federated_timeline_removal: [],
- reject: []
+ reject: [],
+ accept: []
* `media_removal`: posts from these instances will have attachments
removed
@@ -58,6 +59,7 @@ Restricts the visibility of posts from certain instances.
* `federated_timeline_removal`: posts from these instances will be
marked as unlisted
* `reject`: posts from these instances will be dropped
+* `accept`: if not empty, only posts from these instances will be accepted
### RejectNonPublic
diff --git a/config/config.exs b/config/config.exs
@@ -67,7 +67,8 @@ config :pleroma, :mrf_simple,
media_removal: [],
media_nsfw: [],
federated_timeline_removal: [],
- reject: []
+ reject: [],
+ accept: []
config :pleroma, :media_proxy,
enabled: false,
diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@ -4,6 +4,15 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
@mrf_policy Application.get_env(:pleroma, :mrf_simple)
+ @accept Keyword.get(@mrf_policy, :accept)
+ defp check_accept(actor_info, object) do
+ if length(@accept) > 0 and not actor_info.host in @accept do
+ {:reject, nil}
+ else
+ {:ok, object}
+ end
+ end
+
@reject Keyword.get(@mrf_policy, :reject)
defp check_reject(actor_info, object) do
if actor_info.host in @reject do
@@ -74,7 +83,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
def filter(object) do
actor_info = URI.parse(object["actor"])
- with {:ok, object} <- check_reject(actor_info, object),
+ with {:ok, object} <- check_accept(actor_info, object),
+ {:ok, object} <- check_reject(actor_info, object),
{:ok, object} <- check_media_removal(actor_info, object),
{:ok, object} <- check_media_nsfw(actor_info, object),
{:ok, object} <- check_ftl_removal(actor_info, object) do