mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 09:40:22 +00:00
Merge branch 'release-v0.18.6' into develop
This commit is contained in:
commit
06c00bd19b
3 changed files with 14 additions and 5 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
Changes in synapse v0.18.6 (2017-01-06)
|
||||||
|
=======================================
|
||||||
|
|
||||||
|
Bug fixes:
|
||||||
|
|
||||||
|
* Fix bug when checking if a guest user is allowed to join a room (PR #1772)
|
||||||
|
|
||||||
Changes in synapse v0.18.6-rc3 (2017-01-05)
|
Changes in synapse v0.18.6-rc3 (2017-01-05)
|
||||||
===========================================
|
===========================================
|
||||||
|
|
||||||
|
|
|
@ -16,4 +16,4 @@
|
||||||
""" This is a reference implementation of a Matrix home server.
|
""" This is a reference implementation of a Matrix home server.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__version__ = "0.18.6-rc3"
|
__version__ = "0.18.6"
|
||||||
|
|
|
@ -232,10 +232,12 @@ class RoomMemberHandler(BaseHandler):
|
||||||
is_host_in_room = yield self._is_host_in_room(current_state_ids)
|
is_host_in_room = yield self._is_host_in_room(current_state_ids)
|
||||||
|
|
||||||
if effective_membership_state == Membership.JOIN:
|
if effective_membership_state == Membership.JOIN:
|
||||||
if requester.is_guest and not self._can_guest_join(current_state_ids):
|
if requester.is_guest:
|
||||||
# This should be an auth check, but guests are a local concept,
|
guest_can_join = yield self._can_guest_join(current_state_ids)
|
||||||
# so don't really fit into the general auth process.
|
if not guest_can_join:
|
||||||
raise AuthError(403, "Guest access not allowed")
|
# This should be an auth check, but guests are a local concept,
|
||||||
|
# so don't really fit into the general auth process.
|
||||||
|
raise AuthError(403, "Guest access not allowed")
|
||||||
|
|
||||||
if not is_host_in_room:
|
if not is_host_in_room:
|
||||||
inviter = yield self.get_inviter(target.to_string(), room_id)
|
inviter = yield self.get_inviter(target.to_string(), room_id)
|
||||||
|
|
Loading…
Reference in a new issue