fix: retry hcaptcha on timeouts (#16377)

tests/unit/captcha/test_hcaptcha.py

@@ -11,6 +11,7 @@
 # limitations under the License.
 
 import pretend
+import pyramid_retry
 import pytest
 import requests
 import responses
@@ -119,6 +120,18 @@ def test_remote_ip_added(self):
             hostname=None,
         )
 
+    def test_retries_on_timeout(self, monkeypatch):
+        service = hcaptcha.Service.create_service(
+            context=None,
+            request=_REQUEST,
+        )
+        monkeypatch.setattr(
+            service.request.http, "post", pretend.raiser(requests.Timeout)
+        )
+
+        with pytest.raises(pyramid_retry.RetryableException):
+            service.verify_response("meaningless")
+
     def test_unexpected_error(self, monkeypatch):
         service = hcaptcha.Service.create_service(
             context=None,

warehouse/captcha/hcaptcha.py

@@ -14,6 +14,8 @@
 
 from urllib.parse import urlencode
 
+from pyramid_retry import RetryableException
+from requests.exceptions import Timeout
 from zope.interface import implementer
 
 from .interfaces import ChallengeResponse, ICaptchaService
@@ -134,6 +136,8 @@ def verify_response(self, response, remote_ip=None) -> ChallengeResponse | None:
                 },
                 timeout=10,
             )
+        except Timeout as err:
+            raise RetryableException from err
         except Exception as err:
             raise UnexpectedError(str(err)) from err