From 0136a522b18a734db69171d60566f501c0ced663 Mon Sep 17 00:00:00 2001
From: Negar Fazeli <negar.fazeli@ericsson.com>
Date: Fri, 8 Jul 2016 16:53:18 +0200
Subject: Bug fix: expire invalid access tokens

---
 synapse/api/auth.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'synapse/api')

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
-- 
cgit 1.5.1