From 51d94b8d14322d47c5184e68010fafb70c25afe8 Mon Sep 17 00:00:00 2001
From: Dimitri Huisman <diman@huisman.xyz>
Date: Wed, 22 Dec 2021 17:40:51 +0000
Subject: [PATCH] Fix issue 2102

---
 core/admin/mailu/utils.py        | 13 ++++++++-----
 towncrier/newsfragments/2102.fix |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 towncrier/newsfragments/2102.fix

diff --git a/core/admin/mailu/utils.py b/core/admin/mailu/utils.py
index f2adfc2a..cae8fab8 100644
--- a/core/admin/mailu/utils.py
+++ b/core/admin/mailu/utils.py
@@ -300,7 +300,7 @@ class MailuSessionConfig:
     # default size of session key parts
     uid_bits = 64 # default if SESSION_KEY_BITS is not set in config
     sid_bits = 128 # for now. must be multiple of 8!
-    time_bits = 32 # for now. must be multiple of 8!
+    time_bits = 32 # for now. must be multiple of 8!  
 
     def __init__(self, app=None):
 
@@ -341,6 +341,9 @@ class MailuSessionConfig:
     def parse_key(self, key, app=None, now=None):
         """ Split key into sid, uid and creation time. """
 
+        if app is None:
+            app = flask.current_app
+
         if not (isinstance(key, bytes) and self._key_min <= len(key) <= self._key_max):
             return None
 
@@ -357,7 +360,7 @@ class MailuSessionConfig:
         if now is None:
             now = int(time.time())
         created = int.from_bytes(created, byteorder='big')
-        if not created <= now <= created + self.app.config['PERMANENT_SESSION_LIFETIME']:
+        if not created <= now <= created + app.config['PERMANENT_SESSION_LIFETIME']:
             return None
 
         return (uid, sid, crt)
@@ -422,8 +425,8 @@ class MailuSessionExtension:
 
         count = 0
         for key in app.session_store.list():
-            if key.startswith('token-'):
-                if sessid := app.session_store.get(token):
+            if key.startswith(b'token-'):
+                if sessid := app.session_store.get(key):
                     if not app.session_config.parse_key(sessid, app, now=now):
                         app.session_store.delete(sessid)
                         app.session_store.delete(key)
@@ -451,7 +454,7 @@ class MailuSessionExtension:
 
         count = 0
         for key in app.session_store.list(prefix):
-            if key not in keep and not key.startswith('token-'):
+            if key not in keep and not key.startswith(b'token-'):
                 app.session_store.delete(key)
                 count += 1
 
diff --git a/towncrier/newsfragments/2102.fix b/towncrier/newsfragments/2102.fix
new file mode 100644
index 00000000..94196122
--- /dev/null
+++ b/towncrier/newsfragments/2102.fix
@@ -0,0 +1 @@
+Fix bug introduced by enhanced session management (PR #2098)