summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2016-01-27 17:19:36 +0000
committerRichard van der Hoff <github@rvanderhoff.org.uk>2016-01-27 17:19:36 +0000
commit8c97b49886ba57e133fb76db1680505acfedc4f1 (patch)
tree45a8badc216e91b9e8243e2c0ad46e22870bcc37 /synapse/handlers/federation.py
parentMerge pull request #531 from matrix-org/markjh/relative_push_rules (diff)
parentFederation: drop events which cause SynapseErrors (diff)
downloadsynapse-8c97b49886ba57e133fb76db1680505acfedc4f1.tar.xz
Merge pull request #533 from matrix-org/rav/hashtest_federation
Fix federation for #test:matrix.org
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py8
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