Attachment 8754 Details for Bug 44276

[patch] proposed_s4_connector_utf8_fixes.patch

proposed_s4_connector_utf8_fixes.patch (text/plain), 4.54 KB, created by Arvid Requate on 2017-04-04 19:20 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2017-04-04 19:20 CEST

Size: 4.54 KB

patch

obsolete

>Index: modules/univention/s4connector/s4/__init__.py
>===================================================================
>--- modules/univention/s4connector/s4/__init__.py	(Revision 78659)
>+++ modules/univention/s4connector/s4/__init__.py	(Arbeitskopie)
>@@ -323,26 +323,26 @@
> 						except UnicodeDecodeError:
> 							pass  # values are not the same codec
> 
>-				filter_parts_s4 = [format_escaped('(objectclass={0!e})', ocs4), format_escaped('(samaccountname={0!e})', value)]
>+				filter_parts_s4 = [format_escaped(u'(objectclass={0!e})', ocs4), format_escaped(u'(samaccountname={0!e})', value)]
> 				if dn_attr and dn_attr_val:
> 					# also look for dn attr (needed to detect modrdn)
>-					filter_parts_s4.append(format_escaped('({0}={1!e})', dn_attr, dn_attr_val))
>+					filter_parts_s4.append(format_escaped(u'({0}={1!e})', dn_attr, dn_attr_val))
> 				filter_s4 = compatible_modstring(u'(&{})'.format(''.join(filter_parts_s4)))
> 				ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: search in s4 for %s" % filter_s4)
> 				result = s4connector.lo_s4.lo.search_ext_s(s4connector.lo_s4.base, ldap.SCOPE_SUBTREE, filter_s4, ['sAMAccountName'])
> 
> 				if result and len(result) > 0 and result[0] and len(result[0]) > 0 and result[0][0]:  # no referral, so we've got a valid result
>-					s4dn = unicode(encode_attrib(result[0][0]))
>+					s4dn = unicode(encode_attrib(result[0][0]), 'utf8')
> 					if dn_key == 'olddn' or (dn_key == 'dn' and 'olddn' not in object):
> 						newdn = s4dn
> 					else:
> 						s4_rdn = ldap.dn.str2dn(s4dn)[0]
>-						new_s4_dn = unicode(ldap.dn.dn2str([s4_rdn] + exploded_dn[1:]))
>+						new_s4_dn = unicode(ldap.dn.dn2str([s4_rdn] + exploded_dn[1:]), 'utf8')
> 						newdn = new_s4_dn.lower().replace(s4connector.lo_s4.base.lower(), s4connector.lo.base.lower())
> 
> 				else:
> 					newdn_rdn = [('cn', fst_rdn_value, ldap.AVA_STRING)]
>-					newdn = unicode(ldap.dn.dn2str([newdn_rdn] + exploded_dn[1:]))  # new object, don't need to change
>+					newdn = unicode(ldap.dn.dn2str([newdn_rdn] + exploded_dn[1:]), 'utf8')  # new object, don't need to change
> 				ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: newdn: %s" % newdn)
> 			else:
> 				# get the object to read the sAMAccountName in S4 and use it as name
>@@ -381,7 +381,7 @@
> 				ucsdn_filter = format_escaped(u'(&(objectclass={0!e})({1}={2!e}))', ocucs, ucsattrib, samaccountname)
> 				ucsdn_result = s4connector.search_ucs(filter=ucsdn_filter, base=s4connector.lo.base, scope='sub', attr=['objectClass'])
> 				if ucsdn_result and len(ucsdn_result) > 0 and ucsdn_result[0] and len(ucsdn_result[0]) > 0:
>-					ucsdn = unicode(ucsdn_result[0][0])
>+					ucsdn = unicode(ucsdn_result[0][0], 'utf8')
> 
> 				if ucsdn and (dn_key == 'olddn' or (dn_key == 'dn' and 'olddn' not in object)):
> 					newdn = ucsdn
>@@ -392,7 +392,7 @@
> 					else:
> 						newdn_rdn = [(ucsattrib, samaccountname, ldap.AVA_STRING)]
> 
>-					newdn = unicode(ldap.dn.dn2str([newdn_rdn] + exploded_dn[1:]))  # guess the old dn
>+					newdn = unicode(ldap.dn.dn2str([newdn_rdn] + exploded_dn[1:]), 'utf8')  # guess the old dn
> 			try:
> 				ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: newdn for key %s:" % dn_key)
> 				ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: olddn: %s" % dn)
>@@ -807,7 +807,12 @@
> 	"""
> 	def convert_field(self, value, conversion):
> 		if conversion == 'e':
>-			return escape_filter_chars(str(value))
>+			if isinstance(value, unicode):
>+				return escape_filter_chars(value.encode('utf-8')).decode('utf-8')
>+			elif isinstance(value, str):
>+				return escape_filter_chars(value)
>+			else:
>+				return escape_filter_chars(str(value))
> 		return super(LDAPEscapeFormatter, self).convert_field(value, conversion)
> 
> 
>@@ -1342,7 +1347,7 @@
> 
> 			rdn_exploded = ldap.dn.str2dn(rdn)
> 			parent_exploded = ldap.dn.str2dn(object['attributes']['lastKnownParent'][0])
>-			return unicode(ldap.dn.dn2str(rdn_exploded + parent_exploded))
>+			return unicode(ldap.dn.dn2str(rdn_exploded + parent_exploded), 'utf8')
> 		else:
> 			ud.debug(ud.LDAP, ud.WARN, 'lastKnownParent attribute for deleted object rdn="%s" was not set, so we must ignore the object' % rdn)
> 			return None
>@@ -1588,7 +1593,7 @@
> 
> 		# Exclude primary group
> 		ucs_object_gid = object_ucs['attributes'].get('gidNumber', [])[0]
>-		ucs_group_filter = format_escaped('(&(objectClass=univentionGroup)(uniqueMember={0!e})(!(gidNumber={1!e})))', object_ucs['dn'], ucs_object_gid)
>+		ucs_group_filter = format_escaped(u'(&(objectClass=univentionGroup)(uniqueMember={0!e})(!(gidNumber={1!e})))', object_ucs['dn'], ucs_object_gid)
> 		ucs_groups_ldap = self.search_ucs(filter=ucs_group_filter)
> 
> 		if ucs_groups_ldap == []:

Actions: View | Diff

Attachments on bug 44276: 8754 | 8756