summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-10-02 13:57:54 +0100
committerGitHub <noreply@github.com>2018-10-02 13:57:54 +0100
commit2b8d28b095e5171242a76d937e12d159b28fee0b (patch)
tree5f92cd55801216e56a62d6ba2a7ddec67dfffced
parentDisable frozen dicts by default (#3987) (diff)
parentMerge branch 'develop' into rav/fix_missing_create_event_error (diff)
downloadsynapse-2b8d28b095e5171242a76d937e12d159b28fee0b.tar.xz
Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error
Fix error handling for missing auth_event
-rw-r--r--changelog.d/3960.bugfix1
-rw-r--r--synapse/event_auth.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/3960.bugfix b/changelog.d/3960.bugfix
new file mode 100644
index 0000000000..a01dc60df6
--- /dev/null
+++ b/changelog.d/3960.bugfix
@@ -0,0 +1 @@
+Fix error message for events with m.room.create missing from auth_events
\ No newline at end of file
diff --git a/synapse/event_auth.py b/synapse/event_auth.py
index 6baeccca38..02fa46ef7f 100644
--- a/synapse/event_auth.py
+++ b/synapse/event_auth.py
@@ -98,9 +98,9 @@ def check(event, auth_events, do_sig_check=True, do_size_check=True):
     creation_event = auth_events.get((EventTypes.Create, ""), None)
 
     if not creation_event:
-        raise SynapseError(
+        raise AuthError(
             403,
-            "Room %r does not exist" % (event.room_id,)
+            "No create event in auth events",
         )
 
     creating_domain = get_domain_from_id(event.room_id)