Page MenuHomePhorge
Files F85824734

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/changelog.d/handle_object_fetch_failures.change b/changelog.d/handle_object_fetch_failures.change
index 413084322..410f95efa 100644
--- a/changelog.d/handle_object_fetch_failures.change
+++ b/changelog.d/handle_object_fetch_failures.change
@@ -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.
Mark instances as unreachable when object fetch is denied due to instance block and authorized_fetch.
+Skip fetching objects from unreachable instances.
diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex
index 4cae7e108..d091dfa84 100644
--- a/lib/pleroma/workers/remote_fetcher_worker.ex
+++ b/lib/pleroma/workers/remote_fetcher_worker.ex
@@ -1,26 +1,31 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.RemoteFetcherWorker do
+ alias Pleroma.Instances
alias Pleroma.Object.Fetcher
use Pleroma.Workers.WorkerHelper, queue: "remote_fetcher"
@impl Oban.Worker
def perform(%Job{args: %{"op" => "fetch_remote", "id" => id} = args}) do
- case Fetcher.fetch_object_from_id(id, depth: args["depth"]) do
- {:ok, _object} ->
- :ok
+ if Instances.reachable?(id) do
+ case Fetcher.fetch_object_from_id(id, depth: args["depth"]) do
+ {:ok, _object} ->
+ :ok
- {:error, reason = "Object fetch has been denied"} ->
- {:cancel, reason}
+ {:error, reason = "Object fetch has been denied"} ->
+ {:cancel, reason}
- {:error, reason = "Object has been deleted"} ->
- {:cancel, reason}
+ {:error, reason = "Object has been deleted"} ->
+ {:cancel, reason}
- _ ->
- :error
+ _ ->
+ :error
+ end
+ else
+ {:cancel, "Unreachable instance"}
end
end
end

File Metadata

Mime Type
text/x-diff
Expires
Thu, Oct 29, 6:12 PM (1 d, 17 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1798485
Default Alt Text
(2 KB)

Event Timeline