diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-27 17:22:35 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-27 17:22:35 +0000 |
| commit | a955cbfa494be705a0f2eb1d2fb5cd3b8c481b6f (patch) | |
| tree | 1ef745f393f8c1961da93ad6ad582829e9f1ea5b /synapse/handlers/federation.py | |
| parent | PEP 8 (diff) | |
| parent | Merge pull request #533 from matrix-org/rav/hashtest_federation (diff) | |
| download | synapse-a955cbfa494be705a0f2eb1d2fb5cd3b8c481b6f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 6c19d6ae8c..2ce1e9d6c7 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1186,7 +1186,13 @@ class FederationHandler(BaseHandler): try: self.auth.check(e, auth_events=auth_for_e) - except AuthError as err: + except SynapseError as err: + # we may get SynapseErrors here as well as AuthErrors. For + # instance, there are a couple of (ancient) events in some + # rooms whose senders do not have the correct sigil; these + # cause SynapseErrors in auth.check. We don't want to give up + # the attempt to federate altogether in such cases. + logger.warn( "Rejecting %s because %s", e.event_id, err.msg |