pleroma

commit: ceffb8a8918b83d482e9c1da64fec22b428a61f3
parent 1e8b79956e0c706650358e8b98c8e04e4fcf05b9
Author: Mark Felder <feld@feld.me>
Date:   Fri, 23 Aug 2024 13:52:19 -0400

Drop incoming Delete activities from unknown actors

Diffstat:
A
changelog.d/drop-unknown-deletes.change
1
+
M
lib/pleroma/workers/receiver_worker.ex
16
+++++++++++++++-
M
test/pleroma/workers/receiver_worker_test.exs
22
++++++++++++++++++++++

3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/changelog.d/drop-unknown-deletes.change b/changelog.d/drop-unknown-deletes.change
@@ -0,0 +1 @@
+Drop incoming Delete activities from unknown actors
diff --git a/lib/pleroma/workers/receiver_worker.ex b/lib/pleroma/workers/receiver_worker.ex
@@ -33,7 +33,8 @@ defmodule Pleroma.Workers.ReceiverWorker do
       query_string: query_string
     }
 
-    with {:ok, %User{} = _actor} <- User.get_or_fetch_by_ap_id(conn_data.params["actor"]),
+    with {_, false} <- {:unknown_delete, unknown_delete?(params)},
+         User.get_or_fetch_by_ap_id(conn_data.params["actor"]),
          {:ok, _public_key} <- Signature.refetch_public_key(conn_data),
          {:signature, true} <- {:signature, Signature.validate_signature(conn_data)},
          {:ok, res} <- Federator.perform(:incoming_ap_doc, params) do
@@ -58,6 +59,7 @@ defmodule Pleroma.Workers.ReceiverWorker do
 
   defp process_errors(errors) do
     case errors do
+      {:unknown_delete, true} -> {:cancel, "Delete from unknown actor"}
       {:error, :origin_containment_failed} -> {:cancel, :origin_containment_failed}
       {:error, :already_present} -> {:cancel, :already_present}
       {:error, {:validate_object, _} = reason} -> {:cancel, reason}
@@ -71,4 +73,16 @@ defmodule Pleroma.Workers.ReceiverWorker do
       e -> {:error, e}
     end
   end
+
+  defp unknown_delete?(%{
+         "type" => "Delete",
+         "actor" => actor
+       }) do
+    case User.get_cached_by_ap_id(actor) do
+      %User{} -> false
+      _ -> true
+    end
+  end
+
+  defp unknown_delete?(_), do: false
 end
diff --git a/test/pleroma/workers/receiver_worker_test.exs b/test/pleroma/workers/receiver_worker_test.exs
@@ -245,4 +245,26 @@ defmodule Pleroma.Workers.ReceiverWorkerTest do
 
     assert {:ok, %Pleroma.Activity{}} = ReceiverWorker.perform(oban_job)
   end
+
+  # When activity is delivered to the inbox and we cannot immediately verify signature
+  # we capture all the params and process it later in the Oban job.
+  # This requires we replicate the same scenario by including additional fields in the params
+  test "Deletes cancelled for an unknown actor" do
+    params = %{
+      "type" => "Delete",
+      "actor" => "https://unknown.mastodon.instance/users/somebody"
+    }
+
+    assert {:cancel, "Delete from unknown actor"} =
+             ReceiverWorker.perform(%Oban.Job{
+               args: %{
+                 "op" => "incoming_ap_doc",
+                 "method" => :post,
+                 "req_headers" => [],
+                 "request_path" => "/inbox",
+                 "query_string" => "",
+                 "params" => params
+               }
+             })
+  end
 end