X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Futil%2Fuser.py;h=9dc0d65e13073c719721a39362d4c1615a3a9246;hp=f47c0728da9514be5685cadbc0d17b288a015a3d;hb=f7b6d96d284f78b8ee94d252b37e874dc32baf2b;hpb=c4aa2a8fc207d464aa23e065b5f2ad0549a58f5e

diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index f47c072..9dc0d65 100755
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -18,6 +18,7 @@
 # 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
 
 
@@ -98,30 +99,35 @@ class User(object):
         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:
@@ -134,6 +140,18 @@ class UserSession(object):
         # 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: