summary refs log tree commit diff
path: root/synapse/config/key.py
diff options
context:
space:
mode:
authorNegi Fazeli <negar.fazeli@ericsson.com>2016-04-20 16:21:40 +0200
committerNegar Fazeli <negar.fazeli@ericsson.com>2016-05-13 15:34:15 +0200
commit40aa6e8349b348802d6f87084c31c3895f728708 (patch)
tree2150d48917b62e0317a73e7892061d73e2fe62ec /synapse/config/key.py
parentPass through _get_state_group_for_events (diff)
downloadsynapse-40aa6e8349b348802d6f87084c31c3895f728708.tar.xz
Create user with expiry
 - Add unittests for client, api and handler

Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com>
Diffstat (limited to 'synapse/config/key.py')
-rw-r--r--synapse/config/key.py5
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