Changeset 203

Timestamp:

05/22/05 14:38:04

Author:

mikerobi

Message:

implemented file session storage +refactoring

Files:

• branches/ticket-132/cherrypy/_cpdefaults.py (modified) (2 diffs)
• branches/ticket-132/cherrypy/_cphttptools.py (modified) (4 diffs)
• branches/ticket-132/cherrypy/_cpserver.py (modified) (1 diff)
• branches/ticket-132/cherrypy/lib/session/basesession.py (modified) (2 diffs)
• branches/ticket-132/cherrypy/lib/session/filesession.py (modified) (1 diff)
• branches/ticket-132/cherrypy/lib/session/ramsession.py (modified) (3 diffs)
• branches/ticket-132/cherrypy/lib/session/sessionmap.py (modified) (1 diff)
• branches/ticket-132/cherrypy/lib/session/urlrewriteforsessionhelper.py (copied) (copied from branches/kender-experimental/cherrypy/lib/filter/urlrewriteforsessionhelper.py)

branches/ticket-132/cherrypy/_cpdefaults.py

@@ -33 +33 @@
-
-import time, thread, os, cpg
-
+#
-
-def _cpLogMessage(msg, context = '', severity = 0):
@@ -66 +66 @@
-from lib.session.ramsession import RamSession 
-from lib.session.GenericSqlSession import GenericSqlSession
+from lib.session.filesession import FileSession
-_sessionTypes = {
-                  'ram'  : RamSession,
-None
+FileSession
-                  'sql'  : GenericSqlSession
-                }

branches/ticket-132/cherrypy/_cphttptools.py

@@ -227 +227 @@
-            # Still save session data
-            if cpg.getConfig('session', 'storageType') and not cpg.request.isStatic:
-_sessionData
+sessionManager
-
-            wfile.write('%s %s\r\n' % (cpg.response.headerMap['protocolVersion'], cpg.response.headerMap['Status']))
@@ -268 +268 @@
-    # Save session data
-    if cpg.getConfig('session', 'storageType') and not cpg.request.isStatic:
-_sessionData
+sessionManager
-        
-
@@ -306 +306 @@
-        (cpg._lastSessionCleanUpTime + cpg.getConfig('session', 'cleanUpDelay') * 60) <= now):
-        cpg._lastSessionCleanUpTime = now
-_sessionData
+sessionManager
-
-    # Save original values (in case they get modified by filters)
@@ -377 +377 @@
-    
-    # robinson
-    # the new session system might need to peek at the object so this code was moved
-    # from above
-    
-    # Get session data
-    if cpg.getConfig('session', 'storageType') and not cpg.request.isStatic:
-_sessionData
+sessionManager
-
-    # Remove "root" from objectPathList and join it to get objectPath

branches/ticket-132/cherrypy/_cpserver.py

@@ -77 +77 @@
-    sessionType = cpg.getConfig('session', 'storageType')
-    
-_sessionData
+sessionManager
-
-    try:
-_sessionData
+sessionManager
-    except AttributeError:
-        pass

branches/ticket-132/cherrypy/lib/session/basesession.py

@@ -79 +79 @@
-    def newSession(self):
-        """ Return a new sessionMap instance """
+        # this needs to check the config file for default values
-        return SessionMapClass(dataKeys = { '__sessionKey': self.generateSessionId() })
-
+    def getSessionKey(self):
+        """ 
+        Returns the current sessionkey, return None if there is no session.
+        Applications should never need to call this function.  It is public
+        so it can be redifined (to use url based sessions or other magic)
+        """
+        
+        cpg = cherrypy.cpg
+        try:
+            return cpg.request.simpleCookie[cpg.getConfig('session', 'cookieName')].value
+        except:
+            return None
+            
+    def setSessionKey(self, sessionKey):
+        """ 
+        Sets the session key in a cookie.  Aplications should not call this function,
+        but it might be usefull to redefine it.
+        """
+        
+        cpg = cherrypy.cpg
+        cpg.response.simpleCookie[cpg.getConfig('session', 'cookieName')] = sessionKey
+        cpg.response.simpleCookie[cpg.getConfig('session', 'cookieName')]['path'] = '/'
+        cpg.response.simpleCookie[cpg.getConfig('session', 'cookieName')]['version'] = 1
+
-    def loadSessionMap(self, autoCreate = True):
-
+
+
+
-        cpg = cherrypy.cpg
-        
-cookie
-try: sessionKey = cpg.request.simpleCookie[cpg.getConfig('session', 'cookieName')].value
-
+wherever it is stored 
+sessionKey = self.getSessionKey()
+
-        if sessionKey:
-            # Load session data from wherever it was stored
@@ -97 +124 @@
-        if not sessionKey or not sessionMap:
-            if autoCreate:
-cpg._sessionData
+self
-            else:
-                sessionMap = None
-        
-
-
-
+
-
-        cpg.request.sessionMap = sessionMap
-
-    def saveSessionMap(self):
-
+
+
+
+
-       cpg = cherrypy.cpg
-       self.__setitem__(cpg.request.sessionMap['__sessionKey'], cpg.request.sessionMap)

branches/ticket-132/cherrypy/lib/session/filesession.py

@@ -28 +28 @@
-
-import time
-, BaseSessionObject
+
-import cherrypy.cpg
+import mrow
+import os
+import cPickle as pickle
+class FileSession(BaseSession):
+  
+    __lock = mrow.RWLock()
+    
+    def sessionReader(sessionFunc):
+        """Decorates a function as being a reader of the sessionMap.
+    
+        Acquires a read lock on the sessionMap before calling `sessionFunc`, then
+        releases the lock after the call completes.
+        
+        `sessionFunc` will also be called with a named argument, `sessionMap`, as a
+        convenience, set to `cpg.request.sessionMap`.
+    
+        """
+        def _inner(self, *args, **kw):
+            lock = self.__lock.reader()
+            try:
+                return sessionFunc(self, *args, **kw)
+            finally:
+                lock.release()
+        return _inner
+    
+    
+    def sessionWriter(sessionFunc):
+        """Same as sessionReader, except obtains an exclusive write lock."""
+        def _inner(self, sessionKey, sessionValue):
+            lock = self.__lock.writer()
+            try:
+                return sessionFunc(self, sessionKey, sessionValue)
+            finally:
+                lock.release()
+        return _inner
+    
+    def newSession(self):
+        ns = {}#self.dataKeys.copy()
+        ns.update({ 
+                   '__createdAt'  : time.time(),
+                   '__timeout'    : cherrypy.cpg.getConfig('session', 'timeout') * 60,
+                   '__maxAge'     : None,
+                   '__lastAccess' : time.time(),
+                   '__sessionKey' : self.generateSessionId()
+                  })
+        return ns.copy()
+ 
+    def __getitem__(self, sessionKey):
+        sessionStorageFileDir = cherrypy.cpg.getConfig('session', 'storageFileDir')
+        fname = os.path.join(sessionStorageFileDir, sessionKey)
+        if os.path.exists(fname):
+            f = open(fname, "rb")
+            sessionData = pickle.load(f)
+            f.close()
+            return sessionData
+        else: return None
+    __getitem__ = sessionReader(__getitem__)
+    
+    def __setitem__(self, sessionKey, sessionData):
+        sessionStorageFileDir = cherrypy.cpg.getConfig('session', 'storageFileDir')
+    
+        fname=os.path.join(sessionStorageFileDir,sessionKey)
+        f = open(fname,"wb")
+        pickle.dump(sessionData, f)
+        f.close()
+    __setitem__ = sessionWriter(__setitem__)
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def __setitem__(self, sessionId, value):
-        self.__data['expirationTime'] = time.time() + cherrypy.cpg.getConfig('session', 'timeout') * 60
-        self.__data[sessionId] = value
-
-    def cleanUpOldSessions(self):
-        now = time.time()
-        for key in __data:
-            if __data[key]['expirationTime']:
-                del __data[key]

branches/ticket-132/cherrypy/lib/session/ramsession.py

@@ -28 +28 @@
-
-import time
-
+
+
-import cherrypy.cpg
-import mrow
@@ -45 +46 @@
-            self.dataKeys = {}
-    __lock = mrow.RWLock()
+    
-    def sessionReader(sessionFunc):
-        """Decorates a function as being a reader of the sessionMap.
@@ -109 +111 @@
-        now = time.time()
-        for sessionKey in __data:
-
-
-
+
+
+
+
-            if (timeout and timeout < sessionAge) or (maxAge and  maxAge < sessionAge):
-lf
+ssionData
-

branches/ticket-132/cherrypy/lib/session/sessionmap.py

@@ -55 +55 @@
-
-    def __init__(self, sessionData = {}):
-
+.copy()
-
-    """