upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-13 18:50:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Raise directly the exception on polling timout

Browse source
This commit is contained in:
Adrien Ferrand 2019-02-22 22:35:22 +01:00
parent b2c981cd9c
commit edfa3cdcdf
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
certbot/auth_handler.py
View file

@ -5,7 +5,6 @@ import datetime
import zope.component
from acme import errors as acme_errors
from acme import challenges
from acme import messages
# pylint: disable=unused-import, no-name-in-module
@ -88,11 +87,7 @@ class AuthHandler(object):
self.acme.answer_challenge(achall.challb, resp)
# Wait for authorizations to be checked.
try:
self._poll_authorizations(authzrs, max_retries, best_effort)
except acme_errors.TimeoutError:
# Exceeding the max polling attempts, and some authentication are still not checked.
raise errors.AuthorizationError('All challenges could not be checked on time.')
self._poll_authorizations(authzrs, max_retries, best_effort)
# Keep validated authorizations only. If there is none, no certificate can be issued.
authzrs_validated = [authzr for authzr in authzrs
@ -149,7 +144,8 @@ class AuthHandler(object):
time.sleep(sleep_seconds if sleep_seconds > 0 else 3)
if authzrs_to_check:
raise acme_errors.TimeoutError()
# Exceeding the max polling attempts, and some authentication are still not checked.
raise errors.AuthorizationError('All challenges could not be checked on time.')
def _choose_challenges(self, authzrs):
"""