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

Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1

Browse source 
Fixes #4371
This commit is contained in:
Richard van der Hoff 2019-01-10 14:12:50 +00:00
commit e0910d0145
4 changed files with 32 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

4
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)