pleroma

commit: b7c91876d2cc027a5a7f8a79ba256f13af623997
parent 4533f171ab5b73e5fc332c8f65fcf1e39e4d6003
Author: Alex Gleason <alex@alexgleason.me>
Date:   Sat,  5 Nov 2022 14:07:37 -0500

RemoteReportPolicy: add `:reject_all` option, fix tests

Diffstat:
M
config/config.exs
1
+
M
lib/pleroma/web/activity_pub/mrf/remote_report_policy.ex
15
+++++++++++++++
M
test/pleroma/web/activity_pub/mrf/remote_report_policy_test.exs
25
++++++++++++++++++++++++-

3 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/config/config.exs b/config/config.exs
@@ -435,6 +435,7 @@ config :pleroma, :mrf_follow_bot, follower_nickname: nil
 config :pleroma, :mrf_inline_quote, template: "<bdi>RT:</bdi> {url}"
 
 config :pleroma, :mrf_remote_report,
+  reject_all: false,
   reject_anonymous: true,
   reject_empty_message: true
 
diff --git a/lib/pleroma/web/activity_pub/mrf/remote_report_policy.ex b/lib/pleroma/web/activity_pub/mrf/remote_report_policy.ex
@@ -7,6 +7,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicy do
   @impl true
   def filter(%{"type" => "Flag"} = object) do
     with {_, false} <- {:local, local?(object)},
+         {:ok, _} <- maybe_reject_all(object),
          {:ok, _} <- maybe_reject_anonymous(object),
          {:ok, _} <- maybe_reject_empty_message(object) do
       {:ok, object}
@@ -19,6 +20,14 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicy do
 
   def filter(object), do: {:ok, object}
 
+  defp maybe_reject_all(object) do
+    if Config.get([:mrf_remote_report, :reject_all]) do
+      {:reject, "[RemoteReportPolicy] Remote report"}
+    else
+      {:ok, object}
+    end
+  end
+
   defp maybe_reject_anonymous(%{"actor" => actor} = object) do
     with true <- Config.get([:mrf_remote_report, :reject_anonymous]),
          %URI{path: "/actor"} <- URI.parse(actor) do
@@ -63,6 +72,12 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicy do
       description: "Drop remote reports if they don't contain enough information.",
       children: [
         %{
+          key: :reject_all,
+          type: :boolean,
+          description: "Reject all remote reports? (this option takes precedence)",
+          suggestions: [false]
+        },
+        %{
           key: :reject_anonymous,
           type: :boolean,
           description: "Reject anonymous remote reports?",
diff --git a/test/pleroma/web/activity_pub/mrf/remote_report_policy_test.exs b/test/pleroma/web/activity_pub/mrf/remote_report_policy_test.exs
@@ -3,6 +3,10 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicyTest do
 
   alias Pleroma.Web.ActivityPub.MRF.RemoteReportPolicy
 
+  setup do
+    clear_config([:mrf_remote_report, :reject_all], false)
+  end
+
   test "doesn't impact local report" do
     clear_config([:mrf_remote_report, :reject_anonymous], true)
     clear_config([:mrf_remote_report, :reject_empty_message], true)
@@ -17,6 +21,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicyTest do
 
   test "rejects anonymous report if `reject_anonymous: true`" do
     clear_config([:mrf_remote_report, :reject_anonymous], true)
+    clear_config([:mrf_remote_report, :reject_empty_message], true)
 
     activity = %{
       "type" => "Flag",
@@ -28,6 +33,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicyTest do
 
   test "preserves anonymous report if `reject_anonymous: false`" do
     clear_config([:mrf_remote_report, :reject_anonymous], false)
+    clear_config([:mrf_remote_report, :reject_empty_message], false)
 
     activity = %{
       "type" => "Flag",
@@ -38,6 +44,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicyTest do
   end
 
   test "rejects empty message report if `reject_empty_message: true`" do
+    clear_config([:mrf_remote_report, :reject_anonymous], false)
     clear_config([:mrf_remote_report, :reject_empty_message], true)
 
     activity = %{
@@ -49,6 +56,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicyTest do
   end
 
   test "rejects empty message report (\"\") if `reject_empty_message: true`" do
+    clear_config([:mrf_remote_report, :reject_anonymous], false)
     clear_config([:mrf_remote_report, :reject_empty_message], true)
 
     activity = %{
@@ -61,6 +69,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicyTest do
   end
 
   test "preserves empty message report if `reject_empty_message: false`" do
+    clear_config([:mrf_remote_report, :reject_anonymous], false)
     clear_config([:mrf_remote_report, :reject_empty_message], false)
 
     activity = %{
@@ -72,7 +81,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicyTest do
   end
 
   test "preserves anonymous, empty message report with all settings disabled" do
-    clear_config([:mrf_remote_report, :reject_empty_message], false)
+    clear_config([:mrf_remote_report, :reject_anonymous], false)
     clear_config([:mrf_remote_report, :reject_empty_message], false)
 
     activity = %{
@@ -82,4 +91,18 @@ defmodule Pleroma.Web.ActivityPub.MRF.RemoteReportPolicyTest do
 
     assert {:ok, _} = RemoteReportPolicy.filter(activity)
   end
+
+  test "reject remote report if `reject_all: true`" do
+    clear_config([:mrf_remote_report, :reject_all], true)
+    clear_config([:mrf_remote_report, :reject_anonymous], false)
+    clear_config([:mrf_remote_report, :reject_empty_message], false)
+
+    activity = %{
+      "type" => "Flag",
+      "actor" => "https://mastodon.social/users/Gargron",
+      "content" => "Transphobia"
+    }
+
+    assert {:reject, _} = RemoteReportPolicy.filter(activity)
+  end
 end