diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-05-27 10:34:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-27 10:34:24 +0100 |
| commit | fe5dad46b0da00e9757ed54eb23304ed3c6ceadf (patch) | |
| tree | 2ffd69c5090852e49c60c4211e300519dc55b0bc /synapse | |
| parent | Combine `LruCache.invalidate` and `invalidate_many` (#9973) (diff) | |
| download | synapse-fe5dad46b0da00e9757ed54eb23304ed3c6ceadf.tar.xz | |
Remove redundant code to reload tls cert (#10054)
we don't need to reload the tls cert if we don't have any tls listeners. Follow-up to #9280.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/app/_base.py | 5 | ||||
| -rw-r--r-- | synapse/config/tls.py | 22 |
2 files changed, 4 insertions, 23 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py index 59918d789e..1329af2e2b 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py @@ -261,13 +261,10 @@ def refresh_certificate(hs): Refresh the TLS certificates that Synapse is using by re-reading them from disk and updating the TLS context factories to use them. """ - if not hs.config.has_tls_listener(): - # attempt to reload the certs for the good of the tls_fingerprints - hs.config.read_certificate_from_disk(require_cert_and_key=False) return - hs.config.read_certificate_from_disk(require_cert_and_key=True) + hs.config.read_certificate_from_disk() hs.tls_server_context_factory = context_factory.ServerContextFactory(hs.config) if hs._listening_services: diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 26f1150ca5..0e9bba53c9 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -215,28 +215,12 @@ class TlsConfig(Config): days_remaining = (expires_on - now).days return days_remaining - def read_certificate_from_disk(self, require_cert_and_key: bool): + def read_certificate_from_disk(self): """ Read the certificates and private key from disk. - - Args: - require_cert_and_key: set to True to throw an error if the certificate - and key file are not given """ - if require_cert_and_key: - self.tls_private_key = self.read_tls_private_key() - self.tls_certificate = self.read_tls_certificate() - elif self.tls_certificate_file: - # we only need the certificate for the tls_fingerprints. Reload it if we - # can, but it's not a fatal error if we can't. - try: - self.tls_certificate = self.read_tls_certificate() - except Exception as e: - logger.info( - "Unable to read TLS certificate (%s). Ignoring as no " - "tls listeners enabled.", - e, - ) + self.tls_private_key = self.read_tls_private_key() + self.tls_certificate = self.read_tls_certificate() def generate_config_section( self, |