mirror of
https://github.com/element-hq/synapse.git
synced 2026-11-15 18:07:50 +00:00
Follow-up to https://github.com/element-hq/synapse/pull/20407, which added the `excluded_user_ids` option without enforcing it. This makes legacy `/sync` respect it: users listed in a room's `excluded_user_ids` no longer get that room through the synthetic join. They can still read it, as it is world-readable. The cached lookup now maps room ID to config ID, so the per-user filter runs in memory and adds no database query to `/sync`. `get_server_announcement_room_ids()` is kept as a wrapper, so the stacked PRs are unaffected. Known limitation, documented in the config docs: changing the list does not update rooms that clients already have. A newly excluded user keeps the room, which stops updating. A user removed from the list gets new events without the room's state until their next initial sync. I think that's an okay limitation for now, as we don't really expect this list to be used for real users --------- Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
184 lines
6.5 KiB
Python
184 lines
6.5 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright (C) 2026 Element Creations Ltd
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Affero General Public License as
|
|
# published by the Free Software Foundation, either version 3 of the
|
|
# License, or (at your option) any later version.
|
|
#
|
|
# See the GNU Affero General Public License for more details:
|
|
# <https://www.gnu.org/licenses/agpl-3.0.html>.
|
|
#
|
|
|
|
from parameterized import parameterized
|
|
|
|
from twisted.internet.testing import MemoryReactor
|
|
|
|
from synapse.config.server_announcements import ServerAnnouncementRoom
|
|
from synapse.rest.client import room
|
|
from synapse.server import HomeServer
|
|
from synapse.storage.databases.main.server_announcements import ServerAnnouncementsStore
|
|
from synapse.util.clock import Clock
|
|
|
|
from tests.unittest import HomeserverTestCase
|
|
|
|
|
|
class ServerAnnouncementsStoreTestCase(HomeserverTestCase):
|
|
user_id = "@announcer:test"
|
|
servlets = [room.register_servlets]
|
|
|
|
def prepare(
|
|
self, reactor: MemoryReactor, clock: Clock, homeserver: HomeServer
|
|
) -> None:
|
|
self.store = homeserver.get_datastores().main
|
|
self.config_id = "news"
|
|
self.room_id = "!announcements:test"
|
|
self.avatar = ("/avatars/news.png", "a" * 64, "mxc://test/avatar")
|
|
|
|
def _new_store(self) -> ServerAnnouncementsStore:
|
|
"""Create a fresh store over the same database, without announcement config."""
|
|
return self.get_success(
|
|
self.store.db_pool.runWithConnection(
|
|
lambda conn: ServerAnnouncementsStore(self.store.db_pool, conn, self.hs)
|
|
)
|
|
)
|
|
|
|
def _store_room(self) -> None:
|
|
"""Create a server announcement room mapping."""
|
|
self.get_success(
|
|
self.store.store_server_announcement_room(self.config_id, self.room_id)
|
|
)
|
|
self.get_success(
|
|
self.store.store_server_announcement_avatar(self.config_id, *self.avatar)
|
|
)
|
|
|
|
@parameterized.expand([("standard", False), ("force", True)])
|
|
def test_room_purge_deletes_mapping_and_avatar(
|
|
self, _name: str, force: bool
|
|
) -> None:
|
|
# Set up an announcement room.
|
|
self.room_id = self.helper.create_room_as(self.user_id)
|
|
self._store_room()
|
|
|
|
# Read before purging to check that another store sees deletions too.
|
|
reader = self._new_store()
|
|
self.assertEqual(
|
|
self.get_success(reader.get_server_announcement_room(self.config_id)),
|
|
self.room_id,
|
|
)
|
|
self.assertEqual(
|
|
self.get_success(reader.get_server_announcement_id(self.room_id)),
|
|
self.config_id,
|
|
)
|
|
self.assertEqual(
|
|
self.get_success(reader.get_server_announcement_avatar(self.config_id)),
|
|
self.avatar,
|
|
)
|
|
|
|
# A standard purge requires all local users to leave; a forced purge
|
|
# must also remove the mapping while the user is still joined.
|
|
if not force:
|
|
self.helper.leave(self.room_id, user=self.user_id)
|
|
|
|
self.get_success(
|
|
self.hs.get_pagination_handler().purge_room(self.room_id, force=force)
|
|
)
|
|
|
|
# Check that the room no longer exists.
|
|
self.assertIsNone(
|
|
self.get_success(
|
|
self.store.db_pool.simple_select_one_onecol(
|
|
table="rooms",
|
|
keyvalues={"room_id": self.room_id},
|
|
retcol="room_id",
|
|
allow_none=True,
|
|
)
|
|
)
|
|
)
|
|
|
|
# Check that the announcement room exists.
|
|
self.assertIsNone(
|
|
self.get_success(reader.get_server_announcement_room(self.config_id))
|
|
)
|
|
self.assertIsNone(
|
|
self.get_success(reader.get_server_announcement_id(self.room_id))
|
|
)
|
|
self.assertIsNone(
|
|
self.get_success(reader.get_server_announcement_avatar(self.config_id))
|
|
)
|
|
|
|
# Check that the same announcement room `id` can then be re-used.
|
|
replacement_room_id = self.helper.create_room_as(self.user_id)
|
|
self.get_success(
|
|
self.store.store_server_announcement_room(
|
|
self.config_id, replacement_room_id
|
|
)
|
|
)
|
|
self.assertEqual(
|
|
self.get_success(reader.get_server_announcement_room(self.config_id)),
|
|
replacement_room_id,
|
|
)
|
|
self.assertEqual(
|
|
self.get_success(reader.get_server_announcement_id(replacement_room_id)),
|
|
self.config_id,
|
|
)
|
|
self.assertIsNone(
|
|
self.get_success(reader.get_server_announcement_avatar(self.config_id))
|
|
)
|
|
|
|
def test_room_ids_for_user_leave_out_excluded_rooms(self) -> None:
|
|
"""A user listed in one room's `excluded_user_ids` gets every other
|
|
configured room, and a newly stored room shows up for both users.
|
|
"""
|
|
excluded_user_id = "@bot:test"
|
|
self.hs.config.serverannouncements.rooms = [
|
|
ServerAnnouncementRoom(
|
|
config_id=config_id,
|
|
room_name=config_id,
|
|
room_topic=None,
|
|
room_avatar_url=None,
|
|
room_avatar_path=None,
|
|
allowed_user_ids=[],
|
|
excluded_user_ids=excluded_user_ids,
|
|
)
|
|
for config_id, excluded_user_ids in (
|
|
("news", [excluded_user_id]),
|
|
("maintenance", []),
|
|
("incidents", []),
|
|
)
|
|
]
|
|
self.get_success(
|
|
self.store.store_server_announcement_room("news", "!news:test")
|
|
)
|
|
self.get_success(
|
|
self.store.store_server_announcement_room(
|
|
"maintenance", "!maintenance:test"
|
|
)
|
|
)
|
|
|
|
self.assertEqual(
|
|
self.get_success(
|
|
self.store.get_server_announcement_room_ids_for_user(excluded_user_id)
|
|
),
|
|
{"!maintenance:test"},
|
|
)
|
|
self.assertEqual(
|
|
self.get_success(
|
|
self.store.get_server_announcement_room_ids_for_user(self.user_id)
|
|
),
|
|
{"!news:test", "!maintenance:test"},
|
|
)
|
|
|
|
self.get_success(
|
|
self.store.store_server_announcement_room("incidents", "!incidents:test")
|
|
)
|
|
|
|
self.assertEqual(
|
|
self.get_success(
|
|
self.store.get_server_announcement_room_ids_for_user(excluded_user_id)
|
|
),
|
|
{"!maintenance:test", "!incidents:test"},
|
|
)
|