diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-07-30 08:25:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 08:25:02 +0100 |
| commit | 8c97f6414cf322fc5b42a92ed0df2fb70bfab3fc (patch) | |
| tree | 93848385c7dfb304b761b60f3a11856664a66a38 /synapse/config/key.py | |
| parent | Room Complexity Client Implementation (#5783) (diff) | |
| download | synapse-8c97f6414cf322fc5b42a92ed0df2fb70bfab3fc.tar.xz | |
Remove non-functional 'expire_access_token' setting (#5782)
The `expire_access_token` didn't do what it sounded like it should do. What it actually did was make Synapse enforce the 'time' caveat on macaroons used as access tokens, but since our access token macaroons never contained such a caveat, it was always a no-op. (The code to add 'time' caveats was removed back in v0.18.5, in #1656)
Diffstat (limited to 'synapse/config/key.py')
| -rw-r--r-- | synapse/config/key.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index 8fc74f9cdf..fe8386985c 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -116,8 +116,6 @@ class KeyConfig(Config): seed = bytes(self.signing_key[0]) self.macaroon_secret_key = hashlib.sha256(seed).digest() - 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) @@ -144,10 +142,6 @@ class KeyConfig(Config): # %(macaroon_secret_key)s - # 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. Must be specified for the User Consent # forms to work. |