Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Be tolerant of blank TLS fingerprints config #4589

Merged
merged 2 commits into from
Feb 11, 2019
Merged

Be tolerant of blank TLS fingerprints config #4589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58ba3ed
fix
hawkowl Feb 8, 2019
2b1096f
make simpler
hawkowl Feb 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/4589.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Synapse is now tolerant of the tls_fingerprints option being None or not specified.
6 changes: 5 additions & 1 deletion synapse/config/tls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ def read_config(self, config):

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._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.no_tls = config.get("no_tls", False)

Expand Down