MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-19 08:24:25 +01:00
Code Issues Projects Releases Wiki Activity

Print the error as an error log and raise the same exception we got

Browse source
This commit is contained in:
Brendan Abolivier 2020-02-18 15:10:41 +00:00
parent 36af094017
commit bfbe2f5b08
No known key found for this signature in database
GPG key ID: 1E015C145F1916CD
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
synapse/handlers/acme.py
View file

@ -22,10 +22,17 @@ from twisted.web import server, static
from twisted.web.resource import Resource from twisted.web.resource import Resource
from synapse.app import check_bind_error from synapse.app import check_bind_error
from synapse.config import ConfigError
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
ACME_REGISTER_FAIL_ERROR = """
Failed to register with the ACME provider. This is likely happening because the install
is new, and ACME v1 has been deprecated by Let's Encrypt and is disabled for installs set
up after November 2019.
At the moment, Synapse doesn't support ACME v2. For more info and alternative solution,
check out https://github.com/matrix-org/synapse/blob/master/docs/ACME.md#deprecation-of-acme-v1
------------------------------------------------------"""
class AcmeHandler(object): class AcmeHandler(object):
def __init__(self, hs): def __init__(self, hs):
@ -76,14 +83,8 @@ class AcmeHandler(object):
try: try:
yield self._issuer._ensure_registered() yield self._issuer._ensure_registered()
except Exception: except Exception:
raise ConfigError( logger.error(ACME_REGISTER_FAIL_ERROR)
"Failed to register with the ACME provider. This is likely happening" raise
" because the install is new, and ACME v1 has been deprecated by Let's"
" Encrypt and is disabled for installs set up after November 2019. At the"
" moment, Synapse doesn't support ACME v2. For more info and alternative"
" solution, check out https://github.com/matrix-org/synapse/blob/master"
"/docs/ACME.md#deprecation-of-acme-v1"
)
@defer.inlineCallbacks @defer.inlineCallbacks
def provision_certificate(self): def provision_certificate(self):