Attachment 10203 Details for Bug 37685

[patch] patch (git:fbest/37685-removal-of-school)

37685.patch (text/plain), 3.24 KB, created by Florian Best on 2019-10-14 14:10 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2019-10-14 14:10 CEST

Size: 3.24 KB

patch

obsolete

>commit 3b182a0df06698b6fd43ff9eba0b785dbbfd49a8
>Author: Florian Best <best@univention.de>
>Date:   Mon Oct 14 14:08:54 2019 +0200
>
>    Bug #37685: remove subtree twice to remove references objects before the referring object is removed
>    
>    When removing a school OU containing users assigned to groups in an
>    arbitraty order the removal might fail.
>
>diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
>index b70426682f..fca224aa62 100644
>--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
>+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py
>@@ -1507,23 +1507,10 @@ class simpleLdap(object):
> 		self.call_udm_property_hook('hook_ldap_pre_remove', self)
> 
> 		if remove_childs:
>-			subelements = []  # type: List[Tuple[str, Dict[str, List[str]]]]
>-			if 'FALSE' not in self.lo.getAttr(self.dn, 'hasSubordinates'):
>-				ud.debug(ud.ADMIN, ud.INFO, 'handlers/__init__._remove() children of base dn %s' % (self.dn,))
>-				subelements = self.lo.search(base=self.dn, scope='one', attr=[])
>-
>-			for subolddn, suboldattrs in subelements:
>-				ud.debug(ud.ADMIN, ud.INFO, 'remove: subelement %s' % (subolddn,))
>-				for submodule in univention.admin.modules.identify(subolddn, suboldattrs):
>-					subobject = submodule.object(None, self.lo, None, dn=subolddn, attributes=suboldattrs)
>-					subobject.open()
>-					try:
>-						subobject.remove(remove_childs)
>-					except univention.admin.uexceptions.base as exc:
>-						ud.debug(ud.ADMIN, ud.ERROR, 'remove: could not remove %r: %s: %s' % (subolddn, type(exc).__name__, exc))
>-					break
>-				else:
>-					ud.debug(ud.ADMIN, ud.WARN, 'remove: could not identify UDM module of %r' % (subolddn,))
>+			# remove twice: after the first removal some objects may be left over
>+			# a primary group can only be removed if all its members have been removed.
>+			self._remove_subtree()
>+			self._remove_subtree()
> 
> 		self.lo.delete(self.dn)
> 		self._exists = False
>@@ -1535,6 +1522,25 @@ class simpleLdap(object):
> 		self._write_admin_diary_remove()
> 		self.save()
> 
>+	def _remove_subtree(self):
>+		subelements = []  # type: List[Tuple[str, Dict[str, List[str]]]]
>+		if 'FALSE' not in self.lo.getAttr(self.dn, 'hasSubordinates'):
>+			ud.debug(ud.ADMIN, ud.INFO, 'handlers/__init__._remove() children of base dn %s' % (self.dn,))
>+			subelements = self.lo.search(base=self.dn, scope='one', attr=[])
>+
>+		for subolddn, suboldattrs in subelements:
>+			ud.debug(ud.ADMIN, ud.INFO, 'remove: subelement %s' % (subolddn,))
>+			for submodule in univention.admin.modules.identify(subolddn, suboldattrs):
>+				subobject = submodule.object(None, self.lo, None, dn=subolddn, attributes=suboldattrs)
>+				subobject.open()
>+				try:
>+					subobject.remove(remove_childs=True)
>+				except univention.admin.uexceptions.base as exc:
>+					ud.debug(ud.ADMIN, ud.ERROR, 'remove: could not remove %r: %s: %s' % (subolddn, type(exc).__name__, exc))
>+				break
>+			else:
>+				ud.debug(ud.ADMIN, ud.WARN, 'remove: could not identify UDM module of %r' % (subolddn,))
>+
> 	def _write_admin_diary_remove(self):
> 		self._write_admin_diary_event('REMOVED')
>

Actions: View | Diff

Attachments on bug 37685: 6642 | 10203