Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix from_server buglet in get_keys_from_perspectives 

make sure we store the name of the server the keys came from, rather than the
origin server, after doing a fetch-from-perspectives.
This commit is contained in:
Richard van der Hoff 2019-04-03 16:21:12 +01:00
parent 7fc1e17f4c
commit 7d2a0c848e
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5024.misc Normal file
View File

@ -0,0 +1 @@
Store the notary server name correctly in server_keys_json.

2
synapse/crypto/keyring.py
View File

@ -652,7 +652,7 @@ class Keyring(object):
self.store.store_server_keys_json, self.store.store_server_keys_json,
server_name=server_name, server_name=server_name,
key_id=key_id, key_id=key_id,
from_server=server_name, from_server=from_server,
ts_now_ms=time_now_ms, ts_now_ms=time_now_ms,
ts_expires_ms=ts_valid_until_ms, ts_expires_ms=ts_valid_until_ms,
key_json_bytes=signed_key_json_bytes, key_json_bytes=signed_key_json_bytes,

1
tests/crypto/test_keyring.py
View File

@ -324,6 +324,7 @@ class KeyringTestCase(unittest.HomeserverTestCase):
self.assertEqual(len(res), 1) self.assertEqual(len(res), 1)
res = res[0] res = res[0]
self.assertEqual(res["key_id"], testverifykey_id) self.assertEqual(res["key_id"], testverifykey_id)
self.assertEqual(res["from_server"], self.mock_perspective_server.server_name)
self.assertEqual(res["ts_added_ms"], self.reactor.seconds() * 1000) self.assertEqual(res["ts_added_ms"], self.reactor.seconds() * 1000)
self.assertEqual(res["ts_valid_until_ms"], VALID_UNTIL_TS) self.assertEqual(res["ts_valid_until_ms"], VALID_UNTIL_TS)