Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Mark instances as unreachable when returning a 403 from an object fetch"

Browse Source 
This reverts commit d472bafec1.
This commit is contained in:
Mark Felder 2023-12-26 17:12:58 -05:00
parent 9c0040124a
commit 73c4c6d7de
3 changed files with 0 additions and 17 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,3 +1,2 @@
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.
Skip fetching objects from unreachable instances. Skip fetching objects from unreachable instances.

1
lib/pleroma/object/fetcher.ex
View File

@ -213,7 +213,6 @@ defmodule Pleroma.Object.Fetcher do
end end
{:ok, %{status: 403}} -> {:ok, %{status: 403}} ->
Instances.set_consistently_unreachable(id)
{:error, "Object fetch has been denied"} {:error, "Object fetch has been denied"}
{:ok, %{status: code}} when code in [404, 410] -> {:ok, %{status: code}} when code in [404, 410] ->

15
test/pleroma/object/fetcher_test.exs
View File

@ -25,9 +25,6 @@ defmodule Pleroma.Object.FetcherTest do
%{method: :get, url: "https://mastodon.example.org/users/userisgone404"} -> %{method: :get, url: "https://mastodon.example.org/users/userisgone404"} ->
%Tesla.Env{status: 404} %Tesla.Env{status: 404}
%{method: :get, url: "https://octodon.social/users/cwebber/statuses/111647596861000656"} ->
%Tesla.Env{status: 403}
%{ %{
method: :get, method: :get,
url: url:
@ -236,18 +233,6 @@ defmodule Pleroma.Object.FetcherTest do
) )
end end
test "handle HTTP 403 response" do
object_id = "https://octodon.social/users/cwebber/statuses/111647596861000656"
Instances.set_reachable(object_id)
assert Instances.reachable?(object_id)
assert {:error, "Object fetch has been denied"} ==
Fetcher.fetch_object_from_id(object_id)
refute Instances.reachable?(object_id)
end
test "it can fetch pleroma polls with attachments" do test "it can fetch pleroma polls with attachments" do
{:ok, object} = {:ok, object} =
Fetcher.fetch_object_from_id("https://patch.cx/objects/tesla_mock/poll_attachment") Fetcher.fetch_object_from_id("https://patch.cx/objects/tesla_mock/poll_attachment")