mirror of
https://github.com/element-hq/synapse.git
synced 2026-05-25 12:04:05 +00:00
bed00bb766
This adds a way to re-sign all locally-created events with a new signing key, which is useful when rotating server signing keys. This doesn't trigger automatically, instead needs to be triggered when needed via the admin API. c.f. https://github.com/matrix-org/internal-config/issues/1670#issuecomment-4206020126 for internal discussion. --------- Co-authored-by: Kegan Dougall <kegan@element.io> Co-authored-by: Erik Johnston <erikj@element.io>
456 lines
16 KiB
Python
456 lines
16 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright (C) 2025 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>.
|
|
#
|
|
#
|
|
|
|
|
|
import json
|
|
|
|
import signedjson.key
|
|
from canonicaljson import encode_canonical_json
|
|
|
|
from twisted.internet.testing import MemoryReactor
|
|
|
|
from synapse.api.constants import MAX_DEPTH
|
|
from synapse.api.room_versions import RoomVersion, RoomVersions
|
|
from synapse.rest import admin
|
|
from synapse.rest.client import login, room
|
|
from synapse.server import HomeServer
|
|
from synapse.storage.background_updates import BackgroundUpdater
|
|
from synapse.types.storage import _BackgroundUpdates
|
|
from synapse.util.clock import Clock
|
|
|
|
from tests.unittest import HomeserverTestCase, override_config
|
|
|
|
|
|
class TestFixupMaxDepthCapBgUpdate(HomeserverTestCase):
|
|
"""Test the background update that caps topological_ordering at MAX_DEPTH."""
|
|
|
|
def prepare(
|
|
self, reactor: MemoryReactor, clock: Clock, homeserver: HomeServer
|
|
) -> None:
|
|
self.store = self.hs.get_datastores().main
|
|
self.db_pool = self.store.db_pool
|
|
|
|
self.room_id = "!testroom:example.com"
|
|
|
|
# Reinsert the background update as it was already run at the start of
|
|
# the test.
|
|
self.get_success(
|
|
self.db_pool.simple_insert(
|
|
table="background_updates",
|
|
values={
|
|
"update_name": "fixup_max_depth_cap",
|
|
"progress_json": "{}",
|
|
},
|
|
)
|
|
)
|
|
|
|
def create_room(self, room_version: RoomVersion) -> dict[str, int]:
|
|
"""Create a room with a known room version and insert events.
|
|
|
|
Returns the set of event IDs that exceed MAX_DEPTH and
|
|
their depth.
|
|
"""
|
|
|
|
# Create a room with a specific room version
|
|
self.get_success(
|
|
self.db_pool.simple_insert(
|
|
table="rooms",
|
|
values={
|
|
"room_id": self.room_id,
|
|
"room_version": room_version.identifier,
|
|
},
|
|
)
|
|
)
|
|
|
|
# Insert events with some depths exceeding MAX_DEPTH
|
|
event_id_to_depth: dict[str, int] = {}
|
|
for depth in range(MAX_DEPTH - 5, MAX_DEPTH + 5):
|
|
event_id = f"$event{depth}:example.com"
|
|
event_id_to_depth[event_id] = depth
|
|
|
|
self.get_success(
|
|
self.db_pool.simple_insert(
|
|
table="events",
|
|
values={
|
|
"event_id": event_id,
|
|
"room_id": self.room_id,
|
|
"topological_ordering": depth,
|
|
"depth": depth,
|
|
"type": "m.test",
|
|
"sender": "@user:test",
|
|
"processed": True,
|
|
"outlier": False,
|
|
},
|
|
)
|
|
)
|
|
|
|
return event_id_to_depth
|
|
|
|
def test_fixup_max_depth_cap_bg_update(self) -> None:
|
|
"""Test that the background update correctly caps topological_ordering
|
|
at MAX_DEPTH."""
|
|
|
|
event_id_to_depth = self.create_room(RoomVersions.V6)
|
|
|
|
# Run the background update
|
|
progress = {"room_id": ""}
|
|
batch_size = 10
|
|
num_rooms = self.get_success(
|
|
self.store.fixup_max_depth_cap_bg_update(progress, batch_size)
|
|
)
|
|
|
|
# Verify the number of rooms processed
|
|
self.assertEqual(num_rooms, 1)
|
|
|
|
# Verify that the topological_ordering of events has been capped at
|
|
# MAX_DEPTH
|
|
rows = self.get_success(
|
|
self.db_pool.simple_select_list(
|
|
table="events",
|
|
keyvalues={"room_id": self.room_id},
|
|
retcols=["event_id", "topological_ordering"],
|
|
)
|
|
)
|
|
|
|
for event_id, topological_ordering in rows:
|
|
if event_id_to_depth[event_id] >= MAX_DEPTH:
|
|
# Events with a depth greater than or equal to MAX_DEPTH should
|
|
# be capped at MAX_DEPTH.
|
|
self.assertEqual(topological_ordering, MAX_DEPTH)
|
|
else:
|
|
# Events with a depth less than MAX_DEPTH should remain
|
|
# unchanged.
|
|
self.assertEqual(topological_ordering, event_id_to_depth[event_id])
|
|
|
|
def test_fixup_max_depth_cap_bg_update_old_room_version(self) -> None:
|
|
"""Test that the background update does not cap topological_ordering for
|
|
rooms with old room versions."""
|
|
|
|
event_id_to_depth = self.create_room(RoomVersions.V5)
|
|
|
|
# Run the background update
|
|
progress = {"room_id": ""}
|
|
batch_size = 10
|
|
num_rooms = self.get_success(
|
|
self.store.fixup_max_depth_cap_bg_update(progress, batch_size)
|
|
)
|
|
|
|
# Verify the number of rooms processed
|
|
self.assertEqual(num_rooms, 0)
|
|
|
|
# Verify that the topological_ordering of events has been capped at
|
|
# MAX_DEPTH
|
|
rows = self.get_success(
|
|
self.db_pool.simple_select_list(
|
|
table="events",
|
|
keyvalues={"room_id": self.room_id},
|
|
retcols=["event_id", "topological_ordering"],
|
|
)
|
|
)
|
|
|
|
# Assert that the topological_ordering of events has not been changed
|
|
# from their depth.
|
|
self.assertDictEqual(event_id_to_depth, dict(rows))
|
|
|
|
|
|
class TestRedactionsRecheckBgUpdate(HomeserverTestCase):
|
|
"""Test the background update that backfills the `recheck` column in redactions."""
|
|
|
|
def prepare(
|
|
self, reactor: MemoryReactor, clock: Clock, homeserver: HomeServer
|
|
) -> None:
|
|
self.store = self.hs.get_datastores().main
|
|
self.db_pool = self.store.db_pool
|
|
|
|
# Re-insert the background update, since it already ran during setup.
|
|
self.get_success(
|
|
self.db_pool.simple_insert(
|
|
table="background_updates",
|
|
values={
|
|
"update_name": _BackgroundUpdates.REDACTIONS_RECHECK_BG_UPDATE,
|
|
"progress_json": "{}",
|
|
},
|
|
)
|
|
)
|
|
self.db_pool.updates._all_done = False
|
|
|
|
def _insert_redaction(
|
|
self,
|
|
event_id: str,
|
|
redacts: str,
|
|
recheck_redaction: bool | None = None,
|
|
insert_event_json: bool = True,
|
|
) -> None:
|
|
"""Insert a row into `redactions` and optionally a matching `event_json` row.
|
|
|
|
Args:
|
|
event_id: The event ID of the redaction event.
|
|
redacts: The event ID being redacted.
|
|
recheck_redaction: The value of `recheck_redaction` in internal metadata.
|
|
If None, the key is omitted from internal metadata.
|
|
insert_event_json: Whether to insert a corresponding row in `event_json`.
|
|
"""
|
|
self.get_success(
|
|
self.db_pool.simple_insert(
|
|
table="redactions",
|
|
values={
|
|
"event_id": event_id,
|
|
"redacts": redacts,
|
|
"have_censored": False,
|
|
"received_ts": 0,
|
|
},
|
|
)
|
|
)
|
|
|
|
if insert_event_json:
|
|
internal_metadata: dict = {}
|
|
if recheck_redaction is not None:
|
|
internal_metadata["recheck_redaction"] = recheck_redaction
|
|
|
|
self.get_success(
|
|
self.db_pool.simple_insert(
|
|
table="event_json",
|
|
values={
|
|
"event_id": event_id,
|
|
"room_id": "!room:test",
|
|
"internal_metadata": encode_canonical_json(
|
|
internal_metadata
|
|
).decode("utf-8"),
|
|
"json": "{}",
|
|
"format_version": 3,
|
|
},
|
|
)
|
|
)
|
|
|
|
def _get_recheck(self, event_id: str) -> bool:
|
|
row = self.get_success(
|
|
self.db_pool.simple_select_one(
|
|
table="redactions",
|
|
keyvalues={"event_id": event_id},
|
|
retcols=["recheck"],
|
|
)
|
|
)
|
|
return bool(row[0])
|
|
|
|
def test_recheck_true(self) -> None:
|
|
"""A redaction with recheck_redaction=True in internal metadata gets recheck=True."""
|
|
self._insert_redaction("$redact1:test", "$target1:test", recheck_redaction=True)
|
|
|
|
self.wait_for_background_updates()
|
|
|
|
self.assertTrue(self._get_recheck("$redact1:test"))
|
|
|
|
def test_recheck_false(self) -> None:
|
|
"""A redaction with recheck_redaction=False in internal metadata gets recheck=False."""
|
|
self._insert_redaction(
|
|
"$redact2:test", "$target2:test", recheck_redaction=False
|
|
)
|
|
|
|
self.wait_for_background_updates()
|
|
|
|
self.assertFalse(self._get_recheck("$redact2:test"))
|
|
|
|
def test_recheck_absent_from_metadata(self) -> None:
|
|
"""A redaction with no recheck_redaction key in internal metadata gets recheck=False."""
|
|
self._insert_redaction("$redact3:test", "$target3:test", recheck_redaction=None)
|
|
|
|
self.wait_for_background_updates()
|
|
|
|
self.assertFalse(self._get_recheck("$redact3:test"))
|
|
|
|
def test_recheck_no_event_json(self) -> None:
|
|
"""A redaction with no event_json row gets recheck=False."""
|
|
self._insert_redaction(
|
|
"$redact4:test", "$target4:test", insert_event_json=False
|
|
)
|
|
|
|
self.wait_for_background_updates()
|
|
|
|
self.assertFalse(self._get_recheck("$redact4:test"))
|
|
|
|
def test_batching(self) -> None:
|
|
"""The update processes rows in batches, completing when all are done."""
|
|
self._insert_redaction("$redact5:test", "$target5:test", recheck_redaction=True)
|
|
self._insert_redaction(
|
|
"$redact6:test", "$target6:test", recheck_redaction=False
|
|
)
|
|
self._insert_redaction("$redact7:test", "$target7:test", recheck_redaction=True)
|
|
|
|
self.wait_for_background_updates()
|
|
|
|
self.assertTrue(self._get_recheck("$redact5:test"))
|
|
self.assertFalse(self._get_recheck("$redact6:test"))
|
|
self.assertTrue(self._get_recheck("$redact7:test"))
|
|
|
|
|
|
class TestResignEventsBgUpdate(HomeserverTestCase):
|
|
"""Test the background update that re-signs events."""
|
|
|
|
servlets = [
|
|
admin.register_servlets,
|
|
room.register_servlets,
|
|
login.register_servlets,
|
|
]
|
|
|
|
def prepare(
|
|
self, reactor: MemoryReactor, clock: Clock, homeserver: HomeServer
|
|
) -> None:
|
|
self.updates: BackgroundUpdater = self.hs.get_datastores().main.db_pool.updates
|
|
self.store = self.hs.get_datastores().main
|
|
self.db_pool = self.store.db_pool
|
|
|
|
self.room_id = "!testroom:example.com"
|
|
|
|
@override_config({"caches": {"global_factor": 1}, "event_cache_size": "999"})
|
|
def test_events_are_resigned_after_bg_update_runs(self) -> None:
|
|
"""Test that the background update correctly re-signs existing events with the
|
|
new key"""
|
|
|
|
# Ensure all background updates have finished running
|
|
self.wait_for_background_updates()
|
|
|
|
# Set up a room with a local and remote user in it.
|
|
self.register_user("user", "pass")
|
|
token = self.login("user", "pass")
|
|
|
|
# Create new room
|
|
room_id = self.helper.create_room_as(
|
|
"user", room_version=RoomVersions.V12.identifier, tok=token
|
|
)
|
|
|
|
# Send a message
|
|
body = self.helper.send(room_id, body="Test", tok=token)
|
|
|
|
old_event = self.get_success(self.store.get_event(body["event_id"]))
|
|
old_key_id = f"{self.hs.signing_key.alg}:{self.hs.signing_key.version}"
|
|
|
|
# Ensure the message event is in the cache so that we test the cache is
|
|
# invalidated properly
|
|
res = self.store._get_event_cache.get_local((old_event.event_id,))
|
|
self.assertEqual(res.event, old_event, "Event not cached as expected.") # type: ignore
|
|
|
|
# Ensure message event is signed with original signing key
|
|
self.assertIn(
|
|
old_key_id, old_event.signatures[self.hs.config.server.server_name]
|
|
)
|
|
|
|
# Generate a new signing key
|
|
self.hs.signing_key = signedjson.key.generate_signing_key("new-test-key")
|
|
|
|
# Reinsert the background update as it was already run at the start of
|
|
# the test.
|
|
self.get_success(
|
|
self.db_pool.simple_insert(
|
|
table="background_updates",
|
|
values={
|
|
"update_name": "event_resign",
|
|
"progress_json": "{}",
|
|
},
|
|
)
|
|
)
|
|
self.updates.start_doing_background_updates()
|
|
# Ensure the background updates have finished running
|
|
self.wait_for_background_updates()
|
|
|
|
# Get the event from the database again
|
|
new_event = self.get_success(self.store.get_event(body["event_id"]))
|
|
new_key_id = f"{self.hs.signing_key.alg}:{self.hs.signing_key.version}"
|
|
|
|
# Ensure message event is signed with new signing key, and not with the original
|
|
# signing key
|
|
self.assertNotIn(
|
|
old_key_id, new_event.signatures[self.hs.config.server.server_name]
|
|
)
|
|
self.assertIn(
|
|
new_key_id, new_event.signatures[self.hs.config.server.server_name]
|
|
)
|
|
|
|
@override_config({"caches": {"global_factor": 1}, "event_cache_size": "999"})
|
|
def test_old_key_filter(self) -> None:
|
|
"""Test that old_key parameter causes only events whose signature
|
|
verifies against the provided key to be re-signed."""
|
|
|
|
self.wait_for_background_updates()
|
|
|
|
self.register_user("user2", "pass")
|
|
token = self.login("user2", "pass")
|
|
|
|
room_id = self.helper.create_room_as(
|
|
"user2", room_version=RoomVersions.V12.identifier, tok=token
|
|
)
|
|
body = self.helper.send(room_id, body="Test old_key", tok=token)
|
|
|
|
old_signing_key = self.hs.signing_key
|
|
old_key_id = f"{old_signing_key.alg}:{old_signing_key.version}"
|
|
old_verify_key = signedjson.key.get_verify_key(old_signing_key)
|
|
old_key_param = (
|
|
f"{old_verify_key.alg}:{old_verify_key.version} "
|
|
f"{signedjson.key.encode_verify_key_base64(old_verify_key)}"
|
|
)
|
|
|
|
# Generate a new signing key
|
|
self.hs.signing_key = signedjson.key.generate_signing_key("new-test-key-2")
|
|
|
|
# Generate a different key but reuse the same key ID/version, to
|
|
# ensure we're filtering on the actual public key, not just the ID.
|
|
wrong_key = signedjson.key.generate_signing_key(old_signing_key.version)
|
|
wrong_verify_key = signedjson.key.get_verify_key(wrong_key)
|
|
wrong_key_param = (
|
|
f"{old_verify_key.alg}:{old_verify_key.version} "
|
|
f"{signedjson.key.encode_verify_key_base64(wrong_verify_key)}"
|
|
)
|
|
|
|
# Insert BG update with old_key filter pointing to a WRONG key
|
|
self.get_success(
|
|
self.db_pool.simple_insert(
|
|
table="background_updates",
|
|
values={
|
|
"update_name": "event_resign",
|
|
"progress_json": json.dumps({"old_key": wrong_key_param}),
|
|
},
|
|
)
|
|
)
|
|
self.updates.start_doing_background_updates()
|
|
self.wait_for_background_updates()
|
|
|
|
# Event should NOT have been re-signed (wrong key)
|
|
event_after = self.get_success(self.store.get_event(body["event_id"]))
|
|
self.assertIn(
|
|
old_key_id, event_after.signatures[self.hs.config.server.server_name]
|
|
)
|
|
|
|
# Now insert BG update with the CORRECT old key
|
|
self.get_success(
|
|
self.db_pool.simple_insert(
|
|
table="background_updates",
|
|
values={
|
|
"update_name": "event_resign",
|
|
"progress_json": json.dumps({"old_key": old_key_param}),
|
|
},
|
|
)
|
|
)
|
|
self.updates.start_doing_background_updates()
|
|
self.wait_for_background_updates()
|
|
|
|
# Event should now be re-signed
|
|
new_event = self.get_success(self.store.get_event(body["event_id"]))
|
|
new_key_id = f"{self.hs.signing_key.alg}:{self.hs.signing_key.version}"
|
|
self.assertNotIn(
|
|
old_key_id, new_event.signatures[self.hs.config.server.server_name]
|
|
)
|
|
self.assertIn(
|
|
new_key_id, new_event.signatures[self.hs.config.server.server_name]
|
|
)
|