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/handlers | |
| 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/handlers')
| -rw-r--r-- | synapse/handlers/auth.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 05be5b7c48..0f3ebf7ef8 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -860,7 +860,7 @@ class AuthHandler(BaseHandler): try: macaroon = pymacaroons.Macaroon.deserialize(login_token) user_id = auth_api.get_user_id_from_macaroon(macaroon) - auth_api.validate_macaroon(macaroon, "login", True, user_id) + auth_api.validate_macaroon(macaroon, "login", user_id) except Exception: raise AuthError(403, "Invalid token", errcode=Codes.FORBIDDEN) self.ratelimit_login_per_account(user_id) |