Attachment #4486 for bug #26515

View | Details | Raw Unified | Return to bug 26515
Collapse All | Expand All





		self.open_s4()

		for section in ['S4', 'S4 rejected', 'S4 rejected timestamp', 'S4 GUID' ]:
			if not self.config.has_section(section):
				ud.debug(ud.LDAP, ud.INFO,"__init__: init add config section %s" % section)
				self.config.add_section(section)

		if not self.config.has_section('S4 rejected'):
			ud.debug(ud.LDAP, ud.INFO,"__init__: init add config section 'S4 rejected'")
			self.config.add_section('S4 rejected')
			
		if not self.config.has_option('S4','lastUSN'):
			ud.debug(ud.LDAP, ud.INFO,"__init__: init lastUSN with 0")
			self._set_config_option('S4','lastUSN','0')

		else:
			self.__lastUSN=int(self._get_config_option('S4','lastUSN'))

		if not self.config.has_section('S4 GUID'):
			ud.debug(ud.LDAP, ud.INFO,"__init__: init add config section 'S4 GUID'")
			self.config.add_section('S4 GUID')
		try:
			# LDAP_SERVER_SHOW_DELETED_OID -> 1.2.840.113556.1.4.417
			self.ctrl_show_deleted = LDAPControl('1.2.840.113556.1.4.417',criticality=1)

		_d=ud.function('ldap._save_rejected')
		try:
			self._set_config_option('S4 rejected',str(id),compatible_modstring(dn))
			if not self._get_config_option('S4 rejected timestamp', compatible_modstring(dn.lower())):
				self._set_config_option('S4 rejected timestamp', compatible_modstring(dn.lower()), time.time())
		except UnicodeEncodeError, msg:
			self._set_config_option('S4 rejected',str(id),'unknown')
			self._debug_traceback(ud.WARN,


	def _remove_rejected(self,id):
		_d=ud.function('ldap._remove_rejected')
		dn = self._get_rejected(str(id))
		self._remove_config_option('S4 rejected',str(id))

		# Remove the timestamp entry for this rejected DN if this is the last
		# rejected object with this DN
		if dn:
			found = False
			for f, d in self.list_rejected():
				if d.lower() == dn.lower():
					found = True
					break
			if not found:
				self._remove_config_option('S4 rejected timestamp',dn.lower())

	def _get_rejected_timestamp(self, dn):
		return self._get_config_option('S4 rejected timestamp',dn.lower())

	def _list_rejected(self):
		_d=ud.function('ldap._list_rejected')
		result = []

			return True

		pre_mapped_ucs_old_dn = old_dn		

		## Is the object rejected in S4?
		# If sync_mode is not sync, it does not matter 
		if self.property[property_type].sync_mode == 'sync':
			t_s4 = self._get_rejected_timestamp(pre_mapped_ucs_dn.lower())
			t_ucs = self._get_rejected_timestamp_ucs(object['dn'].lower())
			if t_s4:
				ud.debug(ud.LDAP, ud.PROCESS, 't_s4=%s'% float(t_s4))
			if t_ucs:
				ud.debug(ud.LDAP, ud.PROCESS, 't_ucs=%s'% float(t_ucs))
			
			if t_s4:
				# We have a rejected UCS object, so check the timestamp
				if not t_ucs or float(t_s4) < float(t_ucs):
					if t_ucs:
						ud.debug(ud.LDAP, ud.PROCESS, 'This object is already rejected in the different direction (S4 to UCS). This direction (UCS to S4) will now also rejected until the firsrst rejection is solved.')
					# The UCS object is older, this object must be synced first
					return False

		if old_dn:
			ud.debug(ud.LDAP, ud.INFO, "move %s from [%s] to [%s]" % (property_type, old_dn, object['dn']))
			if hasattr ( self.property[property_type], 'dn_mapping_function' ):

							modlist.append((ldap.MOD_DELETE, yank_empty_attr, None))

				if modlist:
					ud.debug(ud.LDAP, ud.PROCESS, "sync_from_ucs: modlist: %s" % modlist)
					self.lo_s4.lo.modify_ext_s(compatible_modstring(object['dn']), compatible_modlist(modlist), serverctrls=self.serverctrls_for_add_and_modify)



(-)modules/univention/s4connector/__init__.py (-2 / +37 lines)

Lines 409-417	Link Here

409

410

		self.open_ucs()

410

		self.open_ucs()

411

412

		for section in ['DN Mapping UCS','DN Mapping CON','UCS rejected']:

412

		for section in ['DN Mapping UCS', 'DN Mapping CON', 'UCS rejected', 'UCS rejected timestamp']:

413

			if not self.config.has_section(section):

413

			if not self.config.has_section(section):

414

				self.config.add_section(section)

414

				self.config.add_section(section)

415

416

		ud.debug(ud.LDAP, ud.INFO, "init finished")

416

		ud.debug(ud.LDAP, ud.INFO, "init finished")

417

Lines 488-493	Link Here

488

	def _save_rejected_ucs(self, filename, dn):

488

	def _save_rejected_ucs(self, filename, dn):

489

		_d=ud.function('ldap._save_rejected_ucs')

489

		_d=ud.function('ldap._save_rejected_ucs')

490

		self._set_config_option('UCS rejected',filename,dn)

490

		self._set_config_option('UCS rejected',filename,dn)

491

		if not self._get_config_option('UCS rejected timestamp', dn.lower()):

492

			self._set_config_option('UCS rejected timestamp', dn.lower(), time.time())

491

493

492

	def _get_rejected_ucs(self, filename):

494

	def _get_rejected_ucs(self, filename):

493

		_d=ud.function('ldap._get_rejected_ucs')

495

		_d=ud.function('ldap._get_rejected_ucs')

Lines 495-502	Link Here

495

497

496

	def _remove_rejected_ucs(self,filename):

498

	def _remove_rejected_ucs(self,filename):

497

		_d=ud.function('ldap._remove_rejected_ucs')

499

		_d=ud.function('ldap._remove_rejected_ucs')

500

		dn = self._get_rejected_ucs(filename)

498

		self._remove_config_option('UCS rejected',filename)

501

		self._remove_config_option('UCS rejected',filename)

499

502

503

		# Remove the timestamp entry for this rejected DN if this is the last

504

		# rejected object with this DN

505

		if dn:

506

			found = False

507

			for f, d in self.list_rejected_ucs():

508

				if d.lower() == dn.lower():

509

					found = True

510

					break

511

			if not found:

512

				self._remove_config_option('UCS rejected timestamp',dn.lower())

513

500

	def _list_rejected_ucs(self):

514

	def _list_rejected_ucs(self):

501

		_d=ud.function('ldap._list_rejected_ucs')

515

		_d=ud.function('ldap._list_rejected_ucs')

502

		result = []

516

		result = []

Lines 513-518	Link Here

513

527

514

	def list_rejected_ucs(self):

528

	def list_rejected_ucs(self):

515

		return self._get_config_items('UCS rejected')

529

		return self._get_config_items('UCS rejected')

530

531

	def _get_rejected_timestamp_ucs(self, dn):

532

		return self._get_config_option('UCS rejected timestamp',dn.lower())

516

533

517

	def _encode_dn_as_config_option(self, dn):

534

	def _encode_dn_as_config_option(self, dn):

518

		return dn

535

		return dn

Lines 1243-1248	Link Here

1243

			ud.debug(ud.LDAP, ud.INFO, "sync_to_ucs ignored, sync_mode is %s" % self.property[property_type].sync_mode)

1260

			ud.debug(ud.LDAP, ud.INFO, "sync_to_ucs ignored, sync_mode is %s" % self.property[property_type].sync_mode)

1244

			return True

1261

			return True

1245

1262

1263

		## Is the object rejected in UCS?

1264

		# If sync_mode is not sync, it does not matter

1265

		if self.property[property_type].sync_mode == 'sync':

1266

			t_s4 = self._get_rejected_timestamp(premapped_s4_dn.lower())

1267

			t_ucs = self._get_rejected_timestamp_ucs(object['dn'].lower())

1268

			if t_s4:

1269

				ud.debug(ud.LDAP, ud.PROCESS, 't_s4=%s'% float(t_s4))

1270

			if t_ucs:

1271

				ud.debug(ud.LDAP, ud.PROCESS, 't_ucs=%s'% float(t_ucs))

1272

1273

			if t_ucs:

1274

				# We have a rejected UCS object, so check the timestamp

1275

				if not t_s4 or float(t_ucs) < float(t_s4):

1276

					if t_s4:

1277

						ud.debug(ud.LDAP, ud.PROCESS, 'This object is already rejected in the different direction (UCS to S4 LDAP). This direction (S4 to UCS) will now also rejected until the first rejection will solved.')

1278

					# The UCS object is older, this object must be synced first

1279

					return False

1280

1246

		if object.has_key('olddn'):

1281

		if object.has_key('olddn'):

1247

			old_object = self.get_ucs_object(property_type,object['olddn'])

1282

			old_object = self.get_ucs_object(property_type,object['olddn'])

1248

		else:

1283

		else:

Return to bug 26515