diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py
index 93f4ad5194..4333ca610c 100644
--- a/synapse/handlers/e2e_room_keys.py
+++ b/synapse/handlers/e2e_room_keys.py
@@ -17,7 +17,7 @@ import logging
from twisted.internet import defer
-from synapse.api.errors import StoreError
+from synapse.api.errors import StoreError, SynapseError, RoomKeysVersionError
from synapse.util.async import Linearizer
logger = logging.getLogger(__name__)
@@ -30,10 +30,13 @@ class E2eRoomKeysHandler(object):
@defer.inlineCallbacks
def get_room_keys(self, user_id, version, room_id, session_id):
- results = yield self.store.get_e2e_room_keys(
- user_id, version, room_id, session_id
- )
- defer.returnValue(results)
+ # we deliberately take the lock to get keys so that changing the version
+ # works atomically
+ with (yield self._upload_linearizer.queue(user_id)):
+ results = yield self.store.get_e2e_room_keys(
+ user_id, version, room_id, session_id
+ )
+ defer.returnValue(results)
@defer.inlineCallbacks
def delete_room_keys(self, user_id, version, room_id, session_id):
@@ -44,6 +47,16 @@ class E2eRoomKeysHandler(object):
# TODO: Validate the JSON to make sure it has the right keys.
+ # Check that the version we're trying to upload is the current version
+ try:
+ version_info = yield self.get_version_info(user_id, version)
+ except StoreError as e:
+ if e.code == 404:
+ raise SynapseError(404, "Version '%d' not found" % (version,))
+
+ if version_info.version != version:
+ raise RoomKeysVersionError(current_version=version_info.version)
+
# XXX: perhaps we should use a finer grained lock here?
with (yield self._upload_linearizer.queue(user_id)):
@@ -91,3 +104,27 @@ class E2eRoomKeysHandler(object):
yield self.store.set_e2e_room_key(
user_id, version, room_id, session_id, room_key
)
+
+ @defer.inlineCallbacks
+ def create_version(self, user_id, version, version_info):
+
+ # TODO: Validate the JSON to make sure it has the right keys.
+
+ # lock everyone out until we've switched version
+ with (yield self._upload_linearizer.queue(user_id)):
+ yield self.store.create_version(
+ user_id, version, version_info
+ )
+
+ @defer.inlineCallbacks
+ def get_version_info(self, user_id, version):
+ with (yield self._upload_linearizer.queue(user_id)):
+ results = yield self.store.get_e2e_room_key_version(
+ user_id, version
+ )
+ defer.returnValue(results)
+
+ @defer.inlineCallbacks
+ def delete_version(self, user_id, version):
+ with (yield self._upload_linearizer.queue(user_id)):
+ yield self.store.delete_e2e_room_key_version(user_id, version)
|
