diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2018-01-22 19:11:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 19:11:18 +0100 |
| commit | ab9f844aaf3662a64dbc4c56077e9fa37bc7d5d0 (patch) | |
| tree | df5417cbd46f5c9a386d4d762f83b06d58afda17 /synapse/handlers/device.py | |
| parent | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid (diff) | |
| download | synapse-ab9f844aaf3662a64dbc4c56077e9fa37bc7d5d0.tar.xz | |
Add federation_domain_whitelist option (#2820)
Add federation_domain_whitelist gives a way to restrict which domains your HS is allowed to federate with. useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network
Diffstat (limited to 'synapse/handlers/device.py')
| -rw-r--r-- | synapse/handlers/device.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index 2152efc692..0e83453851 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -14,6 +14,7 @@ # limitations under the License. from synapse.api import errors from synapse.api.constants import EventTypes +from synapse.api.errors import FederationDeniedError from synapse.util import stringutils from synapse.util.async import Linearizer from synapse.util.caches.expiringcache import ExpiringCache @@ -513,6 +514,9 @@ class DeviceListEduUpdater(object): # This makes it more likely that the device lists will # eventually become consistent. return + except FederationDeniedError as e: + logger.info(e) + return except Exception: # TODO: Remember that we are now out of sync and try again # later |