Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add rooms.room_version column #6729

Merged
merged 13 commits into from
Jan 27, 2020
Merged

Add rooms.room_version column #6729

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7b6be4b
Have `make_membership_event` return room version
erikjohnston Jan 17, 2020
f01d0d5
Check room_version from make_join matches returned state.
erikjohnston Jan 17, 2020
a42b675
Use RoomVersion consistently throughout room upgrade
erikjohnston Jan 17, 2020
963237f
Add rooms.room_version column and populate it in store_room
erikjohnston Jan 17, 2020
e7618af
Read room version from rooms table.
erikjohnston Jan 17, 2020
0bb025a
Newsfile
erikjohnston Jan 17, 2020
892bab9
Add background update
erikjohnston Jan 17, 2020
70be703
Correctly raise exception if unknown room version
erikjohnston Jan 21, 2020
ced73b3
Add comment
erikjohnston Jan 21, 2020
53a75fa
Use explicit is not None
erikjohnston Jan 21, 2020
e825fd0
Add comments about paranoia
erikjohnston Jan 21, 2020
1474a49
Correctly handle and document UnsupportedRoomVersionError
erikjohnston Jan 27, 2020
126599e
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ro…
erikjohnston Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
StoreError,
SynapseError,
)
from synapse.api.room_versions import KNOWN_ROOM_VERSIONS, RoomVersions
from synapse.api.room_versions import KNOWN_ROOM_VERSIONS, RoomVersion, RoomVersions
from synapse.crypto.event_signing import compute_event_signature
from synapse.event_auth import auth_types_for_event
from synapse.events import EventBase, room_version_to_event_format
Expand Down Expand Up @@ -1242,7 +1242,9 @@ def do_invite_join(self, target_hosts, room_id, joinee, content):
# FIXME
pass

yield self._persist_auth_tree(origin, auth_chain, state, event)
yield self._persist_auth_tree(
origin, auth_chain, state, event, room_version
)

# Check whether this room is the result of an upgrade of a room we already know
# about. If so, migrate over user information
Expand Down Expand Up @@ -1816,7 +1818,14 @@ def prep(ev_info: _NewEventInfo):
)

@defer.inlineCallbacks
def _persist_auth_tree(self, origin, auth_events, state, event):
def _persist_auth_tree(
self,
origin: str,
auth_events: List[EventBase],
state: List[EventBase],
event: EventBase,
room_version: RoomVersion,
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved
):
"""Checks the auth chain is valid (and passes auth checks) for the
state and event. Then persists the auth chain and state atomically.
Persists the event separately. Notifies about the persisted events
Expand All @@ -1825,10 +1834,10 @@ def _persist_auth_tree(self, origin, auth_events, state, event):
Will attempt to fetch missing auth events.

Args:
origin (str): Where the events came from
auth_events (list)
state (list)
event (Event)
origin: Where the events came from
auth_events
state
event

Returns:
Deferred
Expand All @@ -1854,10 +1863,13 @@ def _persist_auth_tree(self, origin, auth_events, state, event):
# invalid, and it would fail auth checks anyway.
raise SynapseError(400, "No create event in state")

room_version = create_event.content.get(
room_version_id = create_event.content.get(
"room_version", RoomVersions.V1.identifier
)

if room_version.identifier != room_version_id:
raise SynapseError(400, "Room version mismatch")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure that 400 is the right response code when the remote server lies to us, but 🤷‍♂️

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the closest error code to "please bugger off and never sully our doors with that request again" that I know of :)


missing_auth_events = set()
for e in itertools.chain(auth_events, state, [event]):
for e_id in e.auth_event_ids():
Expand Down