tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Use dedicated get_local_users_in_room to find local users when calculating join_authorised_via_users_server of a /make_join request (#13606)

Browse source 
Use dedicated `get_local_users_in_room` to find local users when calculating `join_authorised_via_users_server` ("the authorising user for joining a restricted room") of a `/make_join` request.

Found while working on https://github.com/matrix-org/synapse/pull/13575#discussion_r953023755 but it's not related.
This commit is contained in:
Eric Eastwood 2022-08-24 11:14:28 -05:00 committed by GitHub
parent 371db86a86
commit c807b814ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/13606.misc Normal file
View file

@ -0,0 +1 @@
Use dedicated `get_local_users_in_room(room_id)` function to find local users when calculating `join_authorised_via_users_server` of a `/make_join` request.

9
synapse/handlers/event_auth.py
View file

@ -129,12 +129,9 @@ class EventAuthHandler:
else: else:
users = {} users = {}
# Find the user with the highest power level. # Find the user with the highest power level (only interested in local
users_in_room = await self._store.get_users_in_room(room_id) # users).
# Only interested in local users. local_users_in_room = await self._store.get_local_users_in_room(room_id)
local_users_in_room = [
u for u in users_in_room if get_domain_from_id(u) == self._server_name
]
chosen_user = max( chosen_user = max(
local_users_in_room, local_users_in_room,
key=lambda user: users.get(user, users_default_level), key=lambda user: users.get(user, users_default_level),