Use python logging in install / log cherrypy at right severity

[cascardo/ipsilon.git] / ipsilon / util / user.py

diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
old mode 100755 (executable)
new mode 100644 (file)
index 2731d3c..38449cc
--- 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,9 +15,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 ipsilon.util.data import Store
+from ipsilon.util.data import UserStore
 from ipsilon.util.log import Log
 import cherrypy
+import logging
 
 
 class Site(object):
@@ -39,8 +38,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
@@ -98,6 +97,14 @@ class 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(Log):
     def __init__(self):
@@ -115,6 +122,8 @@ class UserSession(Log):
 
     def login(self, username, userattrs=None):
         if self.user == username:
+            if userattrs and not self.get_user_attrs():
+                self.save_user_attrs(userattrs)
             return
 
         # REMOTE_USER changed, replace user
@@ -134,7 +143,8 @@ class UserSession(Log):
             if not type(user) is User:
                 raise TypeError
             # Completely reset user data
-            cherrypy.log.error('%s %s' % (user.name, user.fullname))
+            cherrypy.log.error('%s %s' % (user.name, user.fullname),
+                               severity=logging.INFO)
             user.reset()
 
         # Destroy current session in all cases
@@ -148,17 +158,30 @@ class UserSession(Log):
 
     def save_user_attrs(self, userattrs):
         cherrypy.session['userattrs'] = userattrs
-        cherrypy.session.save()
-        self._debug('Saved user attrs')
+        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
+        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:
             cherrypy.session[facility] = dict()
         cherrypy.session[facility][name] = data
-        cherrypy.session.save()
-        self._debug('Saved session data named [%s:%s]' % (facility, name))
+        self.debug('Saved session data named [%s:%s]' % (facility, name))
 
     def get_data(self, facility, name):
         """ Get named data in the session if available """
@@ -176,8 +199,7 @@ class UserSession(Log):
                 return
             cherrypy.session[facility][name] = None
             del cherrypy.session[facility][name]
-            self._debug('Nuked session data named [%s:%s]' % (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 facility [%s]' % (facility,))