# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from ipsilon.util.data import Store
+from ipsilon.util.data import UserStore
+from ipsilon.util.log import Log
import cherrypy
self.name = username
def _get_user_data(self, username):
- store = Store()
- return store.get_user_preferences(username)
+ store = UserStore()
+ return store.load_options('users', username)
def reset(self):
self.name = None
@property
def is_admin(self):
if 'is_admin' in self._userdata:
- if self._userdata['is_admin'] == '1':
+ if str(self._userdata['is_admin']) == '1':
return True
return False
raise AttributeError
-class UserSession(object):
+class UserSession(Log):
def __init__(self):
self.user = self.get_data('user', 'name')
-
- def _debug(self, fact):
- if cherrypy.config.get('debug', False):
- cherrypy.log(fact)
+ self.userattrs = self.get_user_attrs()
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):
+ def login(self, username, userattrs=None):
if self.user == username:
return
# REMOTE_USER changed, replace user
self.nuke_data('user')
self.save_data('user', 'name', username)
+ self.user = username
+
+ # Save additional data provided by the login manager
+ self.nuke_data('userattrs')
+ if userattrs:
+ self.save_user_attrs(userattrs)
- cherrypy.log('LOGIN SUCCESSFUL: %s', username)
+ cherrypy.log('LOGIN SUCCESSFUL: %s' % username)
def logout(self, user):
if user is not None:
# Destroy current session in all cases
cherrypy.lib.sessions.expire()
+ def get_user_attrs(self):
+ userattrs = dict()
+ if 'userattrs' in cherrypy.session:
+ userattrs = cherrypy.session['userattrs']
+ return userattrs
+
+ def save_user_attrs(self, userattrs):
+ cherrypy.session['userattrs'] = userattrs
+ cherrypy.session.save()
+ self._debug('Saved user attrs')
+ self.userattrs = userattrs
+
def save_data(self, facility, name, data):
""" Save named data in the session so it can be retrieved later """
if facility not in cherrypy.session: