import threading, time, pickle, random, os
-import cookie, env
+from . import cookie, env, proto
__all__ = ["db", "get"]
-def hexencode(str):
- ret = ""
- for byte in str:
- ret += "%02X" % (ord(byte),)
- return ret
-
def gennonce(length):
- nonce = ""
- for i in xrange(length):
- nonce += chr(random.randint(0, 255))
- return nonce
+ return os.urandom(length)
class session(object):
- def __init__(self, lock, expire = 86400 * 7):
- self.id = hexencode(gennonce(16))
+ def __init__(self, lock, expire=86400 * 7):
+ self.id = proto.enhex(gennonce(16))
self.dict = {}
self.lock = lock
self.ctime = self.atime = self.mtime = int(time.time())
def __getitem__(self, key):
return self.dict[key]
- def get(self, key, default = None):
+ def get(self, key, default=None):
return self.dict.get(key, default)
def __setitem__(self, key, value):
self.__dict__[k] = v
# The proper lock is set by the thawer
+ def __repr__(self):
+ return "<session %s>" % self.id
+
class db(object):
- def __init__(self, backdb = None, cookiename = "wrwsess", path = "/"):
+ def __init__(self, backdb=None, cookiename="wrwsess", path="/"):
self.live = {}
self.cookiename = cookiename
self.path = path
def clean(self):
now = int(time.time())
with self.lock:
- clist = self.live.keys()
+ clist = list(self.live.keys())
for sessid in clist:
with self.lock:
try:
else:
raise Exception("Illegal session entry: " + repr(entry[1]))
- def fetch(self, req):
- now = int(time.time())
- sessid = cookie.get(req, self.cookiename)
- new = False
+ def checkclean(self):
with self.lock:
if self.cthread is None:
self.cthread = threading.Thread(target = self.cleanloop)
self.cthread.setDaemon(True)
self.cthread.start()
+
+ def mksession(self, req):
+ return session(threading.RLock())
+
+ def mkcookie(self, req, sess):
+ cookie.add(req, self.cookiename, sess.id,
+ path=self.path,
+ expires=cookie.cdate(time.time() + sess.expire))
+
+ def fetch(self, req):
+ now = int(time.time())
+ sessid = cookie.get(req, self.cookiename)
+ new = False
try:
if sessid is None:
raise KeyError()
sess = self._fetch(sessid)
except KeyError:
- sess = session(threading.RLock())
+ sess = self.mksession(req)
new = True
def ckfreeze(req):
if sess.dirty():
if new:
- cookie.add(req, self.cookiename, sess.id, self.path)
+ self.mkcookie(req, sess)
with self.lock:
self.live[sess.id] = [sess.lock, sess]
try:
self.freeze(sess)
except:
pass
+ self.checkclean()
req.oncommit(ckfreeze)
return sess
data = self.backdb[sessid]
try:
return pickle.loads(data)
- except Exception, e:
+ except:
raise KeyError()
def freeze(self, sess):
with open(os.path.join(self.path, key), "w") as out:
out.write(value)
-default = env.var(db(backdb = dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid())))))
+default = env.var(db(backdb=dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid())))))
def get(req):
return default.val.get(req)