Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
async/await is_server_admin call from _user_can_delete_alias
Browse files Browse the repository at this point in the history
  • Loading branch information
@anoadragon453
anoadragon453 committed Feb 4, 2020
1 parent 433d5bc commit dd03599
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 41 deletions.
36 changes: 18 additions & 18 deletions synapse/handlers/directory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
StoreError,
SynapseError,
)
from synapse.types import RoomAlias, UserID, get_domain_from_id
from synapse.types import Requester, RoomAlias, UserID, get_domain_from_id

from ._base import BaseHandler

Expand Down Expand Up @@ -158,22 +158,23 @@ def create_association(
# permission in the room; this is permitted.
logger.info("Skipping updating aliases event due to auth error %s", e)

@defer.inlineCallbacks
def delete_association(self, requester, room_alias, send_event=True):
async def delete_association(
self, requester: Requester, room_alias: RoomAlias, send_event: bool = True,
) -> str:
"""Remove an alias from the directory
(this is only meant for human users; AS users should call
delete_appservice_association)
Args:
requester (Requester):
room_alias (RoomAlias):
send_event (bool): Whether to send an updated m.room.aliases event.
Note that, if we delete the canonical alias, we will always attempt
to send an m.room.canonical_alias event
requester:
room_alias:
send_event: Whether to send an updated m.room.aliases event. Note
that, if we delete the canonical alias, we will always attempt to
send an m.room.canonical_alias event
Returns:
Deferred[unicode]: room id that the alias used to point to
Room id that the alias used to point to
Raises:
NotFoundError: if the alias doesn't exist
Expand All @@ -186,7 +187,7 @@ def delete_association(self, requester, room_alias, send_event=True):
user_id = requester.user.to_string()

try:
can_delete = yield self._user_can_delete_alias(room_alias, user_id)
can_delete = await self._user_can_delete_alias(room_alias, user_id)
except StoreError as e:
if e.code == 404:
raise NotFoundError("Unknown room alias")
Expand All @@ -195,21 +196,21 @@ def delete_association(self, requester, room_alias, send_event=True):
if not can_delete:
raise AuthError(403, "You don't have permission to delete the alias.")

can_delete = yield self.can_modify_alias(room_alias, user_id=user_id)
can_delete = await self.can_modify_alias(room_alias, user_id=user_id)
if not can_delete:
raise SynapseError(
400,
"This alias is reserved by an application service.",
errcode=Codes.EXCLUSIVE,
)

room_id = yield self._delete_association(room_alias)
room_id = await self._delete_association(room_alias)

try:
if send_event:
yield self.send_room_alias_update_event(requester, room_id)
await self.send_room_alias_update_event(requester, room_id)

yield self._update_canonical_alias(
await self._update_canonical_alias(
requester, requester.user.to_string(), room_id, room_alias
)
except AuthError as e:
Expand Down Expand Up @@ -368,14 +369,13 @@ def can_modify_alias(self, alias, user_id=None):
# either no interested services, or no service with an exclusive lock
return defer.succeed(True)

@defer.inlineCallbacks
def _user_can_delete_alias(self, alias, user_id):
creator = yield self.store.get_room_alias_creator(alias.to_string())
async def _user_can_delete_alias(self, alias: RoomAlias, user_id: str) -> bool:
creator = await self.store.get_room_alias_creator(alias.to_string())

if creator is not None and creator == user_id:
return True

is_admin = yield self.auth.is_server_admin(UserID.from_string(user_id))
is_admin = await self.auth.is_server_admin(UserID.from_string(user_id))
return is_admin

@defer.inlineCallbacks
Expand Down
51 changes: 28 additions & 23 deletions synapse/handlers/room.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import math
import string
from collections import OrderedDict
from types import Dict

from six import iteritems, string_types

Expand Down Expand Up @@ -145,15 +146,16 @@ def upgrade_room(

return ret

@defer.inlineCallbacks
def _upgrade_room(self, requester, old_room_id, new_version):
async def _upgrade_room(
self, requester: Requester, old_room_id: str, new_version: RoomVersion,
) -> RoomID:
user_id = requester.user.to_string()

# start by allocating a new room id
r = yield self.store.get_room(old_room_id)
r = await self.store.get_room(old_room_id)
if r is None:
raise NotFoundError("Unknown room id %s" % (old_room_id,))
new_room_id = yield self._generate_room_id(
new_room_id = await self._generate_room_id(
creator_id=user_id, is_public=r["is_public"], room_version=new_version,
)

Expand All @@ -164,7 +166,7 @@ def _upgrade_room(self, requester, old_room_id, new_version):
(
tombstone_event,
tombstone_context,
) = yield self.event_creation_handler.create_event(
) = await self.event_creation_handler.create_event(
requester,
{
"type": EventTypes.Tombstone,
Expand All @@ -178,12 +180,12 @@ def _upgrade_room(self, requester, old_room_id, new_version):
},
token_id=requester.access_token_id,
)
old_room_version = yield self.store.get_room_version_id(old_room_id)
yield self.auth.check_from_context(
old_room_version = await self.store.get_room_version_id(old_room_id)
await self.auth.check_from_context(
old_room_version, tombstone_event, tombstone_context
)

yield self.clone_existing_room(
await self.clone_existing_room(
requester,
old_room_id=old_room_id,
new_room_id=new_room_id,
Expand All @@ -192,25 +194,25 @@ def _upgrade_room(self, requester, old_room_id, new_version):
)

# now send the tombstone
yield self.event_creation_handler.send_nonmember_event(
await self.event_creation_handler.send_nonmember_event(
requester, tombstone_event, tombstone_context
)

old_room_state = yield tombstone_context.get_current_state_ids()
old_room_state = await tombstone_context.get_current_state_ids()

# update any aliases
yield self._move_aliases_to_new_room(
await self._move_aliases_to_new_room(
requester, old_room_id, new_room_id, old_room_state
)

# Copy over user push rules, tags and migrate room directory state
yield self.room_member_handler.transfer_room_state_on_room_upgrade(
await self.room_member_handler.transfer_room_state_on_room_upgrade(
old_room_id, new_room_id
)

# finally, shut down the PLs in the old room, and update them in the new
# room.
yield self._update_upgraded_room_pls(
await self._update_upgraded_room_pls(
requester, old_room_id, new_room_id, old_room_state,
)

Expand Down Expand Up @@ -443,19 +445,22 @@ def clone_existing_room(
# XXX invites/joins
# XXX 3pid invites

@defer.inlineCallbacks
def _move_aliases_to_new_room(
self, requester, old_room_id, new_room_id, old_room_state
async def _move_aliases_to_new_room(
self,
requester: Requester,
old_room_id: str,
new_room_id: str,
old_room_state: Dict[(str, str), str],
):
directory_handler = self.hs.get_handlers().directory_handler

aliases = yield self.store.get_aliases_for_room(old_room_id)
aliases = await self.store.get_aliases_for_room(old_room_id)

# check to see if we have a canonical alias.
canonical_alias = None
canonical_alias_event_id = old_room_state.get((EventTypes.CanonicalAlias, ""))
if canonical_alias_event_id:
canonical_alias_event = yield self.store.get_event(canonical_alias_event_id)
canonical_alias_event = await self.store.get_event(canonical_alias_event_id)
if canonical_alias_event:
canonical_alias = canonical_alias_event.content.get("alias", "")

Expand All @@ -475,7 +480,7 @@ def _move_aliases_to_new_room(
for alias_str in aliases:
alias = RoomAlias.from_string(alias_str)
try:
yield directory_handler.delete_association(
await directory_handler.delete_association(
requester, alias, send_event=False
)
removed_aliases.append(alias_str)
Expand All @@ -496,14 +501,14 @@ def _move_aliases_to_new_room(
# as when you remove an alias from the directory normally - it just means that
# the aliases event gets out of sync with the directory
# (cf https://github.com/vector-im/riot-web/issues/2369)
yield directory_handler.send_room_alias_update_event(requester, old_room_id)
await directory_handler.send_room_alias_update_event(requester, old_room_id)
except AuthError as e:
logger.warning("Failed to send updated alias event on old room: %s", e)

# we can now add any aliases we successfully removed to the new room.
for alias in removed_aliases:
try:
yield directory_handler.create_association(
await directory_handler.create_association(
requester,
RoomAlias.from_string(alias),
new_room_id,
Expand All @@ -519,7 +524,7 @@ def _move_aliases_to_new_room(

try:
if canonical_alias and (canonical_alias in removed_aliases):
yield self.event_creation_handler.create_and_send_nonmember_event(
await self.event_creation_handler.create_and_send_nonmember_event(
requester,
{
"type": EventTypes.CanonicalAlias,
Expand All @@ -531,7 +536,7 @@ def _move_aliases_to_new_room(
ratelimit=False,
)

yield directory_handler.send_room_alias_update_event(requester, new_room_id)
await directory_handler.send_room_alias_update_event(requester, new_room_id)
except SynapseError as e:
# again I'm not really expecting this to fail, but if it does, I'd rather
# we returned the new room to the client at this point.
Expand Down

0 comments on commit dd03599

Please sign in to comment.