From: ThibG <thib@sitedethib.com>
Date: Thu, 23 May 2019 13:00:30 +0000 (+0200)
Subject: Retry ActivityPub inbox delivery on HTTP 401 and 408 errors (#10812)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9efcca3c543ec76e7fa86605b94aefb46a238cc6;p=mastodon.git

Retry ActivityPub inbox delivery on HTTP 401 and 408 errors (#10812)

HTTP 401 responses returned by Mastodon's inbox controller may
be temporary if, for instance, the requesting user's actor/key json
could not be retrieved in a timely fashion. This changes allow retries
instead of dropping the message entirely.

Also added HTTP 408 as that error is by nature temporary.
---

diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index f9c385ea3..5e4c391f0 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -51,7 +51,7 @@ class ActivityPub::DeliveryWorker
   end
 
   def response_error_unsalvageable?(response)
-    (400...500).cover?(response.code) && response.code != 429
+    (400...500).cover?(response.code) && ![401, 408, 429].include?(response.code)
   end
 
   def failure_tracker