|
@@ -19,14 +19,9 @@ import copy
|
|
|
|
|
|
import mock
|
|
|
|
|
|
-from twisted.internet import defer
|
|
|
+from synapse.api.errors import SynapseError
|
|
|
|
|
|
-import synapse.api.errors
|
|
|
-import synapse.handlers.e2e_room_keys
|
|
|
-import synapse.storage
|
|
|
-from synapse.api import errors
|
|
|
-
|
|
|
-from tests import unittest, utils
|
|
|
+from tests import unittest
|
|
|
|
|
|
# sample room_key data for use in the tests
|
|
|
room_keys = {
|
|
@@ -45,51 +40,39 @@ room_keys = {
|
|
|
}
|
|
|
|
|
|
|
|
|
-class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
- def __init__(self, *args, **kwargs):
|
|
|
- super().__init__(*args, **kwargs)
|
|
|
- self.hs = None # type: synapse.server.HomeServer
|
|
|
- self.handler = None # type: synapse.handlers.e2e_keys.E2eRoomKeysHandler
|
|
|
+class E2eRoomKeysHandlerTestCase(unittest.HomeserverTestCase):
|
|
|
+ def make_homeserver(self, reactor, clock):
|
|
|
+ return self.setup_test_homeserver(replication_layer=mock.Mock())
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
- def setUp(self):
|
|
|
- self.hs = yield utils.setup_test_homeserver(
|
|
|
- self.addCleanup, replication_layer=mock.Mock()
|
|
|
- )
|
|
|
- self.handler = synapse.handlers.e2e_room_keys.E2eRoomKeysHandler(self.hs)
|
|
|
- self.local_user = "@boris:" + self.hs.hostname
|
|
|
+ def prepare(self, reactor, clock, hs):
|
|
|
+ self.handler = hs.get_e2e_room_keys_handler()
|
|
|
+ self.local_user = "@boris:" + hs.hostname
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_get_missing_current_version_info(self):
|
|
|
"""Check that we get a 404 if we ask for info about the current version
|
|
|
if there is no version.
|
|
|
"""
|
|
|
- res = None
|
|
|
- try:
|
|
|
- yield defer.ensureDeferred(self.handler.get_version_info(self.local_user))
|
|
|
- except errors.SynapseError as e:
|
|
|
- res = e.code
|
|
|
+ e = self.get_failure(
|
|
|
+ self.handler.get_version_info(self.local_user), SynapseError
|
|
|
+ )
|
|
|
+ res = e.value.code
|
|
|
self.assertEqual(res, 404)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_get_missing_version_info(self):
|
|
|
"""Check that we get a 404 if we ask for info about a specific version
|
|
|
if it doesn't exist.
|
|
|
"""
|
|
|
- res = None
|
|
|
- try:
|
|
|
- yield defer.ensureDeferred(
|
|
|
- self.handler.get_version_info(self.local_user, "bogus_version")
|
|
|
- )
|
|
|
- except errors.SynapseError as e:
|
|
|
- res = e.code
|
|
|
+ e = self.get_failure(
|
|
|
+ self.handler.get_version_info(self.local_user, "bogus_version"),
|
|
|
+ SynapseError,
|
|
|
+ )
|
|
|
+ res = e.value.code
|
|
|
self.assertEqual(res, 404)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_create_version(self):
|
|
|
"""Check that we can create and then retrieve versions.
|
|
|
"""
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
+ res = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -101,7 +84,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
self.assertEqual(res, "1")
|
|
|
|
|
|
# check we can retrieve it as the current version
|
|
|
- res = yield defer.ensureDeferred(self.handler.get_version_info(self.local_user))
|
|
|
+ res = self.get_success(self.handler.get_version_info(self.local_user))
|
|
|
version_etag = res["etag"]
|
|
|
self.assertIsInstance(version_etag, str)
|
|
|
del res["etag"]
|
|
@@ -116,9 +99,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
|
|
|
# check we can retrieve it as a specific version
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
- self.handler.get_version_info(self.local_user, "1")
|
|
|
- )
|
|
|
+ res = self.get_success(self.handler.get_version_info(self.local_user, "1"))
|
|
|
self.assertEqual(res["etag"], version_etag)
|
|
|
del res["etag"]
|
|
|
self.assertDictEqual(
|
|
@@ -132,7 +113,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
|
|
|
# upload a new one...
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
+ res = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -144,7 +125,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
self.assertEqual(res, "2")
|
|
|
|
|
|
# check we can retrieve it as the current version
|
|
|
- res = yield defer.ensureDeferred(self.handler.get_version_info(self.local_user))
|
|
|
+ res = self.get_success(self.handler.get_version_info(self.local_user))
|
|
|
del res["etag"]
|
|
|
self.assertDictEqual(
|
|
|
res,
|
|
@@ -156,11 +137,10 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
},
|
|
|
)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_update_version(self):
|
|
|
"""Check that we can update versions.
|
|
|
"""
|
|
|
- version = yield defer.ensureDeferred(
|
|
|
+ version = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -171,7 +151,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
self.assertEqual(version, "1")
|
|
|
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
+ res = self.get_success(
|
|
|
self.handler.update_version(
|
|
|
self.local_user,
|
|
|
version,
|
|
@@ -185,7 +165,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
self.assertDictEqual(res, {})
|
|
|
|
|
|
# check we can retrieve it as the current version
|
|
|
- res = yield defer.ensureDeferred(self.handler.get_version_info(self.local_user))
|
|
|
+ res = self.get_success(self.handler.get_version_info(self.local_user))
|
|
|
del res["etag"]
|
|
|
self.assertDictEqual(
|
|
|
res,
|
|
@@ -197,32 +177,28 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
},
|
|
|
)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_update_missing_version(self):
|
|
|
"""Check that we get a 404 on updating nonexistent versions
|
|
|
"""
|
|
|
- res = None
|
|
|
- try:
|
|
|
- yield defer.ensureDeferred(
|
|
|
- self.handler.update_version(
|
|
|
- self.local_user,
|
|
|
- "1",
|
|
|
- {
|
|
|
- "algorithm": "m.megolm_backup.v1",
|
|
|
- "auth_data": "revised_first_version_auth_data",
|
|
|
- "version": "1",
|
|
|
- },
|
|
|
- )
|
|
|
- )
|
|
|
- except errors.SynapseError as e:
|
|
|
- res = e.code
|
|
|
+ e = self.get_failure(
|
|
|
+ self.handler.update_version(
|
|
|
+ self.local_user,
|
|
|
+ "1",
|
|
|
+ {
|
|
|
+ "algorithm": "m.megolm_backup.v1",
|
|
|
+ "auth_data": "revised_first_version_auth_data",
|
|
|
+ "version": "1",
|
|
|
+ },
|
|
|
+ ),
|
|
|
+ SynapseError,
|
|
|
+ )
|
|
|
+ res = e.value.code
|
|
|
self.assertEqual(res, 404)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_update_omitted_version(self):
|
|
|
"""Check that the update succeeds if the version is missing from the body
|
|
|
"""
|
|
|
- version = yield defer.ensureDeferred(
|
|
|
+ version = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -233,7 +209,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
self.assertEqual(version, "1")
|
|
|
|
|
|
- yield defer.ensureDeferred(
|
|
|
+ self.get_success(
|
|
|
self.handler.update_version(
|
|
|
self.local_user,
|
|
|
version,
|
|
@@ -245,7 +221,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
|
|
|
# check we can retrieve it as the current version
|
|
|
- res = yield defer.ensureDeferred(self.handler.get_version_info(self.local_user))
|
|
|
+ res = self.get_success(self.handler.get_version_info(self.local_user))
|
|
|
del res["etag"] # etag is opaque, so don't test its contents
|
|
|
self.assertDictEqual(
|
|
|
res,
|
|
@@ -257,11 +233,10 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
},
|
|
|
)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_update_bad_version(self):
|
|
|
"""Check that we get a 400 if the version in the body doesn't match
|
|
|
"""
|
|
|
- version = yield defer.ensureDeferred(
|
|
|
+ version = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -272,52 +247,41 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
self.assertEqual(version, "1")
|
|
|
|
|
|
- res = None
|
|
|
- try:
|
|
|
- yield defer.ensureDeferred(
|
|
|
- self.handler.update_version(
|
|
|
- self.local_user,
|
|
|
- version,
|
|
|
- {
|
|
|
- "algorithm": "m.megolm_backup.v1",
|
|
|
- "auth_data": "revised_first_version_auth_data",
|
|
|
- "version": "incorrect",
|
|
|
- },
|
|
|
- )
|
|
|
- )
|
|
|
- except errors.SynapseError as e:
|
|
|
- res = e.code
|
|
|
+ e = self.get_failure(
|
|
|
+ self.handler.update_version(
|
|
|
+ self.local_user,
|
|
|
+ version,
|
|
|
+ {
|
|
|
+ "algorithm": "m.megolm_backup.v1",
|
|
|
+ "auth_data": "revised_first_version_auth_data",
|
|
|
+ "version": "incorrect",
|
|
|
+ },
|
|
|
+ ),
|
|
|
+ SynapseError,
|
|
|
+ )
|
|
|
+ res = e.value.code
|
|
|
self.assertEqual(res, 400)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_delete_missing_version(self):
|
|
|
"""Check that we get a 404 on deleting nonexistent versions
|
|
|
"""
|
|
|
- res = None
|
|
|
- try:
|
|
|
- yield defer.ensureDeferred(
|
|
|
- self.handler.delete_version(self.local_user, "1")
|
|
|
- )
|
|
|
- except errors.SynapseError as e:
|
|
|
- res = e.code
|
|
|
+ e = self.get_failure(
|
|
|
+ self.handler.delete_version(self.local_user, "1"), SynapseError
|
|
|
+ )
|
|
|
+ res = e.value.code
|
|
|
self.assertEqual(res, 404)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_delete_missing_current_version(self):
|
|
|
"""Check that we get a 404 on deleting nonexistent current version
|
|
|
"""
|
|
|
- res = None
|
|
|
- try:
|
|
|
- yield defer.ensureDeferred(self.handler.delete_version(self.local_user))
|
|
|
- except errors.SynapseError as e:
|
|
|
- res = e.code
|
|
|
+ e = self.get_failure(self.handler.delete_version(self.local_user), SynapseError)
|
|
|
+ res = e.value.code
|
|
|
self.assertEqual(res, 404)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_delete_version(self):
|
|
|
"""Check that we can create and then delete versions.
|
|
|
"""
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
+ res = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -329,36 +293,28 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
self.assertEqual(res, "1")
|
|
|
|
|
|
# check we can delete it
|
|
|
- yield defer.ensureDeferred(self.handler.delete_version(self.local_user, "1"))
|
|
|
+ self.get_success(self.handler.delete_version(self.local_user, "1"))
|
|
|
|
|
|
# check that it's gone
|
|
|
- res = None
|
|
|
- try:
|
|
|
- yield defer.ensureDeferred(
|
|
|
- self.handler.get_version_info(self.local_user, "1")
|
|
|
- )
|
|
|
- except errors.SynapseError as e:
|
|
|
- res = e.code
|
|
|
+ e = self.get_failure(
|
|
|
+ self.handler.get_version_info(self.local_user, "1"), SynapseError
|
|
|
+ )
|
|
|
+ res = e.value.code
|
|
|
self.assertEqual(res, 404)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_get_missing_backup(self):
|
|
|
"""Check that we get a 404 on querying missing backup
|
|
|
"""
|
|
|
- res = None
|
|
|
- try:
|
|
|
- yield defer.ensureDeferred(
|
|
|
- self.handler.get_room_keys(self.local_user, "bogus_version")
|
|
|
- )
|
|
|
- except errors.SynapseError as e:
|
|
|
- res = e.code
|
|
|
+ e = self.get_failure(
|
|
|
+ self.handler.get_room_keys(self.local_user, "bogus_version"), SynapseError
|
|
|
+ )
|
|
|
+ res = e.value.code
|
|
|
self.assertEqual(res, 404)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_get_missing_room_keys(self):
|
|
|
"""Check we get an empty response from an empty backup
|
|
|
"""
|
|
|
- version = yield defer.ensureDeferred(
|
|
|
+ version = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -369,33 +325,27 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
self.assertEqual(version, "1")
|
|
|
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
- self.handler.get_room_keys(self.local_user, version)
|
|
|
- )
|
|
|
+ res = self.get_success(self.handler.get_room_keys(self.local_user, version))
|
|
|
self.assertDictEqual(res, {"rooms": {}})
|
|
|
|
|
|
# TODO: test the locking semantics when uploading room_keys,
|
|
|
# although this is probably best done in sytest
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_upload_room_keys_no_versions(self):
|
|
|
"""Check that we get a 404 on uploading keys when no versions are defined
|
|
|
"""
|
|
|
- res = None
|
|
|
- try:
|
|
|
- yield defer.ensureDeferred(
|
|
|
- self.handler.upload_room_keys(self.local_user, "no_version", room_keys)
|
|
|
- )
|
|
|
- except errors.SynapseError as e:
|
|
|
- res = e.code
|
|
|
+ e = self.get_failure(
|
|
|
+ self.handler.upload_room_keys(self.local_user, "no_version", room_keys),
|
|
|
+ SynapseError,
|
|
|
+ )
|
|
|
+ res = e.value.code
|
|
|
self.assertEqual(res, 404)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_upload_room_keys_bogus_version(self):
|
|
|
"""Check that we get a 404 on uploading keys when an nonexistent version
|
|
|
is specified
|
|
|
"""
|
|
|
- version = yield defer.ensureDeferred(
|
|
|
+ version = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -406,22 +356,17 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
self.assertEqual(version, "1")
|
|
|
|
|
|
- res = None
|
|
|
- try:
|
|
|
- yield defer.ensureDeferred(
|
|
|
- self.handler.upload_room_keys(
|
|
|
- self.local_user, "bogus_version", room_keys
|
|
|
- )
|
|
|
- )
|
|
|
- except errors.SynapseError as e:
|
|
|
- res = e.code
|
|
|
+ e = self.get_failure(
|
|
|
+ self.handler.upload_room_keys(self.local_user, "bogus_version", room_keys),
|
|
|
+ SynapseError,
|
|
|
+ )
|
|
|
+ res = e.value.code
|
|
|
self.assertEqual(res, 404)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_upload_room_keys_wrong_version(self):
|
|
|
"""Check that we get a 403 on uploading keys for an old version
|
|
|
"""
|
|
|
- version = yield defer.ensureDeferred(
|
|
|
+ version = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -432,7 +377,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
self.assertEqual(version, "1")
|
|
|
|
|
|
- version = yield defer.ensureDeferred(
|
|
|
+ version = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -443,20 +388,16 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
self.assertEqual(version, "2")
|
|
|
|
|
|
- res = None
|
|
|
- try:
|
|
|
- yield defer.ensureDeferred(
|
|
|
- self.handler.upload_room_keys(self.local_user, "1", room_keys)
|
|
|
- )
|
|
|
- except errors.SynapseError as e:
|
|
|
- res = e.code
|
|
|
+ e = self.get_failure(
|
|
|
+ self.handler.upload_room_keys(self.local_user, "1", room_keys), SynapseError
|
|
|
+ )
|
|
|
+ res = e.value.code
|
|
|
self.assertEqual(res, 403)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_upload_room_keys_insert(self):
|
|
|
"""Check that we can insert and retrieve keys for a session
|
|
|
"""
|
|
|
- version = yield defer.ensureDeferred(
|
|
|
+ version = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -467,17 +408,15 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
self.assertEqual(version, "1")
|
|
|
|
|
|
- yield defer.ensureDeferred(
|
|
|
+ self.get_success(
|
|
|
self.handler.upload_room_keys(self.local_user, version, room_keys)
|
|
|
)
|
|
|
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
- self.handler.get_room_keys(self.local_user, version)
|
|
|
- )
|
|
|
+ res = self.get_success(self.handler.get_room_keys(self.local_user, version))
|
|
|
self.assertDictEqual(res, room_keys)
|
|
|
|
|
|
# check getting room_keys for a given room
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
+ res = self.get_success(
|
|
|
self.handler.get_room_keys(
|
|
|
self.local_user, version, room_id="!abc:matrix.org"
|
|
|
)
|
|
@@ -485,18 +424,17 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
self.assertDictEqual(res, room_keys)
|
|
|
|
|
|
# check getting room_keys for a given session_id
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
+ res = self.get_success(
|
|
|
self.handler.get_room_keys(
|
|
|
self.local_user, version, room_id="!abc:matrix.org", session_id="c0ff33"
|
|
|
)
|
|
|
)
|
|
|
self.assertDictEqual(res, room_keys)
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_upload_room_keys_merge(self):
|
|
|
"""Check that we can upload a new room_key for an existing session and
|
|
|
have it correctly merged"""
|
|
|
- version = yield defer.ensureDeferred(
|
|
|
+ version = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -507,12 +445,12 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
)
|
|
|
self.assertEqual(version, "1")
|
|
|
|
|
|
- yield defer.ensureDeferred(
|
|
|
+ self.get_success(
|
|
|
self.handler.upload_room_keys(self.local_user, version, room_keys)
|
|
|
)
|
|
|
|
|
|
# get the etag to compare to future versions
|
|
|
- res = yield defer.ensureDeferred(self.handler.get_version_info(self.local_user))
|
|
|
+ res = self.get_success(self.handler.get_version_info(self.local_user))
|
|
|
backup_etag = res["etag"]
|
|
|
self.assertEqual(res["count"], 1)
|
|
|
|
|
@@ -522,37 +460,33 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
# test that increasing the message_index doesn't replace the existing session
|
|
|
new_room_key["first_message_index"] = 2
|
|
|
new_room_key["session_data"] = "new"
|
|
|
- yield defer.ensureDeferred(
|
|
|
+ self.get_success(
|
|
|
self.handler.upload_room_keys(self.local_user, version, new_room_keys)
|
|
|
)
|
|
|
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
- self.handler.get_room_keys(self.local_user, version)
|
|
|
- )
|
|
|
+ res = self.get_success(self.handler.get_room_keys(self.local_user, version))
|
|
|
self.assertEqual(
|
|
|
res["rooms"]["!abc:matrix.org"]["sessions"]["c0ff33"]["session_data"],
|
|
|
"SSBBTSBBIEZJU0gK",
|
|
|
)
|
|
|
|
|
|
# the etag should be the same since the session did not change
|
|
|
- res = yield defer.ensureDeferred(self.handler.get_version_info(self.local_user))
|
|
|
+ res = self.get_success(self.handler.get_version_info(self.local_user))
|
|
|
self.assertEqual(res["etag"], backup_etag)
|
|
|
|
|
|
# test that marking the session as verified however /does/ replace it
|
|
|
new_room_key["is_verified"] = True
|
|
|
- yield defer.ensureDeferred(
|
|
|
+ self.get_success(
|
|
|
self.handler.upload_room_keys(self.local_user, version, new_room_keys)
|
|
|
)
|
|
|
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
- self.handler.get_room_keys(self.local_user, version)
|
|
|
- )
|
|
|
+ res = self.get_success(self.handler.get_room_keys(self.local_user, version))
|
|
|
self.assertEqual(
|
|
|
res["rooms"]["!abc:matrix.org"]["sessions"]["c0ff33"]["session_data"], "new"
|
|
|
)
|
|
|
|
|
|
# the etag should NOT be equal now, since the key changed
|
|
|
- res = yield defer.ensureDeferred(self.handler.get_version_info(self.local_user))
|
|
|
+ res = self.get_success(self.handler.get_version_info(self.local_user))
|
|
|
self.assertNotEqual(res["etag"], backup_etag)
|
|
|
backup_etag = res["etag"]
|
|
|
|
|
@@ -560,28 +494,25 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
# with a lower forwarding count
|
|
|
new_room_key["forwarded_count"] = 2
|
|
|
new_room_key["session_data"] = "other"
|
|
|
- yield defer.ensureDeferred(
|
|
|
+ self.get_success(
|
|
|
self.handler.upload_room_keys(self.local_user, version, new_room_keys)
|
|
|
)
|
|
|
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
- self.handler.get_room_keys(self.local_user, version)
|
|
|
- )
|
|
|
+ res = self.get_success(self.handler.get_room_keys(self.local_user, version))
|
|
|
self.assertEqual(
|
|
|
res["rooms"]["!abc:matrix.org"]["sessions"]["c0ff33"]["session_data"], "new"
|
|
|
)
|
|
|
|
|
|
# the etag should be the same since the session did not change
|
|
|
- res = yield defer.ensureDeferred(self.handler.get_version_info(self.local_user))
|
|
|
+ res = self.get_success(self.handler.get_version_info(self.local_user))
|
|
|
self.assertEqual(res["etag"], backup_etag)
|
|
|
|
|
|
# TODO: check edge cases as well as the common variations here
|
|
|
|
|
|
- @defer.inlineCallbacks
|
|
|
def test_delete_room_keys(self):
|
|
|
"""Check that we can insert and delete keys for a session
|
|
|
"""
|
|
|
- version = yield defer.ensureDeferred(
|
|
|
+ version = self.get_success(
|
|
|
self.handler.create_version(
|
|
|
self.local_user,
|
|
|
{
|
|
@@ -593,13 +524,11 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
self.assertEqual(version, "1")
|
|
|
|
|
|
# check for bulk-delete
|
|
|
- yield defer.ensureDeferred(
|
|
|
+ self.get_success(
|
|
|
self.handler.upload_room_keys(self.local_user, version, room_keys)
|
|
|
)
|
|
|
- yield defer.ensureDeferred(
|
|
|
- self.handler.delete_room_keys(self.local_user, version)
|
|
|
- )
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
+ self.get_success(self.handler.delete_room_keys(self.local_user, version))
|
|
|
+ res = self.get_success(
|
|
|
self.handler.get_room_keys(
|
|
|
self.local_user, version, room_id="!abc:matrix.org", session_id="c0ff33"
|
|
|
)
|
|
@@ -607,15 +536,15 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
self.assertDictEqual(res, {"rooms": {}})
|
|
|
|
|
|
# check for bulk-delete per room
|
|
|
- yield defer.ensureDeferred(
|
|
|
+ self.get_success(
|
|
|
self.handler.upload_room_keys(self.local_user, version, room_keys)
|
|
|
)
|
|
|
- yield defer.ensureDeferred(
|
|
|
+ self.get_success(
|
|
|
self.handler.delete_room_keys(
|
|
|
self.local_user, version, room_id="!abc:matrix.org"
|
|
|
)
|
|
|
)
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
+ res = self.get_success(
|
|
|
self.handler.get_room_keys(
|
|
|
self.local_user, version, room_id="!abc:matrix.org", session_id="c0ff33"
|
|
|
)
|
|
@@ -623,15 +552,15 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
|
|
|
self.assertDictEqual(res, {"rooms": {}})
|
|
|
|
|
|
# check for bulk-delete per session
|
|
|
- yield defer.ensureDeferred(
|
|
|
+ self.get_success(
|
|
|
self.handler.upload_room_keys(self.local_user, version, room_keys)
|
|
|
)
|
|
|
- yield defer.ensureDeferred(
|
|
|
+ self.get_success(
|
|
|
self.handler.delete_room_keys(
|
|
|
self.local_user, version, room_id="!abc:matrix.org", session_id="c0ff33"
|
|
|
)
|
|
|
)
|
|
|
- res = yield defer.ensureDeferred(
|
|
|
+ res = self.get_success(
|
|
|
self.handler.get_room_keys(
|
|
|
self.local_user, version, room_id="!abc:matrix.org", session_id="c0ff33"
|
|
|
)
|