Attachment 10816 Details for Bug 50593 – patch (git:fbest/50593-s4-connector-ping-pong)

[patch] patch (git:fbest/50593-s4-connector-ping-pong)

50593.patch (text/plain), 2.15 KB, created by Florian Best on 2021-09-07 15:01:19 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2021-09-07 15:01:19 CEST

Size: 2.15 KB

patch

obsolete

>commit 44dd42d2e41d258a540b51e301b4aff7692bd190
>Author: Florian Best <best@univention.de>
>Date:   Tue Sep 7 14:58:37 2021 +0200
>
>    Bug #50593: do not remove/add users in sync_to_ucs if they were recently removed "by" UCS
>    
>    * Bug #50593: Objects in UCS are now compared by their entryUUID/objectGUID
>      before deletion, so that a new object with the same DN is not mistakenly
>      deleted.
>
>diff --git services/univention-s4-connector/modules/univention/s4connector/__init__.py services/univention-s4-connector/modules/univention/s4connector/__init__.py
>index 7874e993b9..0eb4298ef6 100644
>--- services/univention-s4-connector/modules/univention/s4connector/__init__.py
>+++ services/univention-s4-connector/modules/univention/s4connector/__init__.py
>@@ -1167,6 +1167,14 @@ class ucs(object):
> 				ud.debug(ud.LDAP, ud.INFO, '__set_values: Skip: %s' % con_attribute)
> 
> 	def add_in_ucs(self, property_type, object, module, position):
>+		objectGUID = object['attributes'].get('objectGUID', [None])[0]  # to compensate for __object_from_element
>+		if objectGUID:
>+			objectGUID = decode_guid(objectGUID)
>+
>+		entryUUID = self._get_entryUUID(object['dn'])
>+		if objectGUID and self.was_objectGUID_deleted_by_ucs(objectGUID):
>+			ud.debug(ud.LDAP, ud.PROCESS, "add_in_ucs: object %s already deleted in UCS, ignoring create" % object['dn'])
>+			return True
> 
> 		# reload extended attributes  # FIXME: maybe not necessary
> 		univention.admin.modules.init(self.lo, univention.admin.uldap.position(self.lo.base), module)
>@@ -1276,10 +1284,9 @@ class ucs(object):
> 			objectGUID = decode_guid(objectGUID)
> 		entryUUID = self._get_entryUUID(object['dn'])
> 
>-		if property_type in ['ou', 'container']:
>-			if objectGUID and self.was_objectGUID_deleted_by_ucs(objectGUID):
>-				ud.debug(ud.LDAP, ud.PROCESS, "delete_in_ucs: object %s already deleted in UCS, ignoring delete" % object['dn'])
>-				return True
>+		if objectGUID and self.was_objectGUID_deleted_by_ucs(objectGUID):
>+			ud.debug(ud.LDAP, ud.PROCESS, "delete_in_ucs: object %s already deleted in UCS, ignoring delete" % object['dn'])
>+			return True
> 
> 		if property_type == 'windowscomputer':
> 			# Special handling for windows computer:

Actions: View | Diff

Attachments on bug 50593: 10816