moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip remote fetch jobs for unreachable instances

This commit is contained in:
Mark Felder 2023-12-26 16:28:05 -05:00
parent 5f6966cd9f
commit 9c0040124a
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/handle_object_fetch_failures.change
View File

@ -1,2 +1,3 @@
Remote object fetch failures will prevent the object fetch job from retrying if the object has been deleted or the fetch was denied with a 403 due to instance block behavior with authorized_fetch enabled. Remote object fetch failures will prevent the object fetch job from retrying if the object has been deleted or the fetch was denied with a 403 due to instance block behavior with authorized_fetch enabled.
Mark instances as unreachable when object fetch is denied due to instance block and authorized_fetch. Mark instances as unreachable when object fetch is denied due to instance block and authorized_fetch.
Skip fetching objects from unreachable instances.

5
lib/pleroma/workers/remote_fetcher_worker.ex
View File

@ -3,12 +3,14 @@
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.RemoteFetcherWorker do defmodule Pleroma.Workers.RemoteFetcherWorker do
alias Pleroma.Instances
alias Pleroma.Object.Fetcher alias Pleroma.Object.Fetcher
use Pleroma.Workers.WorkerHelper, queue: "remote_fetcher" use Pleroma.Workers.WorkerHelper, queue: "remote_fetcher"
@impl Oban.Worker @impl Oban.Worker
def perform(%Job{args: %{"op" => "fetch_remote", "id" => id} = args}) do def perform(%Job{args: %{"op" => "fetch_remote", "id" => id} = args}) do
if Instances.reachable?(id) do
case Fetcher.fetch_object_from_id(id, depth: args["depth"]) do case Fetcher.fetch_object_from_id(id, depth: args["depth"]) do
{:ok, _object} -> {:ok, _object} ->
:ok :ok
@ -22,6 +24,9 @@ def perform(%Job{args: %{"op" => "fetch_remote", "id" => id} = args}) do
_ -> _ ->
:error :error
end end
else
{:cancel, "Unreachable instance"}
end
end end
@impl Oban.Worker @impl Oban.Worker