Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-27 12:11:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34

Browse source
This commit is contained in:
Richard van der Hoff 2019-01-10 12:58:33 +00:00
commit aa70d24125
3 changed files with 34 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

10
synapse/config/key.py
View file

@ -57,8 +57,8 @@ class KeyConfig(Config):
# Unfortunately, there are people out there that don't have this
# set. Lets just be "nice" and derive one from their secret key.
logger.warn("Config is missing missing macaroon_secret_key")
seed = self.signing_key[0].seed
self.macaroon_secret_key = hashlib.sha256(seed)
seed = bytes(self.signing_key[0])
self.macaroon_secret_key = hashlib.sha256(seed).digest()
self.expire_access_token = config.get("expire_access_token", False)
@ -71,14 +71,14 @@ class KeyConfig(Config):
base_key_name = os.path.join(config_dir_path, server_name)
if is_generating_file:
macaroon_secret_key = random_string_with_symbols(50)
macaroon_secret_key = '"%s"' % random_string_with_symbols(50)
form_secret = '"%s"' % random_string_with_symbols(50)
else:
macaroon_secret_key = None
macaroon_secret_key = 'null'
form_secret = 'null'
return """\
macaroon_secret_key: "%(macaroon_secret_key)s"
macaroon_secret_key: %(macaroon_secret_key)s
# Used to enable access token expiration.
expire_access_token: False