Changeset Navigation

Changeset 1240

Timestamp:

08/12/06 02:08:01

Author:

fumanchu

Message:

Fix for #408 (SessionFilter? doesn't check result of generateSessionID() against sessionStorage).

Files:

r1239	r1240
38	38	clean_thread = None
39	39
40		def __init__(self, id=None):
	40	def __init__(self, id=None, **kwargs):
41	41	self.locked = False
42	42	self.loaded = False
43	43	self._data = {}
44	44
45		if id is None:
46		id = self.generate_id()
	45	for k, v in kwargs.iteritems():
	46	setattr(self, k, v)
	47
47	48	self.id = id
	49	while self.id is None:
	50	self.id = self.generate_id()
	51	# Assert that the generated id is not already stored.
	52	if self._load() is not None:
	53	self.id = None
48	54
49	55	def clean_cycle(self):
…	…
369	375	# the requested session data.
370	376	storage_class = storage_type.title() + 'Session'
371		cherrypy.serving.session = sess = globals()[storage_class](id)
372		sess.timeout = timeout
373		sess.clean_freq = clean_freq
374		for k, v in kwargs.iteritems():
375		setattr(sess, k, v)
	377	kwargs['timeout'] = timeout
	378	kwargs['clean_freq'] = clean_freq
	379	cherrypy.serving.session = sess = globals()[storage_class](id, **kwargs)
376	380
377	381	if locking == 'implicit':