Merge pull request #918 from negzi/bugfix_for_token_expiry

Bug fix: expire invalid access tokens

1 files changed, 3 insertions, 0 deletions

diff --git a/synapse/api/auth.py b/synapse/api/auth.py

index a4d658a9d0..521a52e001 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -629,7 +629,10 @@ class Auth(object):
         except AuthError:
             # TODO(daniel): Remove this fallback when all existing access tokens
             # have been re-issued as macaroons.
+            if self.hs.config.expire_access_token:
+                raise
             ret = yield self._look_up_user_by_access_token(token)
+
         defer.returnValue(ret)
 
     @defer.inlineCallbacks