X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Futil%2Fuser.py;h=84f181897336a53a819e79524edbcef90363e6d6;hp=1241340ed637a2b497e99190b3617cbb4a121049;hb=71edd1146556eecb9f9375da46313e94bf82874c;hpb=84dcd4573e24b2a8901cecbe4ae15967564861e9

diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index 1241340..84f1818 100755
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -17,7 +17,10 @@
 # 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 util import data
+from ipsilon.util.data import Store
+from ipsilon.util.log import Log
+import cherrypy
+
 
 class Site(object):
     def __init__(self, value):
@@ -25,6 +28,7 @@ class Site(object):
         self.link = value
         self.name = value
 
+
 class User(object):
     def __init__(self, username):
         if username is None:
@@ -35,8 +39,18 @@ class User(object):
             self.name = username
 
     def _get_user_data(self, username):
-        store = data.Store()
-        return store._get_user_preferences(username)
+        store = Store()
+        return store.get_user_preferences(username)
+
+    def reset(self):
+        self.name = None
+        self._userdata = dict()
+
+    @property
+    def is_anonymous(self):
+        if self.name:
+            return False
+        return True
 
     @property
     def is_admin(self):
@@ -63,6 +77,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:
@@ -74,6 +95,71 @@ 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
 
+
+class UserSession(Log):
+    def __init__(self):
+        self.user = self.get_data('user', 'name')
+
+    def get_user(self):
+        return User(self.user)
+
+    def remote_login(self):
+        if 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
+        self.nuke_data('user')
+        self.save_data('user', 'name', username)
+        self.user = username
+
+        cherrypy.log('LOGIN SUCCESSFUL: %s' % username)
+
+    def logout(self, user):
+        if user is not None:
+            if not type(user) is User:
+                raise TypeError
+            # Completely reset user data
+            cherrypy.log.error('%s %s' % (user.name, user.fullname))
+            user.reset()
+
+        # Destroy current session in all cases
+        cherrypy.lib.sessions.expire()
+
+    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:
+            cherrypy.session[facility] = dict()
+        cherrypy.session[facility][name] = data
+        cherrypy.session.save()
+        self._debug('Saved session data named [%s:%s]' % (facility, name))
+
+    def get_data(self, facility, name):
+        """ Get named data in the session if available """
+        if facility not in cherrypy.session:
+            return None
+        if name not in cherrypy.session[facility]:
+            return None
+        return cherrypy.session[facility][name]
+
+    def nuke_data(self, facility, name=None):
+        if facility not in cherrypy.session:
+            return
+        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()