summary refs log tree commit diff
path: root/synapse/handlers/e2e_room_keys.py
diff options
context:
space:
mode:
Diffstat (limited to 'synapse/handlers/e2e_room_keys.py')
-rw-r--r--synapse/handlers/e2e_room_keys.py46
1 files changed, 31 insertions, 15 deletions
diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py
index 78c838a829..15e3beb5ed 100644
--- a/synapse/handlers/e2e_room_keys.py
+++ b/synapse/handlers/e2e_room_keys.py
@@ -20,8 +20,7 @@ from canonicaljson import encode_canonical_json
 from twisted.internet import defer
 
 from synapse.api.errors import SynapseError, CodeMessageException
-from synapse.types import get_domain_from_id
-from synapse.util.logcontext import preserve_fn, make_deferred_yieldable
+from synapse.util.async import Linearizer
 from synapse.util.retryutils import NotRetryingDestination
 
 logger = logging.getLogger(__name__)
@@ -30,6 +29,7 @@ logger = logging.getLogger(__name__)
 class E2eRoomKeysHandler(object):
     def __init__(self, hs):
         self.store = hs.get_datastore()
+        self._upload_linearizer = async.Linearizer("upload_room_keys_lock")
 
     @defer.inlineCallbacks
     def get_room_keys(self, user_id, version, room_id, session_id):
@@ -37,24 +37,40 @@ class E2eRoomKeysHandler(object):
         defer.returnValue(results)
 
     @defer.inlineCallbacks
+    def delete_room_keys(self, user_id, version, room_id, session_id):
+        yield self.store.delete_e2e_room_keys(user_id, version, room_id, session_id)
+
+    @defer.inlineCallbacks
     def upload_room_keys(self, user_id, version, room_keys):
 
         # TODO: Validate the JSON to make sure it has the right keys.
 
-        # go through the room_keys
-        for room_id in room_keys['rooms']:
-            for session_id in room_keys['rooms'][room_id]['sessions']:
-                session = room_keys['rooms'][room_id]['sessions'][session_id]
-
-                # get a lock
+        # XXX: perhaps we should use a finer grained lock here?
+        with (yield self._upload_linearizer.queue(user_id):
 
-                # get the room_key for this particular row
-                yield self.store.get_e2e_room_key()
+            # go through the room_keys
+            for room_id in room_keys['rooms']:
+                for session_id in room_keys['rooms'][room_id]['sessions']:
+                    room_key = room_keys['rooms'][room_id]['sessions'][session_id]
 
-                # check whether we merge or not
-                if()
+                    # get the room_key for this particular row
+                    current_room_key = yield self.store.get_e2e_room_key(
+                        user_id, version, room_id, session_id
+                    )
 
-                # if so, we set it
-                yield self.store.set_e2e_room_key()
+                    # check whether we merge or not. spelling it out with if/elifs rather than
+                    # lots of booleans for legibility.
+                    replace = False
+                    if current_room_key:
+                        if room_key['is_verified'] and not current_room_key['is_verified']:
+                            replace = True
+                        elif room_key['first_message_index'] < current_room_key['first_message_index']:
+                            replace = True
+                        elif room_key['forwarded_count'] < room_key['forwarded_count']:
+                            replace = True
 
-                # release the lock
+                    # if so, we set the new room_key
+                    if replace:
+                        yield self.store.set_e2e_room_key(
+                            user_id, version, room_id, session_id, room_key
+                        )