diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-10 15:56:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-10 15:56:28 +0100 |
| commit | 8da0d83a54a8ecd5509b7978a217e14475106d9a (patch) | |
| tree | 721960919cc814dbf7609acb1a8435c4801d7b8e /synapse/storage/keys.py | |
| parent | Improve startup checks for insecure notary configs (#5392) (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-8da0d83a54a8ecd5509b7978a217e14475106d9a.tar.xz | |
Merge branch 'erikj/fix_null_valid_until_ms' of github.com:matrix-org/synapse into release-v1.0.0
Diffstat (limited to 'synapse/storage/keys.py')
| -rw-r--r-- | synapse/storage/keys.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py index 5300720dbb..e3655ad8d7 100644 --- a/synapse/storage/keys.py +++ b/synapse/storage/keys.py @@ -80,6 +80,14 @@ class KeyStore(SQLBaseStore): for row in txn: server_name, key_id, key_bytes, ts_valid_until_ms = row + + if ts_valid_until_ms is None: + # Old keys may be stored with a ts_valid_until_ms of null, + # in which case we treat this as if it was set to `0`, i.e. + # it won't match key requests that define a minimum + # `ts_valid_until_ms`. + ts_valid_until_ms = 0 + res = FetchKeyResult( verify_key=decode_verify_key_bytes(key_id, bytes(key_bytes)), valid_until_ts=ts_valid_until_ms, |