diff options
author | Erik Johnston <erik@matrix.org> | 2018-05-17 14:00:41 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-05-17 14:00:41 +0100 |
commit | 3b505a80dc213f51fbdb76901312db7e13809026 (patch) | |
tree | 4fcf465dfff95dc78f96b13acd0f315a83dad79e /synapse/config/key.py | |
parent | Begin adding implementing room chunks (diff) | |
parent | Merge pull request #3212 from matrix-org/erikj/epa_stream (diff) | |
download | synapse-3b505a80dc213f51fbdb76901312db7e13809026.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/chunk_base
Diffstat (limited to 'synapse/config/key.py')
-rw-r--r-- | synapse/config/key.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index 4b8fc063d0..d1382ad9ac 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -59,14 +59,20 @@ class KeyConfig(Config): self.expire_access_token = config.get("expire_access_token", False) + # a secret which is used to calculate HMACs for form values, to stop + # falsification of values + self.form_secret = config.get("form_secret", None) + def default_config(self, config_dir_path, server_name, is_generating_file=False, **kwargs): base_key_name = os.path.join(config_dir_path, server_name) if is_generating_file: macaroon_secret_key = random_string_with_symbols(50) + form_secret = '"%s"' % random_string_with_symbols(50) else: macaroon_secret_key = None + form_secret = 'null' return """\ macaroon_secret_key: "%(macaroon_secret_key)s" @@ -74,6 +80,10 @@ class KeyConfig(Config): # Used to enable access token expiration. expire_access_token: False + # a secret which is used to calculate HMACs for form values, to stop + # falsification of values + form_secret: %(form_secret)s + ## Signing Keys ## # Path to the signing key to sign messages with |