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

Commit 99d3497

Browse files
authored
Merge pull request #5354 from matrix-org/rav/server_keys/99-room-v5
Implement room v5 which enforces signing key validity
2 parents 2eb47e5 + d18e4ea commit 99d3497

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

changelog.d/5354.bugfix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Add a new room version where the timestamps on events are checked against the validity periods on signing keys.
2+

synapse/api/room_versions.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ class RoomVersions(object):
8282
StateResolutionVersions.V2,
8383
enforce_key_validity=False,
8484
)
85-
VDH_TEST_KEY_VALIDITY = RoomVersion(
86-
"vdh-test-key-validity",
87-
RoomDisposition.UNSTABLE,
85+
V5 = RoomVersion(
86+
"5",
87+
RoomDisposition.STABLE,
8888
EventFormatVersions.V3,
8989
StateResolutionVersions.V2,
90-
enforce_key_validity=False,
90+
enforce_key_validity=True,
9191
)
9292

9393

@@ -97,6 +97,6 @@ class RoomVersions(object):
9797
RoomVersions.V2,
9898
RoomVersions.V3,
9999
RoomVersions.V4,
100-
RoomVersions.VDH_TEST_KEY_VALIDITY,
100+
RoomVersions.V5,
101101
)
102102
} # type: dict[str, RoomVersion]

0 commit comments

Comments
 (0)