Merge branch 'erikj/check_room_exists' into erikj/unfederatable

1 files changed, 8 insertions, 0 deletions

diff --git a/synapse/api/auth.py b/synapse/api/auth.py

index 75b7c467b5..90f11fdc94 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -65,6 +65,14 @@ class Auth(object):
                 # FIXME
                 return True
 
+            creation_event = auth_events.get((EventTypes.Create, ""), None)
+
+            if not creation_event:
+                raise SynapseError(
+                    403,
+                    "Room %r does not exist" % (event.room_id,)
+                )
+
             creating_domain = RoomID.from_string(event.room_id).domain
             originating_domain = UserID.from_string(event.sender).domain
             if creating_domain != originating_domain: