IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

IPA-EPN: Use a helper to retrieve LDAP attributes from an entry

Browse Source 
Allow for empty attributes.

Reviewed-By: Francois Cami <fcami@redhat.com>
This commit is contained in:
François Cami 2020-08-06 17:07:36 +02:00 committed by Rob Crittenden
parent 0dc084a34f
commit 5fc526b1af
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ipaclient/install/ipa_epn.py
View File

@ -122,22 +122,30 @@ class EPNUserList:
"""Return len(self).""" """Return len(self)."""
return len(self._expiring_password_user_dq) return len(self._expiring_password_user_dq)
def get_ldap_attr(self, entry, attr):
"""Get a single value from a multi-valued attr in a safe way"""
return str(entry.get(attr, [""]).pop(0))
def add(self, entry): def add(self, entry):
"""Parses and appends an LDAP user entry with the uid, cn, """Parses and appends an LDAP user entry with the uid, cn,
givenname, sn, krbpasswordexpiration and mail attributes. givenname, sn, krbpasswordexpiration and mail attributes.
""" """
try: try:
self._sorted = False self._sorted = False
if entry.get("mail") is None:
logger.error("IPA-EPN: No mail address defined for: %s",
entry.dn)
return
self._expiring_password_user_dq.append( self._expiring_password_user_dq.append(
dict( dict(
uid=str(entry["uid"].pop(0)), uid=self.get_ldap_attr(entry, "uid"),
cn=str(entry["cn"].pop(0)), cn=self.get_ldap_attr(entry, "cn"),
givenname=str(entry["givenname"].pop(0)), givenname=self.get_ldap_attr(entry, "givenname"),
sn=str(entry["sn"].pop(0)), sn=self.get_ldap_attr(entry, "sn"),
krbpasswordexpiration=str( krbpasswordexpiration=(
entry["krbpasswordexpiration"].pop(0) self.get_ldap_attr(entry,"krbpasswordexpiration")
), ),
mail=str(entry["mail"]), mail=str(entry.get("mail")),
) )
) )
except IndexError as e: except IndexError as e: