kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Call user_may_join_room spam checker method for server admins

Browse Source 
Call the `user_may_join_room` spam checker module API method, even if
the requester is a server admin.

This allows module authors to continue to use `user_may_join_room` to
track room joins in external systems.
This commit is contained in:
Andrew Morgan
2025-12-19 12:17:29 +00:00
parent f4320b5a49
commit 0afa4e95d9
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
synapse/handlers/room_member.py
View File

@@ -1036,23 +1036,32 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
bypass_spam_checker = await self.auth.is_server_admin(requester)
inviter = await self._get_inviter(target.to_string(), room_id)
if (
not bypass_spam_checker
# We assume that if the spam checker allowed the user to create
# a room then they're allowed to join it.
and not new_room
):
spam_check = (
# Assume that if the spam checker allowed the user to create
# a room, then they're allowed to join it.
#
# We do skip the spam check in this case, as blocking the join for a
# room creator will result in a broken room.
if not new_room:
# Make sure we always invoke the spam checker, even if we've already
# determined the requester may bypass it. This allows module authors
# to still track join attempts.
spam_check_result = (
await self._spam_checker_module_callbacks.user_may_join_room(
target.to_string(), room_id, is_invited=inviter is not None
)
)
if spam_check != self._spam_checker_module_callbacks.NOT_SPAM:
if (
# Did the spam checker block the join?
spam_check_result != self._spam_checker_module_callbacks.NOT_SPAM
# Is the requester allowed to bypass?
and not bypass_spam_checker
):
raise SynapseError(
403,
"Not allowed to join this room",
errcode=spam_check[0],
additional_fields=spam_check[1],
errcode=spam_check_result[0],
additional_fields=spam_check_result[1],
)
# Check if a remote join should be performed.