Various auth.py fixes.

synapse/api/auth.py

@@ -63,7 +63,7 @@ def __init__(self, hs):
             "user_id = ",
         ])
 
-    def check(self, event, auth_events):
+    def check(self, event, auth_events, do_sig_check=True):
         """ Checks if this event is correctly authed.
 
         Args:
@@ -79,6 +79,13 @@ def check(self, event, auth_events):
 
             if not hasattr(event, "room_id"):
                 raise AuthError(500, "Event has no room_id: %s" % event)
+
+            sender_domain = get_domain_from_id(event.sender)
+
+            # Check the sender's domain has signed the event
+            if do_sig_check and not event.signatures.get(sender_domain):
+                raise AuthError(403, "Event not signed by sending server")
+
             if auth_events is None:
                 # Oh, we don't know what the state of the room was, so we
                 # are trusting that this is allowed (at least for now)
@@ -87,7 +94,6 @@ def check(self, event, auth_events):
 
             if event.type == EventTypes.Create:
                 room_id_domain = get_domain_from_id(event.room_id)
-                sender_domain = get_domain_from_id(event.sender)
                 if room_id_domain != sender_domain:
                     raise AuthError(
                         403,

synapse/handlers/federation.py

@@ -688,7 +688,7 @@ def on_make_join_request(self, room_id, user_id):
             logger.warn("Failed to create join %r because %s", event, e)
             raise e
 
-        self.auth.check(event, auth_events=context.current_state)
+        self.auth.check(event, auth_events=context.current_state, do_sig_check=False)
 
         defer.returnValue(event)
 
@@ -918,7 +918,7 @@ def on_make_leave_request(self, room_id, user_id):
         )
 
         try:
-            self.auth.check(event, auth_events=context.current_state)
+            self.auth.check(event, auth_events=context.current_state, do_sig_check=False)
         except AuthError as e:
             logger.warn("Failed to create new leave %r because %s", event, e)
             raise e

synapse/state.py

@@ -379,7 +379,7 @@ def _resolve_auth_events(self, events, auth_events):
             try:
                 # FIXME: hs.get_auth() is bad style, but we need to do it to
                 # get around circular deps.
-                self.hs.get_auth().check(event, auth_events)
+                self.hs.get_auth().check(event, auth_events, do_sig_check=False)
                 prev_event = event
             except AuthError:
                 return prev_event
@@ -391,7 +391,7 @@ def _resolve_normal_events(self, events, auth_events):
             try:
                 # FIXME: hs.get_auth() is bad style, but we need to do it to
                 # get around circular deps.
-                self.hs.get_auth().check(event, auth_events)
+                self.hs.get_auth().check(event, auth_events, do_sig_check=False)
                 return event
             except AuthError:
                 pass