Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add config for setting the perspective servers

Browse Source
This commit is contained in:
Mark Haines 2015-04-24 17:01:34 +01:00
parent c253b14f6e
commit 288702170d
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/config/_base.py
View File

@ -83,9 +83,9 @@ class Config(object):
with open(file_path) as file_stream: with open(file_path) as file_stream:
try: try:
return yaml.load(file_stream) return yaml.load(file_stream)
except Exception as e: except:
raise ConfigError( raise ConfigError(
"Error parsing yaml in file %r: " % (file_path,), e "Error parsing yaml in file %r" % (file_path,)
) )
@staticmethod @staticmethod

22
synapse/config/key.py
View File

@ -16,6 +16,10 @@
import os import os
from ._base import Config, ConfigError from ._base import Config, ConfigError
import syutil.crypto.signing_key import syutil.crypto.signing_key
from syutil.crypto.signing_key import (
is_signing_algorithm_supported, decode_verify_key_bytes
)
from syutil.base64util import decode_base64
class KeyConfig(Config): class KeyConfig(Config):
@ -53,9 +57,17 @@ class KeyConfig(Config):
" keys from") " keys from")
def read_perspectives(self, perspectives_config_path): def read_perspectives(self, perspectives_config_path):
servers = self.read_yaml_file( config = self.read_yaml_file(
perspectives_config_path, "perspectives_config_path" perspectives_config_path, "perspectives_config_path"
) )
servers = {}
for server_name, server_config in config["servers"].items():
for key_id, key_data in server_config["verify_keys"].items():
if is_signing_algorithm_supported(key_id):
key_base64 = key_data["key"]
key_bytes = decode_base64(key_base64)
verify_key = decode_verify_key_bytes(key_id, key_bytes)
servers.setdefault(server_name, {})[key_id] = verify_key
return servers return servers
def read_signing_key(self, signing_key_path): def read_signing_key(self, signing_key_path):
@ -126,4 +138,10 @@ class KeyConfig(Config):
if not os.path.exists(args.perspectives_config_path): if not os.path.exists(args.perspectives_config_path):
with open(args.perspectives_config_path, "w") as perspectives_file: with open(args.perspectives_config_path, "w") as perspectives_file:
perspectives_file.write("@@@") perspectives_file.write(
'servers:\n'
' matrix.org:\n'
' verify_keys:\n'
' "ed25519:auto":\n'
' key: "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"\n'
)

6
synapse/crypto/keyring.py
View File

@ -42,7 +42,7 @@ class Keyring(object):
self.clock = hs.get_clock() self.clock = hs.get_clock()
self.client = hs.get_http_client() self.client = hs.get_http_client()
self.config = hs.get_config() self.config = hs.get_config()
self.perspective_servers = {} self.perspective_servers = self.config.perspectives
self.hs = hs self.hs = hs
@defer.inlineCallbacks @defer.inlineCallbacks
@ -111,6 +111,10 @@ class Keyring(object):
) )
break break
except: except:
logging.info(
"Unable to getting key %r for %r from %r",
key_ids, server_name, perspective_name,
)
pass pass
limiter = yield get_retry_limiter( limiter = yield get_retry_limiter(