MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 04:23:54 +01:00
Code Issues Projects Releases Wiki Activity

Be tolerant of blank TLS fingerprints config (#4589)

Browse source
This commit is contained in:
Amber Brown 2019-02-11 21:04:27 +11:00 committed by Richard van der Hoff
parent b201149c7e
commit 4ffd10f46d
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4589.bugfix Normal file
View file

@ -0,0 +1 @@
Synapse is now tolerant of the tls_fingerprints option being None or not specified.

6
synapse/config/tls.py
View file

@ -45,7 +45,11 @@ class TlsConfig(Config):
self.tls_certificate_file = self.abspath(config.get("tls_certificate_path")) self.tls_certificate_file = self.abspath(config.get("tls_certificate_path"))
self.tls_private_key_file = self.abspath(config.get("tls_private_key_path")) self.tls_private_key_file = self.abspath(config.get("tls_private_key_path"))
self._original_tls_fingerprints = config["tls_fingerprints"] self._original_tls_fingerprints = config.get("tls_fingerprints", [])
if self._original_tls_fingerprints is None:
self._original_tls_fingerprints = []
self.tls_fingerprints = list(self._original_tls_fingerprints) self.tls_fingerprints = list(self._original_tls_fingerprints)
self.no_tls = config.get("no_tls", False) self.no_tls = config.get("no_tls", False)