mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-28 13:11:56 +00:00
![Eric Eastwood](/assets/img/avatar_default.png)
* Make historical messages available to federated servers Part of MSC2716: https://github.com/matrix-org/matrix-doc/pull/2716 Follow-up to https://github.com/matrix-org/synapse/pull/9247 * Debug message not available on federation * Add base starting insertion point when no chunk ID is provided * Fix messages from multiple senders in historical chunk Follow-up to https://github.com/matrix-org/synapse/pull/9247 Part of MSC2716: https://github.com/matrix-org/matrix-doc/pull/2716 --- Previously, Synapse would throw a 403, `Cannot force another user to join.`, because we were trying to use `?user_id` from a single virtual user which did not match with messages from other users in the chunk. * Remove debug lines * Messing with selecting insertion event extremeties * Move db schema change to new version * Add more better comments * Make a fake requester with just what we need See https://github.com/matrix-org/synapse/pull/10276#discussion_r660999080 * Store insertion events in table * Make base insertion event float off on its own See https://github.com/matrix-org/synapse/pull/10250#issuecomment-875711889 Conflicts: synapse/rest/client/v1/room.py * Validate that the app service can actually control the given user See https://github.com/matrix-org/synapse/pull/10276#issuecomment-876316455 Conflicts: synapse/rest/client/v1/room.py * Add some better comments on what we're trying to check for * Continue debugging * Share validation logic * Add inserted historical messages to /backfill response * Remove debug sql queries * Some marker event implemntation trials * Clean up PR * Rename insertion_event_id to just event_id * Add some better sql comments * More accurate description * Add changelog * Make it clear what MSC the change is part of * Add more detail on which insertion event came through * Address review and improve sql queries * Only use event_id as unique constraint * Fix test case where insertion event is already in the normal DAG * Remove debug changes * Switch to chunk events so we can auth via power_levels Previously, we were using `content.chunk_id` to connect one chunk to another. But these events can be from any `sender` and we can't tell who should be able to send historical events. We know we only want the application service to do it but these events have the sender of a real historical message, not the application service user ID as the sender. Other federated homeservers also have no indicator which senders are an application service on the originating homeserver. So we want to auth all of the MSC2716 events via power_levels and have them be sent by the application service with proper PL levels in the room. * Switch to chunk events for federation * Add unstable room version to support new historical PL * Fix federated events being rejected for no state_groups Add fix from https://github.com/matrix-org/synapse/pull/10439 until it merges. * Only connect base insertion event to prev_event_ids Per discussion with @erikjohnston, https://matrix.to/#/!UytJQHLQYfvYWsGrGY:jki.re/$12bTUiObDFdHLAYtT7E-BvYRp3k_xv8w0dUQHibasJk?via=jki.re&via=matrix.org * Make it possible to get the room_version with txn * Allow but ignore historical events in unsupported room version See https://github.com/matrix-org/synapse/pull/10245#discussion_r675592489 We can't reject historical events on unsupported room versions because homeservers without knowledge of MSC2716 or the new room version don't reject historical events either. Since we can't rely on the auth check here to stop historical events on unsupported room versions, I've added some additional checks in the processing/persisting code (`synapse/storage/databases/main/events.py` -> `_handle_insertion_event` and `_handle_chunk_event`). I've had to do some refactoring so there is method to fetch the room version by `txn`. * Move to unique index syntax See https://github.com/matrix-org/synapse/pull/10245#discussion_r675638509 * High-level document how the insertion->chunk lookup works * Remove create_event fallback for room_versions See https://github.com/matrix-org/synapse/pull/10245/files#r677641879 * Use updated method name
274 lines
8.5 KiB
Python
274 lines
8.5 KiB
Python
# Copyright 2019 New Vector Ltd
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
from typing import Callable, Dict, Optional
|
|
|
|
import attr
|
|
|
|
|
|
class EventFormatVersions:
|
|
"""This is an internal enum for tracking the version of the event format,
|
|
independently from the room version.
|
|
"""
|
|
|
|
V1 = 1 # $id:server event id format
|
|
V2 = 2 # MSC1659-style $hash event id format: introduced for room v3
|
|
V3 = 3 # MSC1884-style $hash format: introduced for room v4
|
|
|
|
|
|
KNOWN_EVENT_FORMAT_VERSIONS = {
|
|
EventFormatVersions.V1,
|
|
EventFormatVersions.V2,
|
|
EventFormatVersions.V3,
|
|
}
|
|
|
|
|
|
class StateResolutionVersions:
|
|
"""Enum to identify the state resolution algorithms"""
|
|
|
|
V1 = 1 # room v1 state res
|
|
V2 = 2 # MSC1442 state res: room v2 and later
|
|
|
|
|
|
class RoomDisposition:
|
|
STABLE = "stable"
|
|
UNSTABLE = "unstable"
|
|
|
|
|
|
@attr.s(slots=True, frozen=True)
|
|
class RoomVersion:
|
|
"""An object which describes the unique attributes of a room version."""
|
|
|
|
identifier = attr.ib(type=str) # the identifier for this version
|
|
disposition = attr.ib(type=str) # one of the RoomDispositions
|
|
event_format = attr.ib(type=int) # one of the EventFormatVersions
|
|
state_res = attr.ib(type=int) # one of the StateResolutionVersions
|
|
enforce_key_validity = attr.ib(type=bool)
|
|
|
|
# Before MSC2432, m.room.aliases had special auth rules and redaction rules
|
|
special_case_aliases_auth = attr.ib(type=bool)
|
|
# Strictly enforce canonicaljson, do not allow:
|
|
# * Integers outside the range of [-2 ^ 53 + 1, 2 ^ 53 - 1]
|
|
# * Floats
|
|
# * NaN, Infinity, -Infinity
|
|
strict_canonicaljson = attr.ib(type=bool)
|
|
# MSC2209: Check 'notifications' key while verifying
|
|
# m.room.power_levels auth rules.
|
|
limit_notifications_power_levels = attr.ib(type=bool)
|
|
# MSC2174/MSC2176: Apply updated redaction rules algorithm.
|
|
msc2176_redaction_rules = attr.ib(type=bool)
|
|
# MSC3083: Support the 'restricted' join_rule.
|
|
msc3083_join_rules = attr.ib(type=bool)
|
|
# MSC2403: Allows join_rules to be set to 'knock', changes auth rules to allow sending
|
|
# m.room.membership event with membership 'knock'.
|
|
msc2403_knocking = attr.ib(type=bool)
|
|
# MSC2716: Adds m.room.power_levels -> content.historical field to control
|
|
# whether "insertion", "chunk", "marker" events can be sent
|
|
msc2716_historical = attr.ib(type=bool)
|
|
|
|
|
|
class RoomVersions:
|
|
V1 = RoomVersion(
|
|
"1",
|
|
RoomDisposition.STABLE,
|
|
EventFormatVersions.V1,
|
|
StateResolutionVersions.V1,
|
|
enforce_key_validity=False,
|
|
special_case_aliases_auth=True,
|
|
strict_canonicaljson=False,
|
|
limit_notifications_power_levels=False,
|
|
msc2176_redaction_rules=False,
|
|
msc3083_join_rules=False,
|
|
msc2403_knocking=False,
|
|
msc2716_historical=False,
|
|
)
|
|
V2 = RoomVersion(
|
|
"2",
|
|
RoomDisposition.STABLE,
|
|
EventFormatVersions.V1,
|
|
StateResolutionVersions.V2,
|
|
enforce_key_validity=False,
|
|
special_case_aliases_auth=True,
|
|
strict_canonicaljson=False,
|
|
limit_notifications_power_levels=False,
|
|
msc2176_redaction_rules=False,
|
|
msc3083_join_rules=False,
|
|
msc2403_knocking=False,
|
|
msc2716_historical=False,
|
|
)
|
|
V3 = RoomVersion(
|
|
"3",
|
|
RoomDisposition.STABLE,
|
|
EventFormatVersions.V2,
|
|
StateResolutionVersions.V2,
|
|
enforce_key_validity=False,
|
|
special_case_aliases_auth=True,
|
|
strict_canonicaljson=False,
|
|
limit_notifications_power_levels=False,
|
|
msc2176_redaction_rules=False,
|
|
msc3083_join_rules=False,
|
|
msc2403_knocking=False,
|
|
msc2716_historical=False,
|
|
)
|
|
V4 = RoomVersion(
|
|
"4",
|
|
RoomDisposition.STABLE,
|
|
EventFormatVersions.V3,
|
|
StateResolutionVersions.V2,
|
|
enforce_key_validity=False,
|
|
special_case_aliases_auth=True,
|
|
strict_canonicaljson=False,
|
|
limit_notifications_power_levels=False,
|
|
msc2176_redaction_rules=False,
|
|
msc3083_join_rules=False,
|
|
msc2403_knocking=False,
|
|
msc2716_historical=False,
|
|
)
|
|
V5 = RoomVersion(
|
|
"5",
|
|
RoomDisposition.STABLE,
|
|
EventFormatVersions.V3,
|
|
StateResolutionVersions.V2,
|
|
enforce_key_validity=True,
|
|
special_case_aliases_auth=True,
|
|
strict_canonicaljson=False,
|
|
limit_notifications_power_levels=False,
|
|
msc2176_redaction_rules=False,
|
|
msc3083_join_rules=False,
|
|
msc2403_knocking=False,
|
|
msc2716_historical=False,
|
|
)
|
|
V6 = RoomVersion(
|
|
"6",
|
|
RoomDisposition.STABLE,
|
|
EventFormatVersions.V3,
|
|
StateResolutionVersions.V2,
|
|
enforce_key_validity=True,
|
|
special_case_aliases_auth=False,
|
|
strict_canonicaljson=True,
|
|
limit_notifications_power_levels=True,
|
|
msc2176_redaction_rules=False,
|
|
msc3083_join_rules=False,
|
|
msc2403_knocking=False,
|
|
msc2716_historical=False,
|
|
)
|
|
MSC2176 = RoomVersion(
|
|
"org.matrix.msc2176",
|
|
RoomDisposition.UNSTABLE,
|
|
EventFormatVersions.V3,
|
|
StateResolutionVersions.V2,
|
|
enforce_key_validity=True,
|
|
special_case_aliases_auth=False,
|
|
strict_canonicaljson=True,
|
|
limit_notifications_power_levels=True,
|
|
msc2176_redaction_rules=True,
|
|
msc3083_join_rules=False,
|
|
msc2403_knocking=False,
|
|
msc2716_historical=False,
|
|
)
|
|
MSC3083 = RoomVersion(
|
|
"org.matrix.msc3083.v2",
|
|
RoomDisposition.UNSTABLE,
|
|
EventFormatVersions.V3,
|
|
StateResolutionVersions.V2,
|
|
enforce_key_validity=True,
|
|
special_case_aliases_auth=False,
|
|
strict_canonicaljson=True,
|
|
limit_notifications_power_levels=True,
|
|
msc2176_redaction_rules=False,
|
|
msc3083_join_rules=True,
|
|
msc2403_knocking=False,
|
|
msc2716_historical=False,
|
|
)
|
|
V7 = RoomVersion(
|
|
"7",
|
|
RoomDisposition.STABLE,
|
|
EventFormatVersions.V3,
|
|
StateResolutionVersions.V2,
|
|
enforce_key_validity=True,
|
|
special_case_aliases_auth=False,
|
|
strict_canonicaljson=True,
|
|
limit_notifications_power_levels=True,
|
|
msc2176_redaction_rules=False,
|
|
msc3083_join_rules=False,
|
|
msc2403_knocking=True,
|
|
msc2716_historical=False,
|
|
)
|
|
MSC2716 = RoomVersion(
|
|
"org.matrix.msc2716",
|
|
RoomDisposition.STABLE,
|
|
EventFormatVersions.V3,
|
|
StateResolutionVersions.V2,
|
|
enforce_key_validity=True,
|
|
special_case_aliases_auth=False,
|
|
strict_canonicaljson=True,
|
|
limit_notifications_power_levels=True,
|
|
msc2176_redaction_rules=False,
|
|
msc3083_join_rules=False,
|
|
msc2403_knocking=True,
|
|
msc2716_historical=True,
|
|
)
|
|
|
|
|
|
KNOWN_ROOM_VERSIONS: Dict[str, RoomVersion] = {
|
|
v.identifier: v
|
|
for v in (
|
|
RoomVersions.V1,
|
|
RoomVersions.V2,
|
|
RoomVersions.V3,
|
|
RoomVersions.V4,
|
|
RoomVersions.V5,
|
|
RoomVersions.V6,
|
|
RoomVersions.MSC2176,
|
|
RoomVersions.MSC3083,
|
|
RoomVersions.V7,
|
|
RoomVersions.MSC2716,
|
|
)
|
|
}
|
|
|
|
|
|
@attr.s(slots=True, frozen=True, auto_attribs=True)
|
|
class RoomVersionCapability:
|
|
"""An object which describes the unique attributes of a room version."""
|
|
|
|
identifier: str # the identifier for this capability
|
|
preferred_version: Optional[RoomVersion]
|
|
support_check_lambda: Callable[[RoomVersion], bool]
|
|
|
|
|
|
MSC3244_CAPABILITIES = {
|
|
cap.identifier: {
|
|
"preferred": cap.preferred_version.identifier
|
|
if cap.preferred_version is not None
|
|
else None,
|
|
"support": [
|
|
v.identifier
|
|
for v in KNOWN_ROOM_VERSIONS.values()
|
|
if cap.support_check_lambda(v)
|
|
],
|
|
}
|
|
for cap in (
|
|
RoomVersionCapability(
|
|
"knock",
|
|
RoomVersions.V7,
|
|
lambda room_version: room_version.msc2403_knocking,
|
|
),
|
|
RoomVersionCapability(
|
|
"restricted",
|
|
None,
|
|
lambda room_version: room_version.msc3083_join_rules,
|
|
),
|
|
)
|
|
}
|