diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-06 09:42:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 09:42:13 +0100 |
| commit | 99d349794943880c96808594584abf956ca00c76 (patch) | |
| tree | 09cc07a8bf01b69a81a8fcf019d189fb16fb2585 | |
| parent | Merge pull request #5353 from matrix-org/rav/verify_key_logging (diff) | |
| parent | Implement room v5 which enforces signing key validity (diff) | |
| download | synapse-99d349794943880c96808594584abf956ca00c76.tar.xz | |
Merge pull request #5354 from matrix-org/rav/server_keys/99-room-v5
Implement room v5 which enforces signing key validity
| -rw-r--r-- | changelog.d/5354.bugfix | 2 | ||||
| -rw-r--r-- | synapse/api/room_versions.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/changelog.d/5354.bugfix b/changelog.d/5354.bugfix new file mode 100644 index 0000000000..0c56032b30 --- /dev/null +++ b/changelog.d/5354.bugfix @@ -0,0 +1,2 @@ +Add a new room version where the timestamps on events are checked against the validity periods on signing keys. + diff --git a/synapse/api/room_versions.py b/synapse/api/room_versions.py index 501cdfb6a4..d644803d38 100644 --- a/synapse/api/room_versions.py +++ b/synapse/api/room_versions.py @@ -82,12 +82,12 @@ class RoomVersions(object): StateResolutionVersions.V2, enforce_key_validity=False, ) - VDH_TEST_KEY_VALIDITY = RoomVersion( - "vdh-test-key-validity", - RoomDisposition.UNSTABLE, + V5 = RoomVersion( + "5", + RoomDisposition.STABLE, EventFormatVersions.V3, StateResolutionVersions.V2, - enforce_key_validity=False, + enforce_key_validity=True, ) @@ -97,6 +97,6 @@ KNOWN_ROOM_VERSIONS = { RoomVersions.V2, RoomVersions.V3, RoomVersions.V4, - RoomVersions.VDH_TEST_KEY_VALIDITY, + RoomVersions.V5, ) } # type: dict[str, RoomVersion] |