# along with this program. If not, see <http://www.gnu.org/licenses/>.
from ipsilon.util.data import Store
+from ipsilon.util.log import Log
import cherrypy
self.name = None
self._userdata = dict()
+ @property
+ def is_anonymous(self):
+ if self.name:
+ return False
+ return True
+
@property
def is_admin(self):
if 'is_admin' in self._userdata:
def fullname(self, value):
self._userdata['fullname'] = value
+ @property
+ def email(self):
+ if 'email' in self._userdata:
+ return self._userdata['email']
+ else:
+ return None
+
@property
def sites(self):
if 'sites' in self._userdata:
@sites.setter
def sites(self):
- #TODO: implement setting sites via the user object ?
+ # TODO: implement setting sites via the user object ?
raise AttributeError
-class UserSession(object):
+class UserSession(Log):
def __init__(self):
- self.user = cherrypy.session.get('user', None)
-
- def _debug(self, fact):
- if cherrypy.config.get('debug', False):
- cherrypy.log(fact)
+ self.user = self.get_data('user', 'name')
def get_user(self):
return User(self.user)
def remote_login(self):
if cherrypy.request.login:
- return self.login(cherrypy.request.login)
+ self.login(cherrypy.request.login)
+ else:
+ self.nuke_data('user')
def login(self, username):
if self.user == username:
return
# REMOTE_USER changed, replace user
- cherrypy.session['user'] = username
- cherrypy.session.save()
+ self.nuke_data('user')
+ self.save_data('user', 'name', username)
+ self.user = username
- cherrypy.log('LOGIN SUCCESSFUL: %s', username)
+ cherrypy.log('LOGIN SUCCESSFUL: %s' % username)
def logout(self, user):
if user is not None:
return None
return cherrypy.session[facility][name]
- def nuke_data(self, facility, name):
+ def nuke_data(self, facility, name=None):
if facility not in cherrypy.session:
return
- if name not in cherrypy.session[facility]:
- return
- cherrypy.session[facility][name] = None
- del cherrypy.session[facility][name]
+ if name:
+ if name not in cherrypy.session[facility]:
+ return
+ cherrypy.session[facility][name] = None
+ del cherrypy.session[facility][name]
+ self._debug('Nuked session data named [%s:%s]' % (facility, name))
+ else:
+ del cherrypy.session[facility]
+ self._debug('Nuked session facility [%s]' % (facility,))
cherrypy.session.save()
- self._debug('Nuked session data named [%s:%s]' % (facility, name))