diff options
author | Erik Johnston <erik@matrix.org> | 2019-01-23 20:21:33 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-01-23 20:21:33 +0000 |
commit | f431ff3fb82cb3da549f92d8aef704bbf58387b6 (patch) | |
tree | 8e3ecbec9e8f656aaed1bc4642ad000f11816302 /synapse/handlers/message.py | |
parent | Merge branch 'erikj/fixup_rejecting_invites' of github.com:matrix-org/synapse... (diff) | |
download | synapse-f431ff3fb82cb3da549f92d8aef704bbf58387b6.tar.xz |
Require event format version to parse or create events
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r-- | synapse/handlers/message.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index a7cd779b02..7aaa4fba33 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -278,7 +278,15 @@ class EventCreationHandler(object): """ yield self.auth.check_auth_blocking(requester.user.to_string()) - builder = self.event_builder_factory.new(event_dict) + if event_dict["type"] == EventTypes.Create and event_dict["state_key"] == "": + room_version = event_dict["content"]["room_version"] + else: + try: + room_version = yield self.store.get_room_version(event_dict["room_id"]) + except NotFoundError: + raise AuthError(403, "Unknown room") + + builder = self.event_builder_factory.new(room_version, event_dict) self.validator.validate_new(builder) |