summary refs log tree commit diff
path: root/synapse/handlers/auth.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-11-19 15:16:25 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2015-11-19 15:16:25 +0000
commit248cfd5eb3be7797ac1f6578935ce92db5388655 (patch)
treeae71e53997212138eddc2881654e2f51e36ff325 /synapse/handlers/auth.py
parentMerge pull request #388 from matrix-org/erikj/messages (diff)
downloadsynapse-248cfd5eb3be7797ac1f6578935ce92db5388655.tar.xz
Take a boolean not a list of lambdas
Diffstat (limited to 'synapse/handlers/auth.py')
-rw-r--r--synapse/handlers/auth.py2
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)