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

sudorule: reduce number of LDAP searches during modification

Browse Source 
Combining the existence check with the sudoorder handling
allows to reduce the number of searches during a sudorule
modification by removing a call to sudorule-show.

Related: https://pagure.io/freeipa/issue/8780
Signed-off-by: Antonio Torres <antorres@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Antonio Torres 2021-03-26 14:27:32 +01:00 committed by Florence Blanc-Renaud
parent 7855c77f93
commit ffff9f8d7e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ipaserver/plugins/sudorule.py
View File

@ -410,21 +410,20 @@ class sudorule_mod(LDAPUpdate):
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
assert isinstance(dn, DN) assert isinstance(dn, DN)
if 'sudoorder' in options:
new_order = options.get('sudoorder')
old_entry = self.api.Command.sudorule_show(keys[-1])['result']
if 'sudoorder' in old_entry:
old_order = int(old_entry['sudoorder'][0])
if old_order != new_order:
self.obj.check_order_uniqueness(*keys, **options)
else:
self.obj.check_order_uniqueness(*keys, **options)
try: try:
_entry_attrs = ldap.get_entry(dn, self.obj.default_attributes) _entry_attrs = ldap.get_entry(dn, self.obj.default_attributes)
except errors.NotFound: except errors.NotFound:
raise self.obj.handle_not_found(*keys) raise self.obj.handle_not_found(*keys)
if 'sudoorder' in options:
new_order = options.get('sudoorder')
if 'sudoorder' in _entry_attrs:
old_order = int(_entry_attrs['sudoorder'][0])
if old_order != new_order:
self.obj.check_order_uniqueness(*keys, **options)
else:
self.obj.check_order_uniqueness(*keys, **options)
error = _("%(type)s category cannot be set to 'all' " error = _("%(type)s category cannot be set to 'all' "
"while there are allowed %(objects)s") "while there are allowed %(objects)s")