Attachment #5222 for bug #30991




			raise UDM_Error( get_exception_msg(e) )

	@LDAP_Connection
	def search( self, container = None, attribute = None, value = None, superordinate = None, scope = 'sub', filter = '', simple = False, simple_attrs = None, ldap_connection = None, ldap_position = None ):
		"""Searches for LDAP objects based on a search pattern"""
		if container == 'all':
			container = ldap_position.getBase()

		result = None
		try:
			sizelimit = int(ucr.get('directory/manager/web/sizelimit', '2000'))
			if simple:
				object_type_filter = 'univentionObjectType=%s' % self.module.module
				if filter:
					if not filter.startswith('('):
						filter = '(%s)' % filter
					object_type_filter = '(&(%s)%s)' % (object_type_filter, filter)
				if simple_attrs is not None:
					result = ldap_connection.search( filter = object_type_filter, base = container, scope = scope, sizelimit = sizelimit, attr = simple_attrs )
				else:
					result = ldap_connection.searchDn( filter = object_type_filter, base = container, scope = scope, sizelimit = sizelimit )
			else:
				result = self.module.lookup( None, ldap_connection, filter_s, base = container, superordinate = superordinate, scope = scope, sizelimit = sizelimit )
		except udm_errors.insufficientInformation, e:
			return []
		except udm_errors.ldapTimeout, e:

		filter_s = '(&%s%s)' % (property_filter_s, filter_s)
	return filter_s

LDAP_ATTR_RE = re.compile(r'^%\(([^)]*)\)s$') # '%(username)s' -> 'username'
def _get_syntax( syntax_name ):
	if syntax_name not in udm_syntax.__dict__:
		return None

			filter_s = _create_ldap_filter( syn, options, module )
			if filter_s is not None:
				try:
					size += len( module.search( filter = filter_s, simple=True ) )
				except udm_errors.ldapSizelimitExceeded:
					return {'performs_well' : True, 'size_limit_exceeded' : True}
		return {'size' : size, 'performs_well' : True }


	if issubclass( syn.__class__, udm_syntax.UDM_Objects ):
		syn.choices = []
		# try to avoid using the slow udm interface
		simple = False
		attr = []
		if not syn.always_use_objects and not syn.udm_filter:
			attr.extend(re.findall(r'%\(([^)]+)\)', syn.key))
			if syn.label:
				attr.extend(re.findall(r'%\(([^)]+)\)', syn.label))
			attr = set(attr)
			for udm_module in syn.udm_modules:
				module = UDM_Module( udm_module )
				if module is not None:
					mapping = module.module.mapping
					if not all([mapping.mapName(att) for att in attr]):
						break
			else:
				simple = True
		def extract_key_label(syn, dn, info):
			key = label = None
			if syn.key == 'dn':
				key = dn
			else:
				try:
					key = syn.key % info
				except KeyError:
					pass
			if syn.label == 'dn':
				label = dn
			elif syn.label is None:
				pass
			else:
				try:
					label = syn.label % info
				except KeyError:
					pass
			return key, label
		if not simple:
			def map_choices( obj_list ):
				result = []
				for obj in obj_list:
					# first try it without obj.open() (expensive)
					key, label = extract_key_label(syn, obj.dn, obj.info)
					if key is None or label is None:
						obj.open()
						key, label = extract_key_label(syn, obj.dn, obj.info)
						if key is None:
							# ignore the entry as the key is important for a selection, there
							# is no sensible fallback for the key (Bug #26994)
							continue
						if label is None:
							# fallback to the default description as this is just what displayed
							# to the user (Bug #26994)
							label = udm_objects.description( obj )
					result.append( (key, label) )
				return result

			for udm_module in syn.udm_modules:
				module = UDM_Module( udm_module )
				if module is None:
					continue
				filter_s = _create_ldap_filter( syn, options, module )
				if filter_s is None:
					syn.choices = []
				else:
					search_options = {'filter' : filter_s}
					search_options.update(module_search_options)
					syn.choices.extend( map_choices( module.search( **search_options ) ) )
		else:
			for udm_module in syn.udm_modules:
				module = UDM_Module( udm_module )
				if module is None:
					continue
				filter_s = _create_ldap_filter( syn, options, module )
				if filter_s is not None:
					if filter_s and not filter_s.startswith('('):
						filter_s = '(%s)' % filter_s
					mapping = module.module.mapping
					ldap_attr = [mapping.mapName(att) for att in attr]
					search_options = {'filter' : filter_s, 'simple' : True}
					search_options.update(module_search_options)
					if ldap_attr:
						search_options['simple_attrs'] = ldap_attr
						result = module.search( **search_options )
						for dn, ldap_map in result:
							info = univention.admin.mapping.mapDict(mapping, ldap_map)
							key, label = extract_key_label(syn, dn, info)
							if key is None:
								continue
							if label is None:
								label = ldap_connection.explodeDn(dn, 1)[0]
							syn.choices.append((key, label))
					else:
						keys = module.search( **search_options )
						if syn.label == 'dn':
							labels = keys
						else:
							labels = [ldap_connection.explodeDn(dn, 1)[0] for dn in keys]
						syn.choices.extend(zip(keys, labels))
		if isinstance( syn.static_values, ( tuple, list ) ):
			for value in syn.static_values:
				syn.choices.insert( 0, value )




	depends = None
	error_message = _( "Not a valid LDAP DN" )
	simple = False # by default a MultiObjectSelect widget is used; if simple == True a ComboBox is used
	always_use_objects = False

	@classmethod
	def parse( self, text ):


class LDAP_Server( UDM_Objects ):
	udm_modules = ( 'computers/domaincontroller_master', 'computers/domaincontroller_backup', 'computers/domaincontroller_slave' )
	label = '%(name)s.%(domain)s' # ldap-optimized '%(fqdn)s'
	simple = True

class IMAP_POP3( select ):


class HostDN( UDM_Objects ):
	udm_modules = ( 'computers/computer', )
	always_use_objects = True

class UserID( UDM_Objects ):
	udm_modules = ( 'users/user', )


class IComputer_FQDN( UDM_Objects ):
	udm_modules = ()
	key = '%(name)s.%(domain)s' # ldap-optimized '%(fqdn)s'
	label = '%(name)s.%(domain)s' # ldap-optimized '%(fqdn)s'
	regex = re.compile( '(?=^.{1,254}$)(^(?:(?!\d+\.)[a-zA-Z0-9_\-]{1,63}\.?)+(?:[a-zA-Z0-9]{2,})$)' ) #'(^[a-zA-Z])(([a-zA-Z0-9-_]*)([a-zA-Z0-9]$))?$' )
	error_message = _( 'Not a valid FQDN' )
	simple = True

class DNS_ReverseZone( UDM_Objects ):
 	description=_('DNS reverse zone')
	udm_modules = ( 'dns/reverse_zone', )
	label = '%(subnet)s'
	empty_value = True
	size = 'TwoThirds'


class dhcpService( UDM_Objects ):
	udm_modules = ( 'dhcp/service', )
	description=_('DHCP service')
	label = '%(name)s'
	empty_value = True
	size = 'TwoThirds'


class nagiosHostsEnabledDn( UDM_Objects ):
	udm_modules = ( 'computers/computer', )
	udm_filter = '(&(objectClass=univentionNagiosHostClass)(univentionNagiosEnabled=1)(aRecord=*))'
	always_use_objects = True

class nagiosServiceDn( UDM_Objects ):
	udm_modules = ( 'nagios/service', )


class nfsShare(UDM_Objects):
	udm_modules = ( 'shares/share', )
	label = '%(name)s (%(host)s)' # '%(printablename)s' optimized for performance...
	label = '%(printablename)s'
	udm_filter = 'objectClass=univentionShareNFS'

class nfsMounts(complex):

(-)univention-directory-manager-modules/modules/univention/admin/handlers/groups/group.py (-2 / +1 lines)

Lines 260-265	Link Here

260

261

mapping=univention.admin.mapping.mapping()

261

mapping=univention.admin.mapping.mapping()

262

mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)

262

mapping.register('name', 'cn', None, univention.admin.mapping.ListToString)

263

mapping.register('gidNumber', 'gidNumber', None, univention.admin.mapping.ListToString)

263

mapping.register('description', 'description', None, univention.admin.mapping.ListToString)

264

mapping.register('description', 'description', None, univention.admin.mapping.ListToString)

264

mapping.register('sambaGroupType', 'sambaGroupType', None, univention.admin.mapping.ListToString)

265

mapping.register('sambaGroupType', 'sambaGroupType', None, univention.admin.mapping.ListToString)

265

mapping.register('mailAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToString)

266

mapping.register('mailAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToString)

Lines 373-380	Link Here

373

		else:

374

		else:

374

			self._define_options( options )

375

			self._define_options( options )

375

376

		self.info['gidNumber'] = self.oldattr.get('gidNumber', [''])[0]

377

378

		if 'samba' in self.options:

377

		if 'samba' in self.options:

379

			sid = self.oldattr.get('sambaSID', [''])[0]

378

			sid = self.oldattr.get('sambaSID', [''])[0]

380

			pos = sid.rfind('-')

379

			pos = sid.rfind('-')

(-)univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py (-1 / +5 lines)

827

			if 'univentionShareNFS' in self.oldattr['objectClass']:

827

			if 'univentionShareNFS' in self.oldattr['objectClass']:

828

				self.options.append( 'nfs' )

828

				self.options.append( 'nfs' )

829

			try:

829

			try:

830

				# Attention: Because of performance reasons, the syntax

831

				#   class nfsShare uses '%(name)s (%(host)s)' as label, not

832

				#   '%(printablename)s' (may be looked up in ldap directly).

833

				#   If you change printablename here you probably want to change

834

				#   nfsShare.label, too.

830

				self['printablename'] = "%s (%s)" % (self['name'], self['host'])

835

				self['printablename'] = "%s (%s)" % (self['name'], self['host'])

831

			except:

836

			except:

832

				pass

837

				pass

900

		if not hasattr(self,"options"):

905

		if not hasattr(self,"options"):

901

			self.open()

906

			self.open()

902

		if 'nfs' in self.options:

907

		if 'nfs' in self.options:

903

			ulist=[]

904

			searchstring="*"+self['host']+":"+self['path']+"*"

908

			searchstring="*"+self['host']+":"+self['path']+"*"

905

			searchResult=self.lo.searchDn(base=self.position.getDomain(), filter='(&(objectClass=person)(automountInformation=%s))'%searchstring, scope='domain')

909

			searchResult=self.lo.searchDn(base=self.position.getDomain(), filter='(&(objectClass=person)(automountInformation=%s))'%searchstring, scope='domain')

906

			if searchResult:

910

			if searchResult:

(-)univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py (-4 / +3 lines)

Lines 1205-1210	Link Here

1205

	return new

1205

	return new

1206

1207

mapping=univention.admin.mapping.mapping()

1207

mapping=univention.admin.mapping.mapping()

1208

mapping.register('username', 'uid', None, univention.admin.mapping.ListToString)

1209

mapping.register('uidNumber', 'uidNumber', None, univention.admin.mapping.ListToString)

1210

mapping.register('gidNumber', 'gidNumber', None, univention.admin.mapping.ListToString)

1208

mapping.register('title', 'title', None, univention.admin.mapping.ListToString)

1211

mapping.register('title', 'title', None, univention.admin.mapping.ListToString)

1209

mapping.register('description', 'description', None, univention.admin.mapping.ListToString)

1212

mapping.register('description', 'description', None, univention.admin.mapping.ListToString)

1210

mapping.register('organisation', 'o', None, univention.admin.mapping.ListToString)

1213

mapping.register('organisation', 'o', None, univention.admin.mapping.ListToString)

Lines 1412-1418	Link Here

1412

					username_match=s.parse(uid)

1415

					username_match=s.parse(uid)

1413

				except univention.admin.uexceptions.valueError,e: # uid contains already mixed case umlauts, so we switch

1416

				except univention.admin.uexceptions.valueError,e: # uid contains already mixed case umlauts, so we switch

1414

					self.set_uid_umlauts()

1417

					self.set_uid_umlauts()

1415

				self['username']=uid

1416

			# FIXME: we should NEVER catch all exceptions

1418

			# FIXME: we should NEVER catch all exceptions

1417

			except Exception, e:

1419

			except Exception, e:

1418

				# at least write some debuging output..

1420

				# at least write some debuging output..

Lines 1500-1508	Link Here

1500

						self.save()

1502

						self.save()

1501

						raise univention.admin.uexceptions.primaryGroup

1503

						raise univention.admin.uexceptions.primaryGroup

1502

1504

1503

					self.info['uidNumber'] = self.oldattr.get('uidNumber', [''])[0]

1504

					self.info['gidNumber'] = self.oldattr.get('gidNumber', [''])[0]

1505

1506

			if self['passwordexpiry']:

1505

			if self['passwordexpiry']:

1507

				today=time.strftime('%Y-%m-%d').split('-')

1506

				today=time.strftime('%Y-%m-%d').split('-')

1508

				expiry=self['passwordexpiry'].split('-')

1507

				expiry=self['passwordexpiry'].split('-')

Return to bug 30991