diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-19 15:16:32 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-19 15:16:32 +0000 |
| commit | d2ecde2cbb58eec54f3ea50fe70b10056e94f87e (patch) | |
| tree | ae71e53997212138eddc2881654e2f51e36ff325 /synapse/handlers | |
| parent | Merge pull request #388 from matrix-org/erikj/messages (diff) | |
| parent | Take a boolean not a list of lambdas (diff) | |
| download | synapse-d2ecde2cbb58eec54f3ea50fe70b10056e94f87e.tar.xz | |
Merge pull request #382 from matrix-org/daniel/macarooncleanup
Take a boolean not a list of lambdas
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 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) |