diff options
| author | Erik Johnston <erikj@jki.re> | 2017-06-19 16:20:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 16:20:55 +0100 |
| commit | b5f665de3209aa77ac9f692a515e4f96444b9003 (patch) | |
| tree | dfa58ac75e65b503472bc603a9601bc0295a02b7 /synapse/handlers/room_member.py | |
| parent | add missing boolean to synapse_port_db (diff) | |
| parent | Handle all cases of sending membership events (diff) | |
| download | synapse-b5f665de3209aa77ac9f692a515e4f96444b9003.tar.xz | |
Merge pull request #2291 from matrix-org/erikj/shutdown_room
Add shutdown room API
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 1ca88517a2..b3f979b246 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -203,6 +203,11 @@ class RoomMemberHandler(BaseHandler): if not remote_room_hosts: remote_room_hosts = [] + if effective_membership_state not in ("leave", "ban",): + is_blocked = yield self.store.is_room_blocked(room_id) + if is_blocked: + raise SynapseError(403, "This room has been blocked on this server") + latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id) current_state_ids = yield self.state_handler.get_current_state_ids( room_id, latest_event_ids=latest_event_ids, @@ -369,6 +374,11 @@ class RoomMemberHandler(BaseHandler): # so don't really fit into the general auth process. raise AuthError(403, "Guest access not allowed") + if event.membership not in (Membership.LEAVE, Membership.BAN): + is_blocked = yield self.store.is_room_blocked(room_id) + if is_blocked: + raise SynapseError(403, "This room has been blocked on this server") + yield message_handler.handle_new_client_event( requester, event, |