Attachment #9182 for bug #39309




		self.con_attribute = con_attribute
		self.con_other_attribute = con_other_attribute
		self.required = required
		# If no compare_function is given, we default to `compare_lowercase()`
		self.compare_function = compare_function or compare_lowercase
		if mapping:
			self.mapping = mapping
		# Make a reverse check of this mapping. This is necassary if the attribute is

					if not detected_ca:
						if isinstance(value, type(types.ListType())) and len(value) == 1:
							value = value[0]
						equal = False

						# set encoding
						compare = [ucs_object[ucs_key], value]

							else:
								compare[i] = univention.s4connector.s4.compatible_modstring(compare[i])

						if not attributes.compare_function(compare[0], compare[1]):
							equal = attributes.compare_function(compare[0], compare[1])
						else:
							equal = compare[0] == compare[1]
						if not equal:
							# This is deduplication of LDAP attribute values for S4 -> UCS.
							# It destroys ordering of multi-valued attributes. This seems problematic
							# as the handling of `con_other_attribute` assumes preserved ordering




									ud.debug(ud.LDAP, ud.INFO, "sync_from_ucs: %s is in not in write or sync mode. Skipping" % attribute)
									continue

								modify = False

								# Get the UCS attributes
								old_values = set(old_ucs_object.get(attr, []))
								new_values = set(new_ucs_object.get(attr, []))

								ud.debug(ud.LDAP, ud.INFO, "sync_from_ucs: old_values: %s" % old_values)
								ud.debug(ud.LDAP, ud.INFO, "sync_from_ucs: new_values: %s" % new_values)

								if attribute_type[attribute].compare_function(list(old_values), list(new_values)):
									if not attribute_type[attribute].compare_function(list(old_values), list(new_values)):
										modify = True
								elif not univention.s4connector.compare_lowercase(list(old_values), list(new_values)):  # FIXME: use defined compare-function from mapping.py
									modify = True

								if not modify:
									ud.debug(ud.LDAP, ud.INFO, "sync_from_ucs: no modification necessary for %s" % attribute)
									continue


									ud.debug(ud.LDAP, ud.INFO, "sync_from_ucs: The current S4 values: %s" % current_s4_values)

									if (to_add or to_remove) and attribute_type[attribute].single_value:
										modified = (not current_s4_values or not value) or \
											not attribute_type[attribute].compare_function(list(current_s4_values), list(value))
										if modified:
										elif attribute_type[attribute].compare_function:
											if not attribute_type[attribute].compare_function(list(current_s4_values), list(value)):
												modify = True
										elif not univention.s4connector.compare_lowercase(list(current_s4_values), list(value)):
											modify = True
										if modify:
											if hasattr(attribute_type[attribute], 'mapping') and len(attribute_type[attribute].mapping) > 0 and attribute_type[attribute].mapping[0]:
												ud.debug(ud.LDAP, ud.PROCESS, "Calling single value mapping function")
												value = attribute_type[attribute].mapping[0](self, None, object)
- 
from mapping
--
.../conffiles/etc/univention/s4connector/s4/mapping.py         | 10 ----------
1 file changed, 10 deletions(-)




							ldap_attribute='uid',
							con_attribute='sAMAccountName',
							required=1,
							compare_function=univention.s4connector.compare_lowercase,
							single_value=True,
						),
					'givenName' : univention.s4connector.attribute (

							ldap_attribute='cn',
							con_attribute='sAMAccountName',
							required=1,
							compare_function=univention.s4connector.compare_lowercase,
							single_value=True,
						),
					'description': univention.s4connector.attribute (

							ldap_attribute='cn',
							con_attribute='cn',
							required=1,
							compare_function=univention.s4connector.compare_lowercase,
							single_value=True,
						),
					'samAccountName': univention.s4connector.attribute (
							ldap_attribute='uid',
							con_attribute='sAMAccountName',
							compare_function=univention.s4connector.compare_lowercase,
							single_value=True,
						),
					'description': univention.s4connector.attribute (

							ldap_attribute='cn',
							con_attribute='cn',
							required=1,
							compare_function=univention.s4connector.compare_lowercase,
							single_value=True,
						),
					'samAccountName': univention.s4connector.attribute (
							ldap_attribute='uid',
							con_attribute='sAMAccountName',
							compare_function=univention.s4connector.compare_lowercase,
							single_value=True,
						),
					'description': univention.s4connector.attribute (

							ldap_attribute='cn',
							con_attribute='cn',
							required=1,
							compare_function=univention.s4connector.compare_lowercase,
							single_value=True,
						),
					'description': univention.s4connector.attribute (

							con_attribute='cn',
							required=1,
							single_value=True,
							compare_function=univention.s4connector.compare_lowercase,
						),
					'description': univention.s4connector.attribute (
							ucs_attribute='description',

							ldap_attribute='cn',
							con_attribute='cn',
							required=1,
							compare_function=univention.s4connector.compare_lowercase,
							single_value=True,
						),
					'description': univention.s4connector.attribute (

							ldap_attribute='ou',
							con_attribute='ou',
							required=1,
							compare_function=univention.s4connector.compare_lowercase,
							single_value=True,
						),
					'description': univention.s4connector.attribute (
- 
case-sensitive compare for some attrs
--
.../conffiles/etc/univention/s4connector/s4/mapping.py  | 17 +++++++++++++++++
.../modules/univention/s4connector/__init__.py          |  4 ++++
2 files changed, 21 insertions(+)




							ucs_attribute='firstname',
							ldap_attribute='givenName',
							con_attribute='givenName',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'displayName': univention.s4connector.attribute (
							ucs_attribute='displayName',
							ldap_attribute='displayName',
							con_attribute='displayName',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'sn': univention.s4connector.attribute (
							ucs_attribute='lastname',
							ldap_attribute='sn',
							con_attribute='sn',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					@!@

							ucs_attribute='organisation',
							ldap_attribute='o',
							con_attribute='company',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'description': univention.s4connector.attribute (
							ucs_attribute='description',
							ldap_attribute='description',
							con_attribute='description',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'mailPrimaryAddress': univention.s4connector.attribute (

							ucs_attribute='street',
							ldap_attribute='street',
							con_attribute='streetAddress',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'city': univention.s4connector.attribute (
							ucs_attribute='city',
							ldap_attribute='l',
							con_attribute='l',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'postcode': univention.s4connector.attribute (

							ucs_attribute='description',
							ldap_attribute='description',
							con_attribute='description',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
@!@

							ucs_attribute='description',
							ldap_attribute='description',
							con_attribute='description',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'operatingSystem': univention.s4connector.attribute (

							ucs_attribute='description',
							ldap_attribute='description',
							con_attribute='description',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'operatingSystem': univention.s4connector.attribute (

							ucs_attribute='description',
							ldap_attribute='description',
							con_attribute='description',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'displayName': univention.s4connector.attribute (

							ucs_attribute='description',
							ldap_attribute='description',
							con_attribute='description',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'displayName': univention.s4connector.attribute (
							ucs_attribute='displayName',
							ldap_attribute='displayName',
							con_attribute='displayName',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'author': univention.s4connector.attribute (

							ucs_attribute='description',
							ldap_attribute='description',
							con_attribute='description',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'displayName': univention.s4connector.attribute (
							ucs_attribute='displayName',
							ldap_attribute='displayName',
							con_attribute='displayName',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
					'msPrintAttributes': univention.s4connector.attribute (

							ucs_attribute='description',
							ldap_attribute='description',
							con_attribute='description',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
@!@

							ucs_attribute='description',
							ldap_attribute='description',
							con_attribute='description',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
@!@

(-)a/services/univention-s4-connector/modules/univention/s4connector/__init__.py (-2 / +4 lines)

Lines 142-147 def dictonary_lowercase(dict):	Link Here

142

			pass

142

			pass

143

144

145

def compare_normal(val1, val2):

146

	return val1 == val2

147

148

145

def compare_lowercase(val1, val2):

149

def compare_lowercase(val1, val2):

146

	try:  # TODO: failes if conversion to ascii-str raises exception

150

	try:  # TODO: failes if conversion to ascii-str raises exception

147

		if dictonary_lowercase(val1) == dictonary_lowercase(val2):

151

		if dictonary_lowercase(val1) == dictonary_lowercase(val2):

148

149

--

150

.../conffiles/etc/univention/s4connector/s4/mapping.py               | 5 -----

152

.../conffiles/etc/univention/s4connector/s4/mapping.py               | 5 -----

151

1 file changed, 5 deletions(-)

153

1 file changed, 5 deletions(-)




							ucs_attribute='organisation',
							ldap_attribute='o',
							con_attribute='company',
						),
					'organisation': univention.s4connector.attribute (
							ucs_attribute='organisation',
							ldap_attribute='o',
							con_attribute='company',
							compare_function=univention.s4connector.compare_normal,
							single_value=True,
						),
- 

Return to bug 39309