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

speed up convert_attribute_members

Browse Source 
A workaround to avoid usage of slow LDAPEntry._sync_attr #4946

https://fedorahosted.org/freeipa/ticket/4965

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Petr Vobornik
2015-03-18 18:48:54 +01:00
committed by Jan Cholasta
parent b48cfe05e9
commit e4930b3235
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ipalib/plugins/baseldap.py
View File

@@ -631,17 +631,37 @@ class LDAPObject(Object):
def convert_attribute_members(self, entry_attrs, *keys, **options):
if options.get('raw', False):
return
container_dns = {}
new_attrs = {}
for attr in self.attribute_members:
for member in entry_attrs.setdefault(attr, []):
try:
value = entry_attrs.raw[attr]
except KeyError:
continue
del entry_attrs[attr]
for member in value:
memberdn = DN(member)
for ldap_obj_name in self.attribute_members[attr]:
ldap_obj = self.api.Object[ldap_obj_name]
container_dn = DN(ldap_obj.container_dn, api.env.basedn)
if member.endswith(container_dn):
new_attr = '%s_%s' % (attr, ldap_obj.name)
entry_attrs.setdefault(new_attr, []).append(
ldap_obj.get_primary_key_from_dn(member)
)
del entry_attrs[attr]
try:
container_dn = container_dns[ldap_obj_name]
except KeyError:
container_dn = DN(ldap_obj.container_dn, api.env.basedn)
container_dns[ldap_obj_name] = container_dn
if memberdn.endswith(container_dn):
new_value = ldap_obj.get_primary_key_from_dn(memberdn)
new_attr_name = '%s_%s' % (attr, ldap_obj.name)
try:
new_attr = new_attrs[new_attr_name]
except KeyError:
new_attr = entry_attrs.setdefault(new_attr_name, [])
new_attrs[new_attr_name] = new_attr
new_attr.append(new_value)
break
def get_password_attributes(self, ldap, dn, entry_attrs):
"""