mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-26 19:47:05 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeys

Browse source 
Fix from_server buglet in get_keys_from_perspectives
This commit is contained in:
Richard van der Hoff 2019-04-08 15:40:37 +01:00 committed by GitHub
commit 67d7b44784
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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)