summary refs log tree commit diff
path: root/synapse/api/auth.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-13 14:46:53 +0100
committerErik Johnston <erik@matrix.org>2016-05-13 14:46:53 +0100
commit99b5a2e560d28894710e1bebaa1977cfebc7963d (patch)
tree88e0f3de599addc0a129d3c94212aef674c5c24d /synapse/api/auth.py
parentMerge pull request #778 from matrix-org/erikj/add_pusher (diff)
parentCreate user with expiry (diff)
downloadsynapse-99b5a2e560d28894710e1bebaa1977cfebc7963d.tar.xz
Merge pull request #741 from negzi/create_user_with_expiry
Create user with expiry
Diffstat (limited to 'synapse/api/auth.py')
-rw-r--r--synapse/api/auth.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index d3e9837c81..44e38b777a 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -612,7 +612,8 @@ class Auth(object):
     def get_user_from_macaroon(self, macaroon_str):
         try:
             macaroon = pymacaroons.Macaroon.deserialize(macaroon_str)
-            self.validate_macaroon(macaroon, "access", False)
+
+            self.validate_macaroon(macaroon, "access", self.hs.config.expire_access_token)
 
             user_prefix = "user_id = "
             user = None