diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 16:53:13 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 16:53:13 +0000 |
| commit | 1cfda3d2d8f0f63099c0176b4e01907aba7ad804 (patch) | |
| tree | 7691812e7aa296267978d375d006ff8a1bf66aa1 /synapse/handlers/auth.py | |
| parent | Simplify code (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-1cfda3d2d8f0f63099c0176b4e01907aba7ad804.tar.xz | |
Merge branch 'develop' into daniel/forgetrooms
Diffstat (limited to 'synapse/handlers/auth.py')
| -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 be157e2bb7..e64b67cdfd 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -407,7 +407,7 @@ class AuthHandler(BaseHandler): try: macaroon = pymacaroons.Macaroon.deserialize(login_token) auth_api = self.hs.get_auth() - auth_api.validate_macaroon(macaroon, "login", [auth_api.verify_expiry]) + auth_api.validate_macaroon(macaroon, "login", True) return self._get_user_from_macaroon(macaroon) except (pymacaroons.exceptions.MacaroonException, TypeError, ValueError): raise AuthError(401, "Invalid token", errcode=Codes.UNKNOWN_TOKEN) |