mirror of
https://github.com/element-hq/synapse.git
synced 2026-11-12 05:37:48 +00:00
Jason LittleandPaul Chobert
7530874a12
Requires * #19768 * #19782 * https://github.com/matrix-org/complement/pull/915 To meet the requirements for bumping Synapse to support [Matrix spec to 1.16](https://github.com/element-hq/synapse/issues/19414) the default room version should be incremented to "12". Other than the two separate Synapse PRs above(which are included here but marked as "[diverted]" and should be removed prior to review) there is only [one other real change](https://github.com/element-hq/synapse/commit/c005e96c665b5a098a9b95d10f33faf224564be9) to the code base itself to fix a `KeyError` during logging for a `/sync` test against unknown room versions. Everything else should be on the unit tests themselves. Standard unit test running applies, should be nothing special to test this outright. `poetry run trial -jN tests` and similar for Postgresql. Probably ok to review commit-by-commit I took the liberty of writing a [room creating helper](https://github.com/element-hq/synapse/commit/5ba81ad5d4a0a6787b7626bdb3293f633ea4097a) for the two test series that try and test the sharding of the `event_persister` workers. I'm not certain it stands up to scrutiny, but at least does not do any funny mocking when producing room v12 appropriate room IDs. I also took the liberty of writing an [assertion helper](https://github.com/element-hq/synapse/pull/20130/commits/e408cef241d1b9c6a88f069eb5832de053790f9b) for comparing lists of dicts for a select subset of keys/values. This is used to compare stripped state selections while waiting on https://github.com/element-hq/synapse/pull/19723 to be completed. ### Pull Request Checklist <!-- Please read https://element-hq.github.io/synapse/latest/development/contributing_guide.html before submitting your pull request --> * [x] Pull request is based on the develop branch * [x] Pull request includes a [changelog file](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#changelog). The entry should: - Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from `EventStore` to `EventWorkerStore`.". - Use markdown where necessary, mostly for `code blocks`. - End with either a period (.) or an exclamation mark (!). - Start with a capital letter. - Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry. * [x] [Code style](https://element-hq.github.io/synapse/latest/code_style.html) is correct (run the [linters](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#run-the-linters)) --------- Co-authored-by: Paul Chobert <paul@chobert.fr>
488 lines
18 KiB
Python
488 lines
18 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright 2021 The Matrix.org Foundation C.I.C.
|
|
# Copyright (C) 2023 New Vector, 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>.
|
|
#
|
|
# Originally licensed under the Apache License, Version 2.0:
|
|
# <http://www.apache.org/licenses/LICENSE-2.0>.
|
|
#
|
|
# [This file includes modifications made by New Vector Limited]
|
|
#
|
|
#
|
|
from unittest.mock import patch
|
|
|
|
from twisted.internet.testing import MemoryReactor
|
|
|
|
from synapse.api.constants import EventContentFields, EventTypes, Membership, RoomTypes
|
|
from synapse.api.room_versions import RoomVersions
|
|
from synapse.config.server import DEFAULT_ROOM_VERSION
|
|
from synapse.rest import admin
|
|
from synapse.rest.client import login, room, room_upgrade_rest_servlet
|
|
from synapse.server import HomeServer
|
|
from synapse.util.clock import Clock
|
|
|
|
from tests import unittest
|
|
from tests.server import FakeChannel
|
|
|
|
|
|
class UpgradeRoomTest(unittest.HomeserverTestCase):
|
|
servlets = [
|
|
admin.register_servlets,
|
|
login.register_servlets,
|
|
room.register_servlets,
|
|
room_upgrade_rest_servlet.register_servlets,
|
|
]
|
|
|
|
def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
|
|
self.store = hs.get_datastores().main
|
|
|
|
self.creator = self.register_user("creator", "pass")
|
|
self.creator_token = self.login(self.creator, "pass")
|
|
|
|
self.other = self.register_user("user", "pass")
|
|
self.other_token = self.login(self.other, "pass")
|
|
|
|
self.room_id = self.helper.create_room_as(self.creator, tok=self.creator_token)
|
|
self.helper.join(self.room_id, self.other, tok=self.other_token)
|
|
|
|
def _upgrade_room(
|
|
self,
|
|
token: str | None = None,
|
|
room_id: str | None = None,
|
|
expire_cache: bool = True,
|
|
new_version: str = DEFAULT_ROOM_VERSION,
|
|
) -> FakeChannel:
|
|
if expire_cache:
|
|
# We don't want a cached response.
|
|
self.reactor.advance(5 * 60 + 1)
|
|
|
|
if room_id is None:
|
|
room_id = self.room_id
|
|
|
|
return self.make_request(
|
|
"POST",
|
|
f"/_matrix/client/r0/rooms/{room_id}/upgrade",
|
|
# This will upgrade a room to the same version, but that's fine.
|
|
content={"new_version": new_version},
|
|
access_token=token or self.creator_token,
|
|
)
|
|
|
|
def test_upgrade(self) -> None:
|
|
"""
|
|
Upgrading a room should work fine.
|
|
"""
|
|
channel = self._upgrade_room()
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
self.assertIn("replacement_room", channel.json_body)
|
|
|
|
new_room_id = channel.json_body["replacement_room"]
|
|
|
|
# Check that the tombstone event points to the new room.
|
|
tombstone_event = self.get_success(
|
|
self.hs.get_storage_controllers().state.get_current_state_event(
|
|
self.room_id, EventTypes.Tombstone, ""
|
|
)
|
|
)
|
|
assert tombstone_event is not None
|
|
self.assertEqual(new_room_id, tombstone_event.content["replacement_room"])
|
|
|
|
# Check that the new room exists.
|
|
room = self.get_success(self.store.get_room(new_room_id))
|
|
self.assertIsNotNone(room)
|
|
|
|
def test_never_in_room(self) -> None:
|
|
"""
|
|
A user who has never been in the room cannot upgrade the room.
|
|
"""
|
|
# The user isn't in the room.
|
|
roomless = self.register_user("roomless", "pass")
|
|
roomless_token = self.login(roomless, "pass")
|
|
|
|
channel = self._upgrade_room(roomless_token)
|
|
self.assertEqual(403, channel.code, channel.result)
|
|
|
|
def test_left_room(self) -> None:
|
|
"""
|
|
A user who is no longer in the room cannot upgrade the room.
|
|
"""
|
|
# Remove the user from the room.
|
|
self.helper.leave(self.room_id, self.creator, tok=self.creator_token)
|
|
|
|
channel = self._upgrade_room(self.creator_token)
|
|
self.assertEqual(403, channel.code, channel.result)
|
|
|
|
def test_power_levels(self) -> None:
|
|
"""
|
|
Another user can upgrade the room if their power level is increased.
|
|
"""
|
|
# The other user doesn't have the proper power level.
|
|
channel = self._upgrade_room(self.other_token)
|
|
self.assertEqual(403, channel.code, channel.result)
|
|
|
|
# Increase the power levels so that this user can upgrade.
|
|
power_levels = self.helper.get_state(
|
|
self.room_id,
|
|
"m.room.power_levels",
|
|
tok=self.creator_token,
|
|
)
|
|
# In the Matrix Spec v1.16, m.room.tombstone events are MUST explicitly be
|
|
# higher than `state_default` per MSC4289.
|
|
power_levels["users"][self.other] = 150
|
|
self.helper.send_state(
|
|
self.room_id,
|
|
"m.room.power_levels",
|
|
body=power_levels,
|
|
tok=self.creator_token,
|
|
)
|
|
|
|
# The upgrade should succeed!
|
|
channel = self._upgrade_room(self.other_token)
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
|
|
def test_power_levels_user_default(self) -> None:
|
|
"""
|
|
Another user can upgrade the room if the default power level for users is increased.
|
|
"""
|
|
# The other user doesn't have the proper power level.
|
|
channel = self._upgrade_room(self.other_token)
|
|
self.assertEqual(403, channel.code, channel.result)
|
|
|
|
# Increase the power levels so that this user can upgrade.
|
|
power_levels = self.helper.get_state(
|
|
self.room_id,
|
|
"m.room.power_levels",
|
|
tok=self.creator_token,
|
|
)
|
|
# In the Matrix Spec v1.16, m.room.tombstone events are MUST explicitly be
|
|
# higher than `state_default` per MSC4289.
|
|
power_levels["users_default"] = 150
|
|
self.helper.send_state(
|
|
self.room_id,
|
|
"m.room.power_levels",
|
|
body=power_levels,
|
|
tok=self.creator_token,
|
|
)
|
|
|
|
# The upgrade should succeed!
|
|
channel = self._upgrade_room(self.other_token)
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
|
|
def test_power_levels_tombstone(self) -> None:
|
|
"""
|
|
Another user can upgrade the room if they can send the tombstone event.
|
|
"""
|
|
# The other user doesn't have the proper power level.
|
|
channel = self._upgrade_room(self.other_token)
|
|
self.assertEqual(403, channel.code, channel.result)
|
|
|
|
# Increase the power levels so that this user can upgrade.
|
|
power_levels = self.helper.get_state(
|
|
self.room_id,
|
|
"m.room.power_levels",
|
|
tok=self.creator_token,
|
|
)
|
|
power_levels["events"]["m.room.tombstone"] = 0
|
|
self.helper.send_state(
|
|
self.room_id,
|
|
"m.room.power_levels",
|
|
body=power_levels,
|
|
tok=self.creator_token,
|
|
)
|
|
|
|
# The upgrade should succeed!
|
|
channel = self._upgrade_room(self.other_token)
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
|
|
power_levels = self.helper.get_state(
|
|
self.room_id,
|
|
"m.room.power_levels",
|
|
tok=self.creator_token,
|
|
)
|
|
self.assertNotIn(self.other, power_levels["users"])
|
|
|
|
def test_stringy_power_levels(self) -> None:
|
|
"""The room upgrade converts stringy power levels to proper integers."""
|
|
# Create a room on room version < 10.
|
|
room_id = self.helper.create_room_as(
|
|
self.creator, tok=self.creator_token, room_version="9"
|
|
)
|
|
self.helper.join(room_id, self.other, tok=self.other_token)
|
|
|
|
# Retrieve the room's current power levels.
|
|
power_levels = self.helper.get_state(
|
|
room_id,
|
|
"m.room.power_levels",
|
|
tok=self.creator_token,
|
|
)
|
|
|
|
# Set other's power level to the string "100" instead of the integer `100`.
|
|
power_levels["users"][self.other] = "100"
|
|
|
|
# Synapse refuses to accept new stringy power level events. Bypass this by
|
|
# neutering the validation.
|
|
with patch("synapse.events.validator.jsonschema.validate"):
|
|
# Note: https://github.com/matrix-org/matrix-spec/issues/853 plans to forbid
|
|
# string power levels in new rooms. For this test to have a clean
|
|
# conscience, we ought to ensure it's upgrading from a sufficiently old
|
|
# version of room.
|
|
self.helper.send_state(
|
|
room_id,
|
|
"m.room.power_levels",
|
|
body=power_levels,
|
|
tok=self.creator_token,
|
|
)
|
|
|
|
# Upgrade the room. Check the homeserver reports success.
|
|
channel = self._upgrade_room(room_id=room_id)
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
|
|
# Extract the new room ID.
|
|
new_room_id = channel.json_body["replacement_room"]
|
|
|
|
# Fetch the new room's power level event.
|
|
new_power_levels = self.helper.get_state(
|
|
new_room_id,
|
|
"m.room.power_levels",
|
|
tok=self.creator_token,
|
|
)
|
|
|
|
# We should now have an integer power level.
|
|
self.assertEqual(new_power_levels["users"][self.other], 100, new_power_levels)
|
|
|
|
def test_events_field_missing(self) -> None:
|
|
"""Regression test for https://github.com/matrix-org/synapse/issues/16715."""
|
|
# Create a new room.
|
|
room_id = self.helper.create_room_as(
|
|
self.creator, tok=self.creator_token, room_version="10"
|
|
)
|
|
self.helper.join(room_id, self.other, tok=self.other_token)
|
|
|
|
# Retrieve the room's current power levels.
|
|
power_levels = self.helper.get_state(
|
|
room_id,
|
|
"m.room.power_levels",
|
|
tok=self.creator_token,
|
|
)
|
|
|
|
# Remove the events field and re-set the power levels.
|
|
del power_levels["events"]
|
|
self.helper.send_state(
|
|
room_id,
|
|
"m.room.power_levels",
|
|
body=power_levels,
|
|
tok=self.creator_token,
|
|
)
|
|
|
|
# Upgrade the room. Check the homeserver reports success.
|
|
channel = self._upgrade_room(room_id=room_id)
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
|
|
def test_space(self) -> None:
|
|
"""Test upgrading a space."""
|
|
|
|
# Create a space.
|
|
space_id = self.helper.create_room_as(
|
|
self.creator,
|
|
tok=self.creator_token,
|
|
extra_content={
|
|
"creation_content": {EventContentFields.ROOM_TYPE: RoomTypes.SPACE}
|
|
},
|
|
)
|
|
|
|
# Add the room as a child room.
|
|
self.helper.send_state(
|
|
space_id,
|
|
event_type=EventTypes.SpaceChild,
|
|
body={"via": [self.hs.hostname]},
|
|
tok=self.creator_token,
|
|
state_key=self.room_id,
|
|
)
|
|
|
|
# Also add a room that was removed.
|
|
old_room_id = "!notaroom:" + self.hs.hostname
|
|
self.helper.send_state(
|
|
space_id,
|
|
event_type=EventTypes.SpaceChild,
|
|
body={},
|
|
tok=self.creator_token,
|
|
state_key=old_room_id,
|
|
)
|
|
|
|
# Upgrade the room!
|
|
channel = self._upgrade_room(room_id=space_id)
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
self.assertIn("replacement_room", channel.json_body)
|
|
|
|
new_space_id = channel.json_body["replacement_room"]
|
|
|
|
state_ids = self.get_success(
|
|
self.store.get_partial_current_state_ids(new_space_id)
|
|
)
|
|
|
|
# Ensure the new room is still a space.
|
|
create_event = self.get_success(
|
|
self.store.get_event(state_ids[(EventTypes.Create, "")])
|
|
)
|
|
self.assertEqual(
|
|
create_event.content.get(EventContentFields.ROOM_TYPE), RoomTypes.SPACE
|
|
)
|
|
|
|
# The child link should have been copied over.
|
|
self.assertIn((EventTypes.SpaceChild, self.room_id), state_ids)
|
|
# The child that was removed should not be copied over.
|
|
self.assertNotIn((EventTypes.SpaceChild, old_room_id), state_ids)
|
|
|
|
def test_custom_room_type(self) -> None:
|
|
"""Test upgrading a room that has a custom room type set."""
|
|
test_room_type = "com.example.my_custom_room_type"
|
|
|
|
# Create a room with a custom room type.
|
|
room_id = self.helper.create_room_as(
|
|
self.creator,
|
|
tok=self.creator_token,
|
|
extra_content={
|
|
"creation_content": {EventContentFields.ROOM_TYPE: test_room_type}
|
|
},
|
|
)
|
|
|
|
# Upgrade the room!
|
|
channel = self._upgrade_room(room_id=room_id)
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
self.assertIn("replacement_room", channel.json_body)
|
|
|
|
new_room_id = channel.json_body["replacement_room"]
|
|
|
|
state_ids = self.get_success(
|
|
self.store.get_partial_current_state_ids(new_room_id)
|
|
)
|
|
|
|
# Ensure the new room is the same type as the old room.
|
|
create_event = self.get_success(
|
|
self.store.get_event(state_ids[(EventTypes.Create, "")])
|
|
)
|
|
self.assertEqual(
|
|
create_event.content.get(EventContentFields.ROOM_TYPE), test_room_type
|
|
)
|
|
|
|
def test_second_upgrade_from_same_user(self) -> None:
|
|
"""A second room upgrade from the same user is deduplicated."""
|
|
channel1 = self._upgrade_room()
|
|
self.assertEqual(200, channel1.code, channel1.result)
|
|
|
|
channel2 = self._upgrade_room(expire_cache=False)
|
|
self.assertEqual(200, channel2.code, channel2.result)
|
|
|
|
self.assertEqual(
|
|
channel1.json_body["replacement_room"],
|
|
channel2.json_body["replacement_room"],
|
|
)
|
|
|
|
def test_second_upgrade_after_delay(self) -> None:
|
|
"""A second room upgrade is not deduplicated after some time has passed."""
|
|
channel1 = self._upgrade_room()
|
|
self.assertEqual(200, channel1.code, channel1.result)
|
|
|
|
channel2 = self._upgrade_room(expire_cache=True)
|
|
self.assertEqual(200, channel2.code, channel2.result)
|
|
|
|
self.assertNotEqual(
|
|
channel1.json_body["replacement_room"],
|
|
channel2.json_body["replacement_room"],
|
|
)
|
|
|
|
def test_second_upgrade_from_different_user(self) -> None:
|
|
"""A second room upgrade from a different user is blocked."""
|
|
channel = self._upgrade_room()
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
|
|
channel = self._upgrade_room(self.other_token, expire_cache=False)
|
|
self.assertEqual(400, channel.code, channel.result)
|
|
|
|
def test_first_upgrade_does_not_block_second(self) -> None:
|
|
"""A second room upgrade is not blocked when a previous upgrade attempt was not
|
|
allowed.
|
|
"""
|
|
channel = self._upgrade_room(self.other_token)
|
|
self.assertEqual(403, channel.code, channel.result)
|
|
|
|
channel = self._upgrade_room(expire_cache=False)
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
|
|
def test_bans(self) -> None:
|
|
"""
|
|
Test that bans get copied over when upgrading a room.
|
|
"""
|
|
|
|
users_to_ban = ["@user2:test", "@user3:test", "@user4:test"]
|
|
for user in users_to_ban:
|
|
self.helper.ban(self.room_id, self.creator, user, tok=self.creator_token)
|
|
|
|
channel = self._upgrade_room(self.creator_token)
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
|
|
for user in users_to_ban:
|
|
content = self.helper.get_state(
|
|
self.room_id,
|
|
event_type=EventTypes.Member,
|
|
state_key=user,
|
|
tok=self.creator_token,
|
|
)
|
|
self.assertEqual(content[EventContentFields.MEMBERSHIP], Membership.BAN)
|
|
|
|
def test_creator_removed_from_powerlevels_v12(self) -> None:
|
|
"""
|
|
Test that the creator is removed from the power levels users map when
|
|
upgrading to a room version with MSC4289.
|
|
"""
|
|
# Create a room on room version 11, which doesn't have MSC4289.
|
|
room_id = self.helper.create_room_as(
|
|
self.creator, tok=self.creator_token, room_version="11"
|
|
)
|
|
self.helper.join(room_id, self.other, tok=self.other_token)
|
|
|
|
# Retrieve the room's current power levels.
|
|
old_power_level_event = self.get_success(
|
|
self.hs.get_storage_controllers().state.get_current_state_event(
|
|
room_id, "m.room.power_levels", ""
|
|
)
|
|
)
|
|
assert old_power_level_event is not None
|
|
|
|
# The creator should be in the users map with power level 100.
|
|
self.assertEqual(old_power_level_event.content["users"][self.creator], 100)
|
|
|
|
# Upgrade the room to version 12, which has MSC4289.
|
|
channel = self._upgrade_room(
|
|
room_id=room_id, new_version=RoomVersions.V12.identifier
|
|
)
|
|
self.assertEqual(200, channel.code, channel.result)
|
|
|
|
# Extract the new room ID.
|
|
new_room_id = channel.json_body["replacement_room"]
|
|
|
|
# Fetch the new room's power level event.
|
|
new_power_levels = self.helper.get_state(
|
|
new_room_id,
|
|
"m.room.power_levels",
|
|
tok=self.creator_token,
|
|
)
|
|
|
|
# The creator should no longer be in the users map.
|
|
self.assertNotIn(self.creator, new_power_levels["users"])
|
|
|
|
# The creator should still be in the old power levels event with power
|
|
# level 100.
|
|
#
|
|
# This is a regression test where previously Synapse would accidentally
|
|
# mutate the old power levels event.
|
|
self.assertEqual(old_power_level_event.content["users"][self.creator], 100)
|