diff options
| author | Simo Sorce <simo@redhat.com> | 2015-02-16 14:04:49 -0500 |
|---|---|---|
| committer | Patrick Uiterwijk <puiterwijk@redhat.com> | 2015-02-24 16:37:38 +0100 |
| commit | 771b8fd095f3bcb922f761d297c62f1a56a997d5 (patch) | |
| tree | a0b588a1135f97abf6ddff141cb461b1fd389685 /ipsilon/info | |
| parent | dd8a2ecf15a7f74e2fe3d8c5ea0ff5e2fed20927 (diff) | |
| download | ipsilon-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/info')
| -rw-r--r-- | ipsilon/info/infoldap.py | 6 | ||||
| -rw-r--r-- | ipsilon/info/infosssd.py | 6 | ||||
| -rw-r--r-- | ipsilon/info/nss.py | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ipsilon/info/infoldap.py b/ipsilon/info/infoldap.py index efdb649..0ec6dd1 100644 --- a/ipsilon/info/infoldap.py +++ b/ipsilon/info/infoldap.py @@ -129,9 +129,9 @@ Info plugin that uses LDAP to retrieve user data. """ ldapattrs = self._get_user_data(conn, dn) userattrs, extras = self.mapper.map_attrs(ldapattrs) groups = self._get_user_groups(conn, dn, ldapattrs) - reply['userdata'] = userattrs - reply['groups'] = groups - reply['extras'] = {'ldap': extras} + reply = userattrs + reply['_groups'] = groups + reply['_extras'] = {'ldap': extras} except Exception, e: # pylint: disable=broad-except self.error(e) diff --git a/ipsilon/info/infosssd.py b/ipsilon/info/infosssd.py index b187567..63ffecc 100644 --- a/ipsilon/info/infosssd.py +++ b/ipsilon/info/infosssd.py @@ -72,9 +72,9 @@ class InfoProvider(InfoProviderBase): try: attrs, groups = self._get_user_data(user) userattrs, extras = self.mapper.map_attrs(attrs) - reply['userdata'] = userattrs - reply['groups'] = groups - reply['extras'] = {'sssd': extras} + reply = userattrs + reply['_groups'] = groups + reply['_extras'] = {'sssd': extras} except KeyError: pass diff --git a/ipsilon/info/nss.py b/ipsilon/info/nss.py index 1107387..2f4039a 100644 --- a/ipsilon/info/nss.py +++ b/ipsilon/info/nss.py @@ -61,9 +61,9 @@ class InfoProvider(InfoProviderBase): userattrs, extras = self.mapper.map_attrs(posix_user) groups = self._get_posix_groups(posix_user['username'], posix_user['gidNumber']) - reply['userdata'] = userattrs - reply['groups'] = groups - reply['extras'] = {'posix': extras} + reply = userattrs + reply['_groups'] = groups + reply['_extras'] = {'posix': extras} except KeyError: pass |