From 74874ffda7dd4c72cf723d1f5bce757a852bfcb6 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Wed, 29 Apr 2015 12:14:08 +0100
Subject: [PATCH] Update the query format used by keyring to match current key
v2 spec
---
synapse/crypto/keyring.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
index bfe6e61602..078361fa85 100644
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@@ -171,10 +171,21 @@ class Keyring(object):
)
with limiter:
+ # TODO(mark): Set the minimum_valid_until_ts to that needed by
+ # the events being validated or the current time if validating
+ # an incoming request.
responses = yield self.client.post_json(
destination=perspective_name,
path=b"/_matrix/key/v2/query",
- data={u"server_keys": {server_name: list(key_ids)}},
+ data={
+ u"server_keys": {
+ server_name: {
+ key_id: {
+ u"minimum_valid_until_ts": 0
+ } for key_id in key_ids
+ }
+ }
+ },
)
keys = {}
--
GitLab