diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-01-30 17:20:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-30 17:20:55 +0000 |
| commit | 184303b8650a90256f84bc9801b749a5b81b6d4b (patch) | |
| tree | 85a633efdad219b72795afda9ac584f69914bcdc /synapse/rest/client/v1 | |
| parent | Backgroud update to clean out rooms from current state (#6802) (diff) | |
| download | synapse-184303b8650a90256f84bc9801b749a5b81b6d4b.tar.xz | |
MSC2260: Block direct sends of m.room.aliases events (#6794)
as per MSC2260
Diffstat (limited to 'synapse/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 5aef8238b8..6f31584c51 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -184,6 +184,12 @@ class RoomStateEventRestServlet(TransactionRestServlet): content = parse_json_object_from_request(request) + if event_type == EventTypes.Aliases: + # MSC2260 + raise SynapseError( + 400, "Cannot send m.room.aliases events via /rooms/{room_id}/state" + ) + event_dict = { "type": event_type, "content": content, @@ -231,6 +237,12 @@ class RoomSendEventRestServlet(TransactionRestServlet): requester = await self.auth.get_user_by_req(request, allow_guest=True) content = parse_json_object_from_request(request) + if event_type == EventTypes.Aliases: + # MSC2260 + raise SynapseError( + 400, "Cannot send m.room.aliases events via /rooms/{room_id}/send" + ) + event_dict = { "type": event_type, "content": content, |