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

Commit

Permalink
Use the proper error code when a canonical alias that does not exist …
Browse files Browse the repository at this point in the history
…is used. (#7109)
  • Loading branch information
clokep authored Mar 23, 2020
1 parent e341518 commit 190ab59
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 19 deletions.
1 change: 1 addition & 0 deletions changelog.d/7109.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Return the proper error (M_BAD_ALIAS) when a non-existant canonical alias is provided.
57 changes: 38 additions & 19 deletions synapse/handlers/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,38 @@ def handle_new_client_event(
self.store.remove_push_actions_from_staging, event.event_id
)

@defer.inlineCallbacks
def _validate_canonical_alias(
self, directory_handler, room_alias_str, expected_room_id
):
"""
Ensure that the given room alias points to the expected room ID.
Args:
directory_handler: The directory handler object.
room_alias_str: The room alias to check.
expected_room_id: The room ID that the alias should point to.
"""
room_alias = RoomAlias.from_string(room_alias_str)
try:
mapping = yield directory_handler.get_association(room_alias)
except SynapseError as e:
# Turn M_NOT_FOUND errors into M_BAD_ALIAS errors.
if e.errcode == Codes.NOT_FOUND:
raise SynapseError(
400,
"Room alias %s does not point to the room" % (room_alias_str,),
Codes.BAD_ALIAS,
)
raise

if mapping["room_id"] != expected_room_id:
raise SynapseError(
400,
"Room alias %s does not point to the room" % (room_alias_str,),
Codes.BAD_ALIAS,
)

@defer.inlineCallbacks
def persist_and_notify_client_event(
self, requester, event, context, ratelimit=True, extra_users=[]
Expand Down Expand Up @@ -905,15 +937,9 @@ def persist_and_notify_client_event(
room_alias_str = event.content.get("alias", None)
directory_handler = self.hs.get_handlers().directory_handler
if room_alias_str and room_alias_str != original_alias:
room_alias = RoomAlias.from_string(room_alias_str)
mapping = yield directory_handler.get_association(room_alias)

if mapping["room_id"] != event.room_id:
raise SynapseError(
400,
"Room alias %s does not point to the room" % (room_alias_str,),
Codes.BAD_ALIAS,
)
yield self._validate_canonical_alias(
directory_handler, room_alias_str, event.room_id
)

# Check that alt_aliases is the proper form.
alt_aliases = event.content.get("alt_aliases", [])
Expand All @@ -931,16 +957,9 @@ def persist_and_notify_client_event(
new_alt_aliases = set(alt_aliases) - set(original_alt_aliases)
if new_alt_aliases:
for alias_str in new_alt_aliases:
room_alias = RoomAlias.from_string(alias_str)
mapping = yield directory_handler.get_association(room_alias)

if mapping["room_id"] != event.room_id:
raise SynapseError(
400,
"Room alias %s does not point to the room"
% (room_alias_str,),
Codes.BAD_ALIAS,
)
yield self._validate_canonical_alias(
directory_handler, alias_str, event.room_id
)

federation_handler = self.hs.get_handlers().federation_handler

Expand Down

0 comments on commit 190ab59

Please sign in to comment.