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

Don't pass along the kw dictionary we were passed by XML-RPC.

Browse Source 
We generally want to just search indexed attributes. We get this list
of attributes from the configuration, use it.
This commit is contained in:
Rob Crittenden 2008-12-10 16:45:07 -05:00
parent af7b5645af
commit 46bd3974af
5 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipalib/plugins/f_group.py
View File

@ -184,13 +184,14 @@ class group_find(crud.Find):
search_fields_conf_str = config.get('ipagroupsearchfields') search_fields_conf_str = config.get('ipagroupsearchfields')
search_fields = search_fields_conf_str.split(",") search_fields = search_fields_conf_str.split(",")
search_kw = {}
for s in search_fields: for s in search_fields:
kw[s] = term search_kw[s] = term
object_type = ldap.get_object_type("cn") object_type = ldap.get_object_type("cn")
if object_type and not kw.get('objectclass'): if object_type and not kw.get('objectclass'):
kw['objectclass'] = object_type search_kw['objectclass'] = object_type
return ldap.search(**kw) return ldap.search(**search_kw)
def output_for_cli(self, textui, result, uid, **options): def output_for_cli(self, textui, result, uid, **options):
counter = result[0] counter = result[0]

11
ipalib/plugins/f_host.py
View File

@ -229,16 +229,17 @@ class host_find(crud.Find):
#search_fields = search_fields_conf_str.split(",") #search_fields = search_fields_conf_str.split(",")
search_fields = ['cn','serverhostname','description','localityname','nshostlocation','nshardwareplatform','nsosversion'] search_fields = ['cn','serverhostname','description','localityname','nshostlocation','nshardwareplatform','nsosversion']
search_kw = {}
for s in search_fields: for s in search_fields:
kw[s] = term search_kw[s] = term
# Can't use ldap.get_object_type() since cn is also used for group dns # Can't use ldap.get_object_type() since cn is also used for group dns
kw['objectclass'] = "ipaHost" search_kw['objectclass'] = "ipaHost"
if kw.get('all', False): if kw.get('all', False):
kw['attributes'] = ['*'] search_kw['attributes'] = ['*']
else: else:
kw['attributes'] = default_attributes search_kw['attributes'] = default_attributes
return ldap.search(**kw) return ldap.search(**search_kw)
def output_for_cli(self, textui, result, *args, **options): def output_for_cli(self, textui, result, *args, **options):
counter = result[0] counter = result[0]
hosts = result[1:] hosts = result[1:]

7
ipalib/plugins/f_hostgroup.py
View File

@ -169,11 +169,12 @@ class hostgroup_find(crud.Find):
search_fields_conf_str = config.get('ipagroupsearchfields') search_fields_conf_str = config.get('ipagroupsearchfields')
search_fields = search_fields_conf_str.split(",") search_fields = search_fields_conf_str.split(",")
search_kw = {}
for s in search_fields: for s in search_fields:
kw[s] = term search_kw[s] = term
kw['objectclass'] = hostgroup_filter search_kw['objectclass'] = hostgroup_filter
return ldap.search(**kw) return ldap.search(**search_kw)
def output_for_cli(self, textui, result, *args, **options): def output_for_cli(self, textui, result, *args, **options):
counter = result[0] counter = result[0]

9
ipalib/plugins/f_service.py
View File

@ -149,14 +149,15 @@ class service_find(crud.Find):
def execute(self, principal, **kw): def execute(self, principal, **kw):
ldap = self.api.Backend.ldap ldap = self.api.Backend.ldap
kw['filter'] = "&(objectclass=krbPrincipalAux)(!(objectClass=posixAccount))(!(|(krbprincipalname=kadmin/*)(krbprincipalname=K/M@*)(krbprincipalname=krbtgt/*)))" search_kw = {}
kw['krbprincipalname'] = principal search_kw['filter'] = "&(objectclass=krbPrincipalAux)(!(objectClass=posixAccount))(!(|(krbprincipalname=kadmin/*)(krbprincipalname=K/M@*)(krbprincipalname=krbtgt/*)))"
search_kw['krbprincipalname'] = principal
object_type = ldap.get_object_type("krbprincipalname") object_type = ldap.get_object_type("krbprincipalname")
if object_type and not kw.get('objectclass'): if object_type and not kw.get('objectclass'):
kw['objectclass'] = object_type search_kw['objectclass'] = object_type
return ldap.search(**kw) return ldap.search(**search_kw)
def output_for_cli(self, textui, result, *args, **options): def output_for_cli(self, textui, result, *args, **options):
counter = result[0] counter = result[0]

11
ipalib/plugins/f_user.py
View File

@ -282,17 +282,18 @@ class user_find(crud.Find):
search_fields_conf_str = config.get('ipausersearchfields') search_fields_conf_str = config.get('ipausersearchfields')
search_fields = search_fields_conf_str.split(",") search_fields = search_fields_conf_str.split(",")
search_kw = {}
for s in search_fields: for s in search_fields:
kw[s] = term search_kw[s] = term
object_type = ldap.get_object_type("uid") object_type = ldap.get_object_type("uid")
if object_type and not kw.get('objectclass'): if object_type and not kw.get('objectclass'):
kw['objectclass'] = object_type search_kw['objectclass'] = object_type
if kw.get('all', False): if kw.get('all', False):
kw['attributes'] = ['*'] search_kw['attributes'] = ['*']
else: else:
kw['attributes'] = default_attributes search_kw['attributes'] = default_attributes
return ldap.search(**kw) return ldap.search(**search_kw)
def output_for_cli(self, textui, result, uid, **options): def output_for_cli(self, textui, result, uid, **options):
counter = result[0] counter = result[0]