Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow formdata to handle errors better.
[wrw.git]
/
wrw
/
session.py
diff --git
a/wrw/session.py
b/wrw/session.py
index
e7d8581
..
f9b4a3f
100644
(file)
--- a/
wrw/session.py
+++ b/
wrw/session.py
@@
-1,23
+1,14
@@
-import threading, time, pickle, random, os
+import threading, time, pickle, random, os
, binascii
from . import cookie, env
__all__ = ["db", "get"]
from . import cookie, env
__all__ = ["db", "get"]
-def hexencode(str):
- ret = ""
- for byte in str:
- ret += "%02X" % (ord(byte),)
- return ret
-
def gennonce(length):
def gennonce(length):
- nonce = ""
- for i in range(length):
- nonce += chr(random.randint(0, 255))
- return nonce
+ return os.urandom(length)
class session(object):
def __init__(self, lock, expire=86400 * 7):
class session(object):
def __init__(self, lock, expire=86400 * 7):
- self.id =
hexencode(gennonce(16)
)
+ self.id =
binascii.b2a_hex(gennonce(16)).decode("us-ascii"
)
self.dict = {}
self.lock = lock
self.ctime = self.atime = self.mtime = int(time.time())
self.dict = {}
self.lock = lock
self.ctime = self.atime = self.mtime = int(time.time())