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

Optimize member/memberof searches in LDAP

Browse Source 
When investigating if member/memberof attribute is direct/indirect
we do a lot of LDAP SCOPE_SUBTREE searches when we actually search
just for one item. Make sure we search only with SCOPE_BASE to improve
the performance.

One not so efficient iteration was also changed to list comprehension
to speed things up a tiny bit.

https://fedorahosted.org/freeipa/ticket/1885
This commit is contained in:
Martin Kosek 2011-10-12 09:36:24 +02:00 committed by Rob Crittenden
parent 7227ffe864
commit 5aa6e994d1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipaserver/plugins/ldap2.py
View File

@ -1001,7 +1001,8 @@ class ldap2(CrudBackend, Encoder):
try: try:
(result, truncated) = self.find_entries(searchfilter, (result, truncated) = self.find_entries(searchfilter,
attr_list, member, time_limit=time_limit, attr_list, member, time_limit=time_limit,
size_limit=size_limit, normalize=normalize) size_limit=size_limit, scope=_ldap.SCOPE_BASE,
normalize=normalize)
results.append(list(result[0])) results.append(list(result[0]))
for m in result[0][1].get('member', []): for m in result[0][1].get('member', []):
# This member may contain other members, add it to our # This member may contain other members, add it to our
@ -1066,18 +1067,16 @@ class ldap2(CrudBackend, Encoder):
try: try:
(result, truncated) = self.find_entries(searchfilter, attr_list, (result, truncated) = self.find_entries(searchfilter, attr_list,
group, time_limit=time_limit,size_limit=size_limit, group, time_limit=time_limit,size_limit=size_limit,
normalize=normalize) scope=_ldap.SCOPE_BASE, normalize=normalize)
results.extend(list(result)) results.extend(list(result))
except errors.NotFound: except errors.NotFound:
pass pass
direct = [] direct = []
indirect = []
# If there is an exception here, it is likely due to a failure in # If there is an exception here, it is likely due to a failure in
# referential integrity. All members should have corresponding # referential integrity. All members should have corresponding
# memberOf entries. # memberOf entries.
for m in memberof: indirect = [ m.lower() for m in memberof ]
indirect.append(m.lower())
for r in results: for r in results:
direct.append(r[0]) direct.append(r[0])
try: try: