X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Flogin%2Fcommon.py;h=d2905217f049b825f8fee342e52cc1eb950df076;hp=416ff31f7358611c2888ad03fa0e5abac5a149df;hb=1d7df9dbac43b63424ee07ebfb86c6a106dcb43c;hpb=2fb8bff093e49d95ab25eb8343ebbb1091f6e7a6

diff --git a/ipsilon/login/common.py b/ipsilon/login/common.py
index 416ff31..d290521 100755
--- a/ipsilon/login/common.py
+++ b/ipsilon/login/common.py
@@ -20,6 +20,7 @@
 from ipsilon.util.page import Page
 from ipsilon.util.user import UserSession
 from ipsilon.util.plugin import PluginLoader, PluginObject
+from ipsilon.util.plugin import PluginInstaller
 import cherrypy
 
 
@@ -34,25 +35,38 @@ class LoginManagerBase(PluginObject):
         base = cherrypy.config.get('base.mount', "")
         raise cherrypy.HTTPRedirect('%s/login/%s' % (base, path))
 
-    def auth_successful(self, username):
+    def auth_successful(self, username, userdata=None):
         # save ref before calling UserSession login() as it
         # may regenerate the session
-        ref = '/idp'
-        if 'referral' in cherrypy.session:
-            ref = cherrypy.session['referral']
+        session = UserSession()
+        ref = session.get_data('login', 'Return')
+        if not ref:
+            ref = cherrypy.config.get('base.mount', "") + '/'
+
+        session.login(username)
+
+        # Save additional data provided by the login manager
+        if userdata:
+            for key in userdata:
+                session.save_data('user', key, userdata[key])
 
-        UserSession().login(username)
         raise cherrypy.HTTPRedirect(ref)
 
     def auth_failed(self):
-        # Just make sure we destroy the session
-        UserSession().logout(None)
-
+        # try with next module
         if self.next_login:
             return self.redirect_to_path(self.next_login.path)
 
-        # FIXME: show an error page instead
-        raise cherrypy.HTTPError(401)
+        # return to the caller if any
+        session = UserSession()
+        ref = session.get_data('login', 'Return')
+
+        # otherwise destroy session and return error
+        if not ref:
+            session.logout(None)
+            raise cherrypy.HTTPError(401)
+
+        raise cherrypy.HTTPRedirect(ref)
 
 
 class LoginPageBase(Page):
@@ -78,12 +92,15 @@ class Login(Page):
         self._site[FACILITY] = loader.get_plugin_data()
         plugins = self._site[FACILITY]
 
+        available = plugins['available'].keys()
+        self._debug('Available login managers: %s' % str(available))
+
         prev_obj = None
-        for item in plugins['available']:
-            self._log('Login plugin available: %s' % item)
-            if item not in plugins['whitelist']:
+        for item in plugins['whitelist']:
+            self._debug('Login plugin in whitelist: %s' % item)
+            if item not in plugins['available']:
                 continue
-            self._log('Login plugin enabled: %s' % item)
+            self._debug('Login plugin enabled: %s' % item)
             plugins['enabled'].append(item)
             obj = plugins['available'][item]
             if prev_obj:
@@ -95,10 +112,6 @@ class Login(Page):
                 obj.set_config(plugins['config'][item])
             self.__dict__[item] = obj.get_tree(self._site)
 
-    def _log(self, fact):
-        if cherrypy.config.get('debug', False):
-            cherrypy.log(fact)
-
     def root(self, *args, **kwargs):
         if self.first_login:
             raise cherrypy.HTTPRedirect('%s/login/%s' %
@@ -112,3 +125,10 @@ class Logout(Page):
     def root(self, *args, **kwargs):
         UserSession().logout(self.user)
         return self._template('logout.html', title='Logout')
+
+
+class LoginMgrsInstall(object):
+
+    def __init__(self):
+        pi = PluginInstaller(LoginMgrsInstall)
+        self.plugins = pi.get_plugins()