OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3754 from matrix-org/erikj/fix_whitelist 

Allow federation_domain_whitelist to be emtpy list
pull/3755/head hhs-1
Erik Johnston 2018-08-24 12:23:39 +01:00 committed by GitHub
parent 92d50e3c2a c780d84d66
commit 84b4e76fed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3754.bugfix Normal file
View File

@ -0,0 +1 @@
Fix 'federation_domain_whitelist' such that an empty list correctly blocks all outbound federation traffic

2
synapse/http/matrixfederationclient.py
View File

@ -133,7 +133,7 @@ class MatrixFederationHttpClient(object):
failures, connection failures, SSL failures.) failures, connection failures, SSL failures.)
""" """
if ( if (
self.hs.config.federation_domain_whitelist and self.hs.config.federation_domain_whitelist is not None and
destination not in self.hs.config.federation_domain_whitelist destination not in self.hs.config.federation_domain_whitelist
): ):
raise FederationDeniedError(destination) raise FederationDeniedError(destination)