Merge pull request #918 from negzi/bugfix_for_token_expiry

Bug fix: expire invalid access tokens
This commit is contained in:
Erik Johnston 2016-07-14 15:51:52 +01:00 committed by GitHub
commit 209e04fa11
6 changed files with 42 additions and 9 deletions

View file

@ -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