Implement login plugin infrastructure

Signed-off-by: Simo Sorce <simo@redhat.com>

2 files changed, 49 insertions, 16 deletions

diff --git a/ipsilon/util/page.py b/ipsilon/util/page.py
index 18b5be2..0da0e37 100755
--- a/ipsilon/util/page.py
+++ b/ipsilon/util/page.py
@@ -17,45 +17,39 @@
 # 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.user import User
+from ipsilon.util.user import UserSession
 import cherrypy
 
 
 def protect():
-    if cherrypy.request.login:
-        user = cherrypy.session.get('user', None)
-        if user == cherrypy.request.login:
-            return
-        else:
-            cherrypy.session.regenerate()
-            cherrypy.session['user'] = cherrypy.request.login
+    UserSession().remote_login()
 
 
 class Page(object):
-    def __init__(self, template_env):
-        self._env = template_env
+    def __init__(self, site):
+        if not 'template_env' in site:
+            raise ValueError('Missing template environment')
+        self._site = site
         self.basepath = cherrypy.config.get('base.mount', "")
-        self.username = None
         self.user = None
 
     def __call__(self, *args, **kwargs):
         # pylint: disable=star-args
-        self.username = cherrypy.session.get('user', None)
-        self.user = User(self.username)
+        self.user = UserSession().get_user()
 
         if len(args) > 0:
             op = getattr(self, args[0], None)
             if callable(op) and getattr(self, args[0]+'.exposed', None):
-                return op(args[1:], **kwargs)
+                return op(*args[1:], **kwargs)
         else:
             op = getattr(self, 'root', None)
             if callable(op):
-                return op(**kwargs)
+                return op(*args, **kwargs)
 
         return self.default(*args, **kwargs)
 
     def _template(self, *args, **kwargs):
-        t = self._env.get_template(args[0])
+        t = self._site['template_env'].get_template(args[0])
         return t.render(basepath=self.basepath, user=self.user, **kwargs)
 
     def default(self, *args, **kwargs):
diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index ccca9fb..4f7df91 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
+import cherrypy
 
 
 class Site(object):
@@ -40,6 +41,10 @@ class User(object):
         store = Store()
         return store.get_user_preferences(username)
 
+    def reset(self):
+        self.name = None
+        self._userdata = dict()
+
     @property
     def is_admin(self):
         if 'is_admin' in self._userdata:
@@ -78,3 +83,37 @@ class User(object):
     def sites(self):
         #TODO: implement setting sites via the user object ?
         raise AttributeError
+
+
+class UserSession(object):
+    def __init__(self):
+        self.user = cherrypy.session.get('user', None)
+
+    def get_user(self):
+        return User(self.user)
+
+    def remote_login(self):
+        if cherrypy.request.login:
+            return self.login(cherrypy.request.login)
+
+    def login(self, username):
+        if self.user == username:
+            return
+
+        # REMOTE_USER changed, destroy old session and regenerate new
+        cherrypy.session.regenerate()
+        cherrypy.session['user'] = username
+        cherrypy.session.save()
+
+        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()