Changeset 934

Timestamp:

01/24/06 07:10:44

Author:

rdelon

Message:

Fix for #422, #412 and #289

Files:

• trunk/cherrypy/filters/sessionfilter.py (modified) (5 diffs)

trunk/cherrypy/filters/sessionfilter.py

@@ -78 +78 @@
-        sess.sessionLocking = conf('session_filter.locking', 'explicit')
-        sess.onCreateSession = conf('session_filter.on_create_session',
-                    
+
-        sess.onDeleteSession = conf('session_filter.on_delete_session',
-
+
+
+
-        
-        cleanUpDelay = conf('session_filter.clean_up_delay', 5)
@@ -86 +88 @@
-        
-        cookieName = conf('session_filter.cookie_name', 'sessionID')
+        cookieDomain = conf('session_filter.cookie_domain', None)
+        cookieSecure = conf('session_filter.cookie_secure', False)
+        cookiePath = conf('session_filter.cookie_path', None)
+
+        if cookiePath is None:
+            cookiePathHeader = conf('session_filter.cookie_path_from_header', None)
+            if cookiePathHeader is not None:
+                cookiePath = cherrypy.request.headerMap.get(cookiePathHeader, None)
+            if cookiePath is None:
+                cookiePath = '/'
+
-        sess.deadlockTimeout = conf('session_filter.deadlock_timeout', 30)
-        
@@ -123 +136 @@
-        else:
-            # No sessionID yet
-generateSessionID
+sess.generate_session_id
-            sess.sessionData = {'_id': sess.sessionID}
-            sess.onCreateSession(sess.sessionData)
@@ -129 +142 @@
-        cookie = cherrypy.response.simpleCookie
-        cookie[cookieName] = sess.sessionID
-'/'
+cookiePath
-        cookie[cookieName]['max-age'] = sess.sessionTimeout * 60
-        cookie[cookieName]['version'] = 1
+        if cookieDomain is not None:
+            cookie[cookieName]['domain'] = cookieDomain
+        if cookieSecure is True:
+            cookie[cookieName]['secure'] = 1
-    
-    def before_finalize(self):
@@ -376 +393 @@
-
-
-SessionID
+_session_id
-    """ Return a new sessionID """
-    return sha.new('%s' % random.random()).hexdigest()