summary refs log tree commit diff
path: root/synapse/handlers/auth.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-11-19 15:00:14 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-11-19 15:00:14 -0500
commit95c3306798e1ca6429f3f52797a5d1b6ce7d6f37 (patch)
treeb43e191ea43c44a12b4c60c5a3a2ff09bc814e79 /synapse/handlers/auth.py
parentIgnore forgotten rooms in v2 sync (diff)
parentMerge branch 'develop' into daniel/forgetrooms (diff)
downloadsynapse-95c3306798e1ca6429f3f52797a5d1b6ce7d6f37.tar.xz
Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into daniel/forgetrooms
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)