Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 00:44:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into key_distribution

Browse source 
Conflicts:
	synapse/crypto/keyring.py
This commit is contained in:
Mark Haines 2015-04-27 18:29:32 +01:00
commit f8b865264a
5 changed files with 74 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

20
synapse/crypto/keyring.py
View file

@ -26,6 +26,8 @@ from synapse.api.errors import SynapseError, Codes
from synapse.util.retryutils import get_retry_limiter
from synapse.util.async import create_observer
from OpenSSL import crypto
import urllib
@ -45,6 +47,8 @@ class Keyring(object):
self.perspective_servers = self.config.perspectives
self.hs = hs
self.key_downloads = {}
@defer.inlineCallbacks
def verify_json_for_server(self, server_name, json_object):
logger.debug("Verifying for %s", server_name)
@ -103,6 +107,22 @@ class Keyring(object):
defer.returnValue(cached[0])
return
download = self.key_downloads.get(server_name)
if download is None:
download = self._get_server_verify_key_impl(server_name, key_ids)
self.key_downloads[server_name] = download
@download.addBoth
def callback(ret):
del self.key_downloads[server_name]
return ret
r = yield create_observer(download)
defer.returnValue(r)
@defer.inlineCallbacks
def _get_server_verify_key_impl(self, server_name, key_ids):
keys = None
for perspective_name, perspective_keys in self.perspective_servers.items():
try: