Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some cleanup, some TODOs, more to do

This commit is contained in:
Daniel Wagner-Hall 2016-02-16 19:05:02 +00:00
parent d1fb790818
commit 6605adf669
1 changed files with 62 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
synapse/handlers/room.py
View File

@ -482,9 +482,9 @@ class RoomMemberHandler(BaseHandler):
Raises: Raises:
SynapseError if there was a problem changing the membership. SynapseError if there was a problem changing the membership.
""" """
if from_client:
user = UserID.from_string(event.sender) user = UserID.from_string(event.sender)
if from_client:
assert self.hs.is_mine(user), "User must be our own: %s" % (user,) assert self.hs.is_mine(user), "User must be our own: %s" % (user,)
if event.is_state(): if event.is_state():
@ -502,66 +502,43 @@ class RoomMemberHandler(BaseHandler):
room_id = event.room_id room_id = event.room_id
handled = False
if event.membership == Membership.JOIN: if event.membership == Membership.JOIN:
if is_guest and not self._can_guest_join(context.current_state): if is_guest and not self._can_guest_join(context.current_state):
# This should be an auth check, but guests are a local concept, # This should be an auth check, but guests are a local concept,
# so don't really fit into the general auth process. # so don't really fit into the general auth process.
raise AuthError(403, "Guest access not allowed") raise AuthError(403, "Guest access not allowed")
# If we're trying to join a room then we have to do this differently should_do_dance, room_hosts = yield self._should_do_dance(
# if this HS is not currently in the room, i.e. we have to do the room_id,
# invite/join dance. context,
(yield self.get_inviter(target_user.to_string(), room_id)),
room_hosts,
)
# XXX: We don't do an auth check if we are doing an invite if should_do_dance:
if len(room_hosts) == 0:
# return the same error as join_room_alias does
raise SynapseError(404, "No known servers")
# We don't do an auth check if we are doing an invite
# join dance for now, since we're kinda implicitly checking # join dance for now, since we're kinda implicitly checking
# that we are allowed to join when we decide whether or not we # that we are allowed to join when we decide whether or not we
# need to do the invite/join dance. # need to do the invite/join dance.
yield self.hs.get_handlers().federation_handler.do_invite_join(
is_host_in_room = yield self.is_host_in_room(room_id, context)
if is_host_in_room:
should_do_dance = False
elif room_hosts: # TODO: Shouldn't this be remote_room_host?
should_do_dance = True
else:
inviter = yield self.get_inviter(event)
if not inviter:
# return the same error as join_room_alias does
raise SynapseError(404, "No known servers")
should_do_dance = not self.hs.is_mine(inviter)
room_hosts = [inviter.domain]
if should_do_dance:
handler = self.hs.get_handlers().federation_handler
yield handler.do_invite_join(
room_hosts, room_hosts,
room_id, room_id,
event.user_id, event.user_id,
event.content, event.content,
) )
else: handled = True
logger.debug("Doing normal join")
yield self.handle_new_client_event(
event,
context,
extra_users=[target_user],
ratelimit=ratelimit,
)
prev_state = context.current_state.get((event.type, event.state_key))
if not prev_state or prev_state.membership != Membership.JOIN:
# Only fire user_joined_room if the user has acutally joined the
# room. Don't bother if the user is just changing their profile
# info.
user = UserID.from_string(event.user_id)
yield user_joined_room(self.distributor, user, room_id)
else:
if event.membership == Membership.LEAVE: if event.membership == Membership.LEAVE:
is_host_in_room = yield self.is_host_in_room(room_id, context) is_host_in_room = yield self.is_host_in_room(room_id, context)
if not is_host_in_room: if not is_host_in_room:
# Rejecting an invite, rather than leaving a joined room # Rejecting an invite, rather than leaving a joined room
handler = self.hs.get_handlers().federation_handler handler = self.hs.get_handlers().federation_handler
inviter = yield self.get_inviter(event) inviter = yield self.get_inviter(target_user.to_string(), room_id)
if not inviter: if not inviter:
# return the same error as join_room_alias does # return the same error as join_room_alias does
raise SynapseError(404, "No known servers") raise SynapseError(404, "No known servers")
@ -570,13 +547,14 @@ class RoomMemberHandler(BaseHandler):
room_id, room_id,
event.user_id event.user_id
) )
return handled = True
# FIXME: This isn't idempotency. # FIXME: This isn't idempotency.
if prev_state and prev_state.membership == event.membership: if prev_state and prev_state.membership == event.membership:
# double same action, treat this event as a NOOP. # double same action, treat this event as a NOOP.
return return
if not handled:
yield self.handle_new_client_event( yield self.handle_new_client_event(
event, event,
context, context,
@ -584,9 +562,15 @@ class RoomMemberHandler(BaseHandler):
ratelimit=ratelimit, ratelimit=ratelimit,
) )
if event.membership == Membership.JOIN:
if not prev_state or prev_state.membership != Membership.JOIN:
# Only fire user_joined_room if the user has acutally joined the
# room. Don't bother if the user is just changing their profile
# info.
yield user_joined_room(self.distributor, target_user, room_id)
elif event.membership == Membership.LEAVE:
if prev_state and prev_state.membership == Membership.JOIN: if prev_state and prev_state.membership == Membership.JOIN:
user = UserID.from_string(event.user_id) user_left_room(self.distributor, target_user, room_id)
user_left_room(self.distributor, user, event.room_id)
def _can_guest_join(self, current_state): def _can_guest_join(self, current_state):
""" """
@ -600,6 +584,21 @@ class RoomMemberHandler(BaseHandler):
and guest_access.content["guest_access"] == "can_join" and guest_access.content["guest_access"] == "can_join"
) )
@defer.inlineCallbacks
def _should_do_dance(self, room_id, context, inviter, room_hosts=None):
# TODO: Shouldn't this be remote_room_host?
room_hosts = room_hosts or []
# TODO(danielwh): This shouldn't need to yield for this check, we have a context.
is_host_in_room = yield self.is_host_in_room(room_id, context)
if is_host_in_room:
defer.returnValue((False, room_hosts))
if inviter and not self.hs.is_mine(inviter):
room_hosts.append(inviter.domain)
defer.returnValue((True, room_hosts))
@defer.inlineCallbacks @defer.inlineCallbacks
def lookup_room_alias(self, room_alias): def lookup_room_alias(self, room_alias):
""" """
@ -625,24 +624,17 @@ class RoomMemberHandler(BaseHandler):
defer.returnValue((RoomID.from_string(room_id), hosts)) defer.returnValue((RoomID.from_string(room_id), hosts))
# TODO(danielwh): This should use the context, rather than looking up the store.
@defer.inlineCallbacks @defer.inlineCallbacks
def get_inviter(self, event): def get_inviter(self, user_id, room_id):
# TODO(markjh): get prev_state from snapshot # TODO(markjh): get prev_state from snapshot
prev_state = yield self.store.get_room_member( prev_state = yield self.store.get_room_member(
event.user_id, event.room_id user_id, room_id
) )
if prev_state and prev_state.membership == Membership.INVITE: if prev_state and prev_state.membership == Membership.INVITE:
defer.returnValue(UserID.from_string(prev_state.user_id)) defer.returnValue(UserID.from_string(prev_state.user_id))
return
elif "third_party_invite" in event.content:
if "sender" in event.content["third_party_invite"]:
inviter = UserID.from_string(
event.content["third_party_invite"]["sender"]
)
defer.returnValue(inviter)
defer.returnValue(None)
# TODO(danielwh): This looks insane. Please make it not insane.
@defer.inlineCallbacks @defer.inlineCallbacks
def is_host_in_room(self, room_id, context): def is_host_in_room(self, room_id, context):
is_host_in_room = yield self.auth.check_host_in_room( is_host_in_room = yield self.auth.check_host_in_room(