X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=ipsilon%2Futil%2Fuser.py;h=fd557a0e4a6295a62bf92058b5e730862f20740a;hb=4d234dc3956e8ac72d8e0eccc3c0d9594d1c85f8;hp=72c504153b90b979ed186fdce206b372eb5fb215;hpb=78198cc8a258ec9143c00b0b3c12d5c57a1f858d;p=cascardo%2Fipsilon.git

diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
old mode 100755
new mode 100644
index 72c5041..fd557a0
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
 # Copyright (C) 2013  Simo Sorce <simo@redhat.com>
 #
 # see file 'COPYING' for use and warranty information
@@ -17,7 +15,8 @@
 # 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
 
 
@@ -38,8 +37,8 @@ class User(object):
             self.name = username
 
     def _get_user_data(self, username):
-        store = Store()
-        return store.get_user_preferences(username)
+        store = UserStore()
+        return store.load_user_preferences(username)
 
     def reset(self):
         self.name = None
@@ -54,7 +53,7 @@ class User(object):
     @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
 
@@ -76,6 +75,13 @@ class User(object):
     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:
@@ -87,34 +93,47 @@ class User(object):
 
     @sites.setter
     def sites(self):
-        #TODO: implement setting sites via the user object ?
+        # TODO: implement setting sites via the user object ?
         raise AttributeError
 
+    def save_plugin_data(self, plugin, data):
+        store = UserStore()
+        store.save_plugin_data(plugin, self.name, data)
+
+    def load_plugin_data(self, plugin):
+        store = UserStore()
+        return store.load_plugin_data(plugin, self.name)
+
 
-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
 
-        cherrypy.log('LOGIN SUCCESSFUL: %s', 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)
 
     def logout(self, user):
         if user is not None:
@@ -127,6 +146,34 @@ 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 _get_provider_attr_name(self, provider):
+        return '%s_data' % provider
+
+    def get_provider_data(self, provider):
+        attr = self._get_provider_attr_name(provider)
+        data = None
+        if attr in cherrypy.session:
+            data = cherrypy.session[attr]
+        return data
+
+    def save_provider_data(self, provider, data):
+        attr = self._get_provider_attr_name(provider)
+        cherrypy.session[attr] = data
+        cherrypy.session.save()
+        self._debug('Saved %s provider data' % provider)
+
     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: