Changeset 1583

Timestamp:

12/29/06 06:03:26

Author:

lawouach

Message:

Backport to 2.2 of #525

Files:

• branches/cherrypy-2.x/cherrypy/filters/sessionfilter.py (modified) (7 diffs)
• branches/cherrypy-2.x/cherrypy/test/test_session_filter.py (modified) (5 diffs)

branches/cherrypy-2.x/cherrypy/filters/sessionfilter.py

@@ -93 +93 @@
-        clean_up_delay = conf('session_filter.clean_up_delay', 5)
-        clean_up_delay = datetime.timedelta(seconds = clean_up_delay * 60)
-
+
-        cookie_name = conf('session_filter.cookie_name', 'session_id')
-        cookie_domain = conf('session_filter.cookie_domain', None)
@@ -227 +227 @@
-    def save(self, id, data, expiration_time):
-        cherrypy._session_data_holder[id] = (data, expiration_time)
-
+
+
+
+
+
+
-    def acquire_lock(self):
-        sess = cherrypy.request._session
@@ -289 +294 @@
-        f.close()
-    
+    def delete(self, id=None):
+        if id is None:
+            id = cherrypy.session.id
+        file_path = self._get_file_path(id)
+        try:
+            os.unlink(file_path)
+        except:
+            pass
+        
-    def acquire_lock(self):
-        sess = cherrypy.request._session
@@ -322 +336 @@
-                        # Session expired: deleting it
-                        id = fname[len(self.SESSION_PREFIX):]
+                        print file_path
-                        sess.on_delete_session(data)
-                        os.unlink(file_path)
@@ -386 +401 @@
-        data = pickle.loads(pickled_data)
-        return (data, expiration_time)
+
+    def delete(self, id=None):
+        if id is None:
+            id = cherrypy.session.id
+        self.cursor.execute('delete from session where id=%s', (id,)) 
-    
-    def save(self, id, data, expiration_time):
@@ -458 +478 @@
-        elif name == 'id':
-            return sess.session_id
+        elif name == 'delete':
+            return sess.session_storage.delete
-
-        if sess.to_be_loaded:
@@ -474 +496 @@
-        return getattr(sess.session_data, name)
-
+def expire():
+    """Expire the current session cookie."""
+    name = cherrypy.config.get('session_filter.cookie_name', 'session_id')
+    one_year = 60 * 60 * 24 * 365
+    exp = time.gmtime(time.time() - one_year)
+    t = time.strftime("%a, %d-%b-%Y %H:%M:%S GMT", exp)
+    cherrypy.response.simple_cookie[name]['expires'] = t

branches/cherrypy-2.x/cherrypy/test/test_session_filter.py

@@ -2 +2 @@
-test.prefer_parent_path()
-
-
+
+
-
+localDir = os.path.dirname(__file__)
-
-def setup_server():
@@ -22 +24 @@
-            cherrypy.config.update({'session_filter.storage_type': newtype})
-        setsessiontype.exposed = True
+
+        def delete(self):
+            cherrypy.session.delete() 
+            sessionfilter.expire() 
+            return "done" 
+        delete.exposed = True
-        
-    cherrypy.root = Root()
@@ -29 +37 @@
-            'session_filter.on': True,
-            'session_filter.storage_type' : 'file',
-
+
+
+
-    })
-
@@ -43 +53 @@
-        self.getPage('/testStr', self.cookies)
-        self.assertBody('3')
+
+        self.getPage('/delete', self.cookies)
+        self.assertBody("done")
+
+        f = lambda: [x for x in os.listdir(localDir) if x.startswith('session-')] 
+        self.assertEqual(f(), [])
+        
-        self.getPage('/setsessiontype/file')
-        self.getPage('/testStr')
@@ -51 +68 @@
-        self.assertBody('3')
-
+        f = lambda: [x for x in os.listdir(localDir) if x.startswith('session-')]
+        self.assertNotEqual(f(), [])
+        
+        self.getPage('/delete', self.cookies)
+        self.assertBody("done")
+
+        f = lambda: [x for x in os.listdir(localDir) if x.startswith('session-')] 
+        self.assertEqual(f(), [])
+
+        self.getPage('/testStr')
+        f = lambda: [x for x in os.listdir(localDir) if x.startswith('session-')]
+        self.assertNotEqual(f(), [])
+
-        # Clean up session files
-'.'
+localDir
-            if fname.startswith('session-'):
-fname
+os.path.join(localDir, fname)
-
-if __name__ == "__main__":