Changeset 1924

Timestamp:

03/16/08 10:33:19

Author:

fumanchu

Message:

Fix for #799 (_test_concurrency fails periodically). Turns out the anti-malicious-session-id stuff was returning None in some cases because it didn't use the lock file. Fixed by making init use os.path.exists (etc) instead of session._load.

Files:

• trunk/cherrypy/lib/sessions.py (modified) (7 diffs)

trunk/cherrypy/lib/sessions.py

@@ -74 +74 @@
-        else:
-            self.id = id
-self._load() is None
+not self._exists()
-                # Expired or malicious session. Make a new one.
-                # See http://www.cherrypy.org/ticket/709.
@@ -93 +93 @@
-            self.id = self.generate_id()
-            # Assert that the generated id is not already stored.
-load() is not None
+exists()
-                self.id = None
-        
@@ -245 +245 @@
-                    pass
-    
+    def _exists(self):
+        return self.id in self.cache
+    
-    def _load(self):
-        return self.cache.get(self.id)
@@ -270 +273 @@
-
-class FileSession(Session):
- 
+
-    
-    storage_path: the folder where session data will be saved. Each session
@@ -309 +312 @@
-            raise cherrypy.HTTPError(400, "Invalid session id in cookie.")
-        return f
+    
+    def _exists(self):
+        path = self._get_file_path()
+        return os.path.exists(path)
-    
-    def _load(self, path=None):
@@ -420 +427 @@
-        self.db.commit()
-    
+    def _exists(self):
+        # Select session data from table
+        self.cursor.execute('select data, expiration_time from session '
+                            'where id=%s', (self.id,))
+        rows = self.cursor.fetchall()
+        return bool(rows)
+    
-    def _load(self):
-        # Select session data from table
@@ -484 +498 @@
-        cls.cache = memcache.Client(cls.servers)
-    setup = classmethod(setup)
+    
+    def _exists(self):
+        self.mc_lock.acquire()
+        try:
+            return bool(self.cache.get(self.id))
+        finally:
+            self.mc_lock.release()
-    
-    def _load(self):