pleroma

commit: d487e0160cdc4cdf84c45e4c64f6589b317479cc
parent 88e0e6acd5cc5f84256c531093a8cebee8b79786
Author: Tusooa Zhu <tusooa@kazv.moe>
Date:   Mon,  8 Aug 2022 08:41:33 -0400

Treat containment failure as cancel in ReceiverWorker

Diffstat:
M
lib/pleroma/workers/receiver_worker.ex
1
+
M
test/pleroma/web/federator_test.exs
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/workers/receiver_worker.ex b/lib/pleroma/workers/receiver_worker.ex
@@ -12,6 +12,7 @@ defmodule Pleroma.Workers.ReceiverWorker do
     with {:ok, res} <- Federator.perform(:incoming_ap_doc, params) do
       {:ok, res}
     else
+      {:error, :origin_containment_failed} -> {:cancel, :origin_containment_failed}
       {:error, {:reject, reason}} -> {:cancel, reason}
       e -> e
     end
diff --git a/test/pleroma/web/federator_test.exs b/test/pleroma/web/federator_test.exs
@@ -153,7 +153,7 @@ defmodule Pleroma.Web.FederatorTest do
       }
 
       assert {:ok, job} = Federator.incoming_ap_doc(params)
-      assert {:error, :origin_containment_failed} = ObanHelpers.perform(job)
+      assert {:cancel, :origin_containment_failed} = ObanHelpers.perform(job)
     end
 
     test "it does not crash if MRF rejects the post" do