On AuthError, raise a FederationError

1 files changed, 9 insertions, 1 deletions

diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index 49bfff88a4..8848656b1d 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -17,6 +17,7 @@
 
 from ._base import BaseHandler
 
+from synapse.api.errors import AuthError, FederationError
 from synapse.api.events.room import RoomMemberEvent
 from synapse.api.constants import Membership
 from synapse.util.logutils import log_function
@@ -116,8 +117,15 @@ class FederationHandler(BaseHandler):
 
         logger.debug("Event: %s", event)
 
-        if not backfilled:
+        try:
             yield self.auth.check(event, None, raises=True)
+        except AuthError as e:
+            raise FederationError(
+                "ERROR",
+                e.code,
+                e.msg,
+                affected=event.event_id,
+            )
 
         is_new_state = is_new_state and not backfilled