OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Add a random string to the auto generated key id

pull/136/head
Mark Haines 2015-04-30 15:13:14 +01:00
parent 265f30bd3f
commit c28f1d16f0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/config/key.py
View File

@ -20,6 +20,7 @@ from syutil.crypto.signing_key import (
is_signing_algorithm_supported, decode_verify_key_bytes is_signing_algorithm_supported, decode_verify_key_bytes
) )
from syutil.base64util import decode_base64 from syutil.base64util import decode_base64
from synapse.util.stringutils import random_string
class KeyConfig(Config): class KeyConfig(Config):
@ -110,9 +111,10 @@ class KeyConfig(Config):
signing_key_path = config["signing_key_path"] signing_key_path = config["signing_key_path"]
if not os.path.exists(signing_key_path): if not os.path.exists(signing_key_path):
with open(signing_key_path, "w") as signing_key_file: with open(signing_key_path, "w") as signing_key_file:
key_id = "a_" + random_string(4)
syutil.crypto.signing_key.write_signing_keys( syutil.crypto.signing_key.write_signing_keys(
signing_key_file, signing_key_file,
(syutil.crypto.signing_key.generate_signing_key("auto"),), (syutil.crypto.signing_key.generate_signing_key(key_id),),
) )
else: else:
signing_keys = self.read_file(signing_key_path, "signing_key") signing_keys = self.read_file(signing_key_path, "signing_key")