summaryrefslogtreecommitdiffstats
path: root/ipsilon/login
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2014-06-16 19:36:03 -0400
committerPatrick Uiterwijk <puiterwijk@redhat.com>2014-09-24 20:29:43 +0200
commite9e517a0385a321f2f42625f739469b79e33ac16 (patch)
tree7ca7ae1bdd36f95a772b5707d60122c60d48dc3d /ipsilon/login
parentaa7cd3ad8e6d51f51ae46b3a6a15a9021edfa595 (diff)
downloadipsilon-e9e517a0385a321f2f42625f739469b79e33ac16.tar.gz
ipsilon-e9e517a0385a321f2f42625f739469b79e33ac16.tar.xz
ipsilon-e9e517a0385a321f2f42625f739469b79e33ac16.zip
Add support for returning user attributes
Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Diffstat (limited to 'ipsilon/login')
-rwxr-xr-xipsilon/login/common.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/ipsilon/login/common.py b/ipsilon/login/common.py
index 9dbcc0f..7fb1342 100755
--- a/ipsilon/login/common.py
+++ b/ipsilon/login/common.py
@@ -22,6 +22,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
+from ipsilon.info.common import Info
import cherrypy
@@ -34,6 +35,7 @@ class LoginManagerBase(PluginObject, Log):
super(LoginManagerBase, self).__init__()
self.path = '/'
self.next_login = None
+ self.info = None
def redirect_to_path(self, path):
base = cherrypy.config.get('base.mount', "")
@@ -47,6 +49,14 @@ class LoginManagerBase(PluginObject, Log):
if not ref:
ref = cherrypy.config.get('base.mount', "") + '/'
+ if self.info:
+ userattrs = self.info.get_user_attrs(username)
+ if userdata:
+ userdata.update(userattrs or {})
+ else:
+ userdata = userattrs
+ self.debug("User %s attributes: %s" % (username, repr(userdata)))
+
if auth_type:
if userdata:
userdata.update({'auth_type': auth_type})
@@ -114,6 +124,9 @@ class LoginManagerBase(PluginObject, Log):
plugins['enabled'].append(self)
self._debug('Login plugin enabled: %s' % self.name)
+ # Get handle of the info plugin
+ self.info = root.info
+
def disable(self, site):
plugins = site[FACILITY]
if self not in plugins['enabled']:
@@ -193,6 +206,7 @@ class Login(Page):
def __init__(self, *args, **kwargs):
super(Login, self).__init__(*args, **kwargs)
self.first_login = None
+ self.info = Info()
loader = PluginLoader(Login, FACILITY, 'LoginManager')
self._site[FACILITY] = loader.get_plugin_data()