mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-02 22:14:55 -04:00
SYN-154: Tweak how the m.room.create check is done.
Don't perform the check in auth.is_host_in_room but instead do it in _do_join and also assert that there are no m.room.members in the room before doing so.
This commit is contained in:
parent
9cb4f75d53
commit
4c68460392
2 changed files with 12 additions and 12 deletions
|
@ -98,16 +98,7 @@ class Auth(object):
|
|||
defer.returnValue(member)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def check_host_in_room(self, room_id, host, context=None):
|
||||
if context:
|
||||
# XXX: check_host_in_room should really return True for a new
|
||||
# room created by this home server. There are no m.room.member
|
||||
# join events yet so we need to check for the m.room.create event
|
||||
# instead.
|
||||
if (u"m.room.create", u"") in context.auth_events:
|
||||
defer.returnValue(True)
|
||||
return
|
||||
|
||||
def check_host_in_room(self, room_id, host):
|
||||
curr_state = yield self.state.get_current_state(room_id)
|
||||
|
||||
for event in curr_state:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue