tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Don't implicitly include server signing key

Browse source
This commit is contained in:
Erik Johnston 2019-08-23 14:54:20 +01:00
parent 7af5a63063
commit fe0ac98e66
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
synapse/config/key.py
View file

@ -85,14 +85,13 @@ class KeyConfig(Config):
config.get("key_refresh_interval", "1d") config.get("key_refresh_interval", "1d")
) )
self.key_server_signing_keys = list(self.signing_key)
key_server_signing_keys_path = config.get("key_server_signing_keys_path") key_server_signing_keys_path = config.get("key_server_signing_keys_path")
if key_server_signing_keys_path: if key_server_signing_keys_path:
self.key_server_signing_keys.extend( self.key_server_signing_keys = self.read_signing_keys(
self.read_signing_keys( key_server_signing_keys_path, "key_server_signing_keys_path"
key_server_signing_keys_path, "key_server_signing_keys_path"
)
) )
else:
self.key_server_signing_keys = list(self.signing_key)
# if neither trusted_key_servers nor perspectives are given, use the default. # if neither trusted_key_servers nor perspectives are given, use the default.
if "perspectives" not in config and "trusted_key_servers" not in config: if "perspectives" not in config and "trusted_key_servers" not in config:
@ -221,8 +220,8 @@ class KeyConfig(Config):
# - server_name: "matrix.org" # - server_name: "matrix.org"
# #
# The additional signing keys to use when acting as a trusted key server, on # The signing keys to use when acting as a trusted key server. If not specified
# top of the normal signing keys. # defaults to the server signing key.
# #
# Can contain multiple keys, one per line. # Can contain multiple keys, one per line.
# #