auth: Full capability caching

1 files changed, 7 insertions, 7 deletions

diff --git a/bitvend/auth.py b/bitvend/auth.py
index f0d8d0a..f7486fe 100644
--- a/bitvend/auth.py
+++ b/bitvend/auth.py
@@ -40,20 +40,20 @@ def cap_check(capability, user=None):
         return False
 
     user = user or current_user.get_id()
+    cached_cap = session.get('_caps', {}).get(capability, (False, 0))
 
-    if session.get('_caps', {}).get(capability, 0) > time.time():
-        return True
+    if cached_cap[1] > time.time():
+        return cached_cap[0]
 
     allowed = requests.get(
         'https://capacifier.hackerspace.pl/%s/%s' % (capability, user)
         ).status_code == 200
 
-    if allowed:
-        if '_caps' not in session:
-            session['_caps'] = {}
+    if '_caps' not in session:
+        session['_caps'] = {}
 
-        session['_caps'][capability] = \
-            time.time() + current_app.config.get('CAP_TTL', 3600)
+    session['_caps'][capability] = \
+        (allowed, time.time() + current_app.config.get('CAP_TTL', 3600))
 
     return allowed