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

Require a user to have a PL > canonical_alias when (de-)publishing to the directory. #6965

Merged
merged 1 commit into from
Feb 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/6965.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Publishing/removing a room from the room directory now requires the user to have a power level capable of modifying the canonical alias, instead of the room aliases.
10 changes: 5 additions & 5 deletions synapse/api/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -538,13 +538,13 @@ def compute_auth_events(
return defer.succeed(auth_ids)

@defer.inlineCallbacks
def check_can_change_room_list(self, room_id, user):
def check_can_change_room_list(self, room_id: str, user: UserID):
"""Check if the user is allowed to edit the room's entry in the
published room list.

Args:
room_id (str)
user (UserID)
room_id
user
"""

is_admin = yield self.is_server_admin(user)
Expand All @@ -556,7 +556,7 @@ def check_can_change_room_list(self, room_id, user):

# We currently require the user is a "moderator" in the room. We do this
# by checking if they would (theoretically) be able to change the
# m.room.aliases events
# m.room.canonical_alias events
power_level_event = yield self.state.get_current_state(
room_id, EventTypes.PowerLevels, ""
)
Expand All @@ -566,7 +566,7 @@ def check_can_change_room_list(self, room_id, user):
auth_events[(EventTypes.PowerLevels, "")] = power_level_event

send_level = event_auth.get_send_level(
EventTypes.Aliases, "", power_level_event
EventTypes.CanonicalAlias, "", power_level_event
)
user_level = event_auth.get_user_power_level(user_id, auth_events)

Expand Down