diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-04-25 06:22:49 -0700 |
|---|---|---|
| committer | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-04-25 14:22:49 +0100 |
| commit | 6824ddd93df1cfc347e4c8f423d54fab5bb732fb (patch) | |
| tree | 4ef1853e6bd78aa2ed9cc75dcf7724b82aa27d97 /synapse/config/server.py | |
| parent | Remove log error for .well-known/matrix/client (#4972) (diff) | |
| download | synapse-6824ddd93df1cfc347e4c8f423d54fab5bb732fb.tar.xz | |
Config option for verifying federation certificates (MSC 1711) (#4967)
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index c5e5679d52..cdf1e4d286 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -114,11 +114,13 @@ class ServerConfig(Config): # FIXME: federation_domain_whitelist needs sytests self.federation_domain_whitelist = None federation_domain_whitelist = config.get( - "federation_domain_whitelist", None + "federation_domain_whitelist", None, ) - # turn the whitelist into a hash for speed of lookup + if federation_domain_whitelist is not None: + # turn the whitelist into a hash for speed of lookup self.federation_domain_whitelist = {} + for domain in federation_domain_whitelist: self.federation_domain_whitelist[domain] = True |