|
 |
821497 |
--- beaker/session.py.orig 2010-06-16 21:39:49.000000000 +0200
|
|
|
821497 |
+++ beaker/session.py 2013-08-13 13:03:01.662618580 +0200
|
|
|
821497 |
@@ -4,7 +4,7 @@
|
|
|
821497 |
import time
|
|
|
821497 |
from datetime import datetime, timedelta
|
|
|
821497 |
|
|
|
821497 |
-from beaker.crypto import hmac as HMAC, hmac_sha1 as SHA1, md5
|
|
|
821497 |
+from beaker.crypto import hmac as HMAC, hmac_sha1 as SHA1, sha1
|
|
|
821497 |
from beaker.util import pickle
|
|
|
821497 |
|
|
|
821497 |
from beaker import crypto
|
|
|
821497 |
@@ -121,10 +121,10 @@
|
|
|
821497 |
raise
|
|
|
821497 |
|
|
|
821497 |
def _create_id(self):
|
|
|
821497 |
- self.id = md5(
|
|
|
821497 |
- md5("%f%s%f%s" % (time.time(), id({}), random.random(),
|
|
|
821497 |
- getpid())).hexdigest(),
|
|
|
821497 |
- ).hexdigest()
|
|
|
821497 |
+ self.id = b64encode(
|
|
|
821497 |
+ sha1("%f%s%f%s" % (time.time(), id({}), random.random(),
|
|
|
821497 |
+ getpid())).digest()
|
|
|
821497 |
+ ).replace('+','-').replace('/','_').rstrip('=')
|
|
|
821497 |
self.is_new = True
|
|
|
821497 |
self.last_accessed = None
|
|
|
821497 |
if self.use_cookies:
|
|
|
821497 |
@@ -447,10 +447,9 @@
|
|
|
821497 |
return pickle.loads(data)
|
|
|
821497 |
|
|
|
821497 |
def _make_id(self):
|
|
|
821497 |
- return md5(md5(
|
|
|
821497 |
- "%f%s%f%s" % (time.time(), id({}), random.random(), getpid())
|
|
|
821497 |
- ).hexdigest()
|
|
|
821497 |
- ).hexdigest()
|
|
|
821497 |
+ return b64encode(
|
|
|
821497 |
+ sha1("%f%s%f%s" % (time.time(), id({}), random.random(), getpid())
|
|
|
821497 |
+ ).digest()).replace('+','-').replace('/','_').rstrip('=')
|
|
|
821497 |
|
|
|
821497 |
def save(self, accessed_only=False):
|
|
|
821497 |
"""Saves the data for this session to persistent storage"""
|