minor changes in session

Author: peppelinux

src/oidcendpoint/session.py

@@ -232,6 +232,7 @@ def delete_kv2sid(self, key, value):
         self._db.delete(KEY_FORMAT.format(key, value))
 
     def get_sid_by_kv(self, key, value):
+        """ KEY_FORMAT = "__{}__{}" """
         return self._db.get(KEY_FORMAT.format(key, value))
 
     def get_token(self, sid):
@@ -559,6 +560,7 @@ def get_authentication_event(self, sid):
             sesinf = session_info.get("authn_event")
             return sesinf or ValueError("No Authn event info")
 
+
 def create_session_db(ec, token_handler_args, db=None,
                       sso_db=None, sub_func=None):
     _token_handler = token_handler.factory(ec, **token_handler_args)

src/oidcendpoint/sso_db.py

@@ -35,7 +35,7 @@ def set(self, label, key, value):
     def get(self, label, key):
         _key = KEY_FORMAT.format(label, key)
         value = self._db.get(_key)
-        logger.debug("SSODb get {} [{}]".format(key, value))
+        logger.debug("SSODb get {} - {}: {}".format(label, key, value))
         return value
 
     def delete(self, label, key):
@@ -45,17 +45,17 @@ def delete(self, label, key):
     def remove(self, label, key, value):
         _key = KEY_FORMAT.format(label, key)
         _values = self._db.get(_key)
-        if _values:
-            try:
-                _values.remove(value)
-            except ValueError:
-                pass
+        vcount = len(_values)
+        # full clean up
+        while value in _values:
+            _values.remove(value)
+        # if changes have been made -> update them
+        if vcount != len(_values):
+            if _values:
+                self._db.set(_key, _values)
             else:
-                if _values:
-                    self._db.set(_key, _values)
-                else:
-                    self._db.delete(_key)
-
+                self._db.delete(_key)
+        
     def map_sid2uid(self, sid, uid):
         """
         Store the connection between a Session ID and a User ID