diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2021-05-11 14:15:30 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2021-05-11 14:15:30 +0100 |
| commit | 652a6b094d98e56290f0b6889cc401c364bad433 (patch) | |
| tree | ba7a21ef2804be8fa33bf1463ecbfb0743090f06 /synapse/config | |
| parent | Add config option to hide device names over federation (#9945) (diff) | |
| parent | Use link to advisory rather than to the CVE repo (diff) | |
| download | synapse-652a6b094d98e56290f0b6889cc401c364bad433.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/tls.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py index b041869758..7df4e4c3e6 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -17,7 +17,7 @@ import os import warnings from datetime import datetime from hashlib import sha256 -from typing import List, Optional +from typing import List, Optional, Pattern from unpaddedbase64 import encode_base64 @@ -124,7 +124,7 @@ class TlsConfig(Config): fed_whitelist_entries = [] # Support globs (*) in whitelist values - self.federation_certificate_verification_whitelist = [] # type: List[str] + self.federation_certificate_verification_whitelist = [] # type: List[Pattern] for entry in fed_whitelist_entries: try: entry_regex = glob_to_regex(entry.encode("ascii").decode("ascii")) |