summaryrefslogtreecommitdiffstats
path: root/ipsilon/login/authldap.py
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2015-02-16 14:04:49 -0500
committerPatrick Uiterwijk <puiterwijk@redhat.com>2015-02-24 16:37:38 +0100
commit771b8fd095f3bcb922f761d297c62f1a56a997d5 (patch)
treea0b588a1135f97abf6ddff141cb461b1fd389685 /ipsilon/login/authldap.py
parentdd8a2ecf15a7f74e2fe3d8c5ea0ff5e2fed20927 (diff)
downloadipsilon-771b8fd095f3bcb922f761d297c62f1a56a997d5.tar.gz
ipsilon-771b8fd095f3bcb922f761d297c62f1a56a997d5.tar.xz
ipsilon-771b8fd095f3bcb922f761d297c62f1a56a997d5.zip
Prefix userdata hives with _ to avoid conflicts
The main userdata dict contains common attributes, but we add a sepcial groups list and unmapped extras, as well as indicators like auth_type. All these additional attributes are now prefixed by a _ character so that conflicts with legitimate attributes are improbable. Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Diffstat (limited to 'ipsilon/login/authldap.py')
-rw-r--r--ipsilon/login/authldap.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/ipsilon/login/authldap.py b/ipsilon/login/authldap.py
index 5899ed2..8958410 100644
--- a/ipsilon/login/authldap.py
+++ b/ipsilon/login/authldap.py
@@ -62,15 +62,7 @@ class LDAP(LoginFormBase, Log):
if username and password:
try:
- userdata = self._authenticate(username, password)
- if userdata:
- userattrs = dict()
- for d, v in userdata.get('userdata', {}).items():
- userattrs[d] = v
- if 'groups' in userdata:
- userattrs['groups'] = userdata['groups']
- if 'extras' in userdata:
- userattrs['extras'] = userdata['extras']
+ userattrs = self._authenticate(username, password)
authed = True
except Exception, e: # pylint: disable=broad-except
errmsg = "Authentication failed"