summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-06-05 10:58:51 +0100
committerRichard van der Hoff <richard@matrix.org>2019-06-05 11:00:47 +0100
commitd18e4ea0d46a9390a75b270fe5f17dc3bc23f29a (patch)
tree5f70ebc9e5574f5d34b048a1ff78a402fbc64a1f /synapse
parentAdd a test room version where we enforce key validity (#5348) (diff)
downloadsynapse-d18e4ea0d46a9390a75b270fe5f17dc3bc23f29a.tar.xz
Implement room v5 which enforces signing key validity
Implements [MSC2077](https://github.com/matrix-org/matrix-doc/pull/2077) and
fixes #5247 and #4364.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/api/room_versions.py10
1 files changed, 5 insertions, 5 deletions
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]