Merge branch 'develop' into markjh/verify

Conflicts:
	synapse/crypto/keyring.py
This commit is contained in:
Mark Haines 2016-07-27 15:11:02 +01:00
commit 29b25d59c6
2 changed files with 11 additions and 3 deletions

View File

@ -454,7 +454,7 @@ class Keyring(object):
) )
processed_response = yield self.process_v2_response( processed_response = yield self.process_v2_response(
perspective_name, response perspective_name, response, only_from_server=False
) )
for server_name, response_keys in processed_response.items(): for server_name, response_keys in processed_response.items():
@ -534,7 +534,7 @@ class Keyring(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def process_v2_response(self, from_server, response_json, def process_v2_response(self, from_server, response_json,
requested_ids=[]): requested_ids=[], only_from_server=True):
time_now_ms = self.clock.time_msec() time_now_ms = self.clock.time_msec()
response_keys = {} response_keys = {}
verify_keys = {} verify_keys = {}
@ -558,6 +558,13 @@ class Keyring(object):
results = {} results = {}
server_name = response_json["server_name"] server_name = response_json["server_name"]
if only_from_server:
if server_name != from_server:
raise ValueError(
"Expected a response for server %r not %r" % (
from_server, server_name
)
)
for key_id in response_json["signatures"].get(server_name, {}): for key_id in response_json["signatures"].get(server_name, {}):
if key_id not in response_json["verify_keys"]: if key_id not in response_json["verify_keys"]:
raise ValueError( raise ValueError(

View File

@ -24,6 +24,7 @@ from collections import namedtuple
import itertools import itertools
import logging import logging
import ujson as json
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -101,7 +102,7 @@ class TransactionStore(SQLBaseStore):
) )
if result and result["response_code"]: if result and result["response_code"]:
return result["response_code"], result["response_json"] return result["response_code"], json.loads(str(result["response_json"]))
else: else:
return None return None