mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-08-09 00:12:13 -04:00
Correctly exclude users when making a room public or private (#11075)
Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
This commit is contained in:
David Robertson
GitHub
parent
5573133348
commit
e09be0c87a
4 changed files with 148 additions and 83 deletions
|
|
@ -109,18 +109,14 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
|
|||
tok=alice_token,
|
||||
)
|
||||
|
||||
users = self.get_success(self.user_dir_helper.get_users_in_user_directory())
|
||||
in_public = self.get_success(self.user_dir_helper.get_users_in_public_rooms())
|
||||
in_private = self.get_success(
|
||||
self.user_dir_helper.get_users_who_share_private_rooms()
|
||||
# The user directory should reflect the room memberships above.
|
||||
users, in_public, in_private = self.get_success(
|
||||
self.user_dir_helper.get_tables()
|
||||
)
|
||||
|
||||
self.assertEqual(users, {alice, bob})
|
||||
self.assertEqual(in_public, {(alice, public), (bob, public), (alice, public2)})
|
||||
self.assertEqual(
|
||||
set(in_public), {(alice, public), (bob, public), (alice, public2)}
|
||||
)
|
||||
self.assertEqual(
|
||||
self.user_dir_helper._compress_shared(in_private),
|
||||
in_private,
|
||||
{(alice, bob, private), (bob, alice, private)},
|
||||
)
|
||||
|
||||
|
|
@ -209,6 +205,88 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
|
|||
in_public = self.get_success(self.user_dir_helper.get_users_in_public_rooms())
|
||||
self.assertEqual(set(in_public), {(user1, room), (user2, room)})
|
||||
|
||||
def test_excludes_users_when_making_room_public(self) -> None:
|
||||
# Create a regular user and a support user.
|
||||
alice = self.register_user("alice", "pass")
|
||||
alice_token = self.login(alice, "pass")
|
||||
support = "@support1:test"
|
||||
self.get_success(
|
||||
self.store.register_user(
|
||||
user_id=support, password_hash=None, user_type=UserTypes.SUPPORT
|
||||
)
|
||||
)
|
||||
|
||||
# Make a public and private room containing Alice and the support user
|
||||
public, initially_private = self._create_rooms_and_inject_memberships(
|
||||
alice, alice_token, support
|
||||
)
|
||||
self._check_only_one_user_in_directory(alice, public)
|
||||
|
||||
# Alice makes the private room public.
|
||||
self.helper.send_state(
|
||||
initially_private,
|
||||
"m.room.join_rules",
|
||||
{"join_rule": "public"},
|
||||
tok=alice_token,
|
||||
)
|
||||
|
||||
users, in_public, in_private = self.get_success(
|
||||
self.user_dir_helper.get_tables()
|
||||
)
|
||||
self.assertEqual(users, {alice})
|
||||
self.assertEqual(in_public, {(alice, public), (alice, initially_private)})
|
||||
self.assertEqual(in_private, set())
|
||||
|
||||
def test_switching_from_private_to_public_to_private(self) -> None:
|
||||
"""Check we update the room sharing tables when switching a room
|
||||
from private to public, then back again to private."""
|
||||
# Alice and Bob share a private room.
|
||||
alice = self.register_user("alice", "pass")
|
||||
alice_token = self.login(alice, "pass")
|
||||
bob = self.register_user("bob", "pass")
|
||||
bob_token = self.login(bob, "pass")
|
||||
room = self.helper.create_room_as(alice, is_public=False, tok=alice_token)
|
||||
self.helper.invite(room, alice, bob, tok=alice_token)
|
||||
self.helper.join(room, bob, tok=bob_token)
|
||||
|
||||
# The user directory should reflect this.
|
||||
def check_user_dir_for_private_room() -> None:
|
||||
users, in_public, in_private = self.get_success(
|
||||
self.user_dir_helper.get_tables()
|
||||
)
|
||||
self.assertEqual(users, {alice, bob})
|
||||
self.assertEqual(in_public, set())
|
||||
self.assertEqual(in_private, {(alice, bob, room), (bob, alice, room)})
|
||||
|
||||
check_user_dir_for_private_room()
|
||||
|
||||
# Alice makes the room public.
|
||||
self.helper.send_state(
|
||||
room,
|
||||
"m.room.join_rules",
|
||||
{"join_rule": "public"},
|
||||
tok=alice_token,
|
||||
)
|
||||
|
||||
# The user directory should be updated accordingly
|
||||
users, in_public, in_private = self.get_success(
|
||||
self.user_dir_helper.get_tables()
|
||||
)
|
||||
self.assertEqual(users, {alice, bob})
|
||||
self.assertEqual(in_public, {(alice, room), (bob, room)})
|
||||
self.assertEqual(in_private, set())
|
||||
|
||||
# Alice makes the room private.
|
||||
self.helper.send_state(
|
||||
room,
|
||||
"m.room.join_rules",
|
||||
{"join_rule": "invite"},
|
||||
tok=alice_token,
|
||||
)
|
||||
|
||||
# The user directory should be updated accordingly
|
||||
check_user_dir_for_private_room()
|
||||
|
||||
def _create_rooms_and_inject_memberships(
|
||||
self, creator: str, token: str, joiner: str
|
||||
) -> Tuple[str, str]:
|
||||
|
|
@ -232,15 +310,18 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
|
|||
return public_room, private_room
|
||||
|
||||
def _check_only_one_user_in_directory(self, user: str, public: str) -> None:
|
||||
users = self.get_success(self.user_dir_helper.get_users_in_user_directory())
|
||||
in_public = self.get_success(self.user_dir_helper.get_users_in_public_rooms())
|
||||
in_private = self.get_success(
|
||||
self.user_dir_helper.get_users_who_share_private_rooms()
|
||||
)
|
||||
"""Check that the user directory DB tables show that:
|
||||
|
||||
- only one user is in the user directory
|
||||
- they belong to exactly one public room
|
||||
- they don't share a private room with anyone.
|
||||
"""
|
||||
users, in_public, in_private = self.get_success(
|
||||
self.user_dir_helper.get_tables()
|
||||
)
|
||||
self.assertEqual(users, {user})
|
||||
self.assertEqual(set(in_public), {(user, public)})
|
||||
self.assertEqual(in_private, [])
|
||||
self.assertEqual(in_public, {(user, public)})
|
||||
self.assertEqual(in_private, set())
|
||||
|
||||
def test_handle_local_profile_change_with_support_user(self) -> None:
|
||||
support_user_id = "@support:test"
|
||||
|
|
@ -581,11 +662,8 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
|
|||
self.user_dir_helper.get_users_in_public_rooms()
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
self.user_dir_helper._compress_shared(shares_private),
|
||||
{(u1, u2, room), (u2, u1, room)},
|
||||
)
|
||||
self.assertEqual(public_users, [])
|
||||
self.assertEqual(shares_private, {(u1, u2, room), (u2, u1, room)})
|
||||
self.assertEqual(public_users, set())
|
||||
|
||||
# We get one search result when searching for user2 by user1.
|
||||
s = self.get_success(self.handler.search_users(u1, "user2", 10))
|
||||
|
|
@ -610,8 +688,8 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
|
|||
self.user_dir_helper.get_users_in_public_rooms()
|
||||
)
|
||||
|
||||
self.assertEqual(self.user_dir_helper._compress_shared(shares_private), set())
|
||||
self.assertEqual(public_users, [])
|
||||
self.assertEqual(shares_private, set())
|
||||
self.assertEqual(public_users, set())
|
||||
|
||||
# User1 now gets no search results for any of the other users.
|
||||
s = self.get_success(self.handler.search_users(u1, "user2", 10))
|
||||
|
|
@ -645,11 +723,8 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
|
|||
self.user_dir_helper.get_users_in_public_rooms()
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
self.user_dir_helper._compress_shared(shares_private),
|
||||
{(u1, u2, room), (u2, u1, room)},
|
||||
)
|
||||
self.assertEqual(public_users, [])
|
||||
self.assertEqual(shares_private, {(u1, u2, room), (u2, u1, room)})
|
||||
self.assertEqual(public_users, set())
|
||||
|
||||
# We get one search result when searching for user2 by user1.
|
||||
s = self.get_success(self.handler.search_users(u1, "user2", 10))
|
||||
|
|
@ -704,11 +779,8 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
|
|||
self.user_dir_helper.get_users_in_public_rooms()
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
self.user_dir_helper._compress_shared(shares_private),
|
||||
{(u1, u2, room), (u2, u1, room)},
|
||||
)
|
||||
self.assertEqual(public_users, [])
|
||||
self.assertEqual(shares_private, {(u1, u2, room), (u2, u1, room)})
|
||||
self.assertEqual(public_users, set())
|
||||
|
||||
# Configure a spam checker.
|
||||
spam_checker = self.hs.get_spam_checker()
|
||||
|
|
@ -740,8 +812,8 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
|
|||
)
|
||||
|
||||
# No users share rooms
|
||||
self.assertEqual(public_users, [])
|
||||
self.assertEqual(self.user_dir_helper._compress_shared(shares_private), set())
|
||||
self.assertEqual(public_users, set())
|
||||
self.assertEqual(shares_private, set())
|
||||
|
||||
# Despite not sharing a room, search_all_users means we get a search
|
||||
# result.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue