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

Do not remove the old masters when setting the attribute fails

Browse Source 
If the setting of server attribute fails (e.g. due to master not having
the associated role enabled) the error would pop up *after* the old
values were cleared from LDAP. Fix this behavior so that all checks are
performed before manipulating any data.

https://pagure.io/freeipa/issue/7029

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Martin Babinsky 2017-06-27 16:03:16 +02:00 committed by Martin Basti
parent f4d77533f5
commit e2e380e83b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ipaserver/servroles.py
View File

@ -371,11 +371,18 @@ class ServerAttribute(LDAPBasedProperty):
on the master
"""
ldap = api_instance.Backend.ldap2
master_dns = self._get_master_dns(api_instance, masters)
service_entries = self._get_masters_service_entries(ldap, master_dns)
for service_entry in service_entries:
self._add_attribute_to_svc_entry(ldap, service_entry)
def _check_receiving_masters_having_associated_role(self, api_instance,
masters):
assoc_role_providers = set(
self._get_assoc_role_providers(api_instance))
masters_set = set(masters)
ldap = api_instance.Backend.ldap2
masters_without_role = masters_set - assoc_role_providers
if masters_without_role:
@ -385,11 +392,6 @@ class ServerAttribute(LDAPBasedProperty):
{'role': self.associated_role.name})
)
master_dns = self._get_master_dns(api_instance, masters)
service_entries = self._get_masters_service_entries(ldap, master_dns)
for service_entry in service_entries:
self._add_attribute_to_svc_entry(ldap, service_entry)
def set(self, api_instance, masters):
"""
set the attribute on masters
@ -407,6 +409,9 @@ class ServerAttribute(LDAPBasedProperty):
if sorted(old_masters) == sorted(masters):
raise errors.EmptyModlist
self._check_receiving_masters_having_associated_role(
api_instance, masters)
if old_masters:
self._remove(api_instance, old_masters)