diff options
| author | Erik Johnston <erik@matrix.org> | 2016-05-13 14:46:53 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-05-13 14:46:53 +0100 |
| commit | 99b5a2e560d28894710e1bebaa1977cfebc7963d (patch) | |
| tree | 88e0f3de599addc0a129d3c94212aef674c5c24d /synapse/config/key.py | |
| parent | Merge pull request #778 from matrix-org/erikj/add_pusher (diff) | |
| parent | Create user with expiry (diff) | |
| download | synapse-99b5a2e560d28894710e1bebaa1977cfebc7963d.tar.xz | |
Merge pull request #741 from negzi/create_user_with_expiry
Create user with expiry
Diffstat (limited to 'synapse/config/key.py')
| -rw-r--r-- | synapse/config/key.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index a072aec714..6ee643793e 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -57,6 +57,8 @@ class KeyConfig(Config): seed = self.signing_key[0].seed self.macaroon_secret_key = hashlib.sha256(seed) + self.expire_access_token = config.get("expire_access_token", False) + 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) @@ -69,6 +71,9 @@ class KeyConfig(Config): return """\ macaroon_secret_key: "%(macaroon_secret_key)s" + # Used to enable access token expiration. + expire_access_token: False + ## Signing Keys ## # Path to the signing key to sign messages with |