Attachment #5224 for bug #30991

(-)univention-directory-manager-modules/modules/univention/admin/filter.py (+6 lines)

Lines 82-87	Link Here

'''

'''

		return '%s(%r, %r)' % (self.__class__._type_, self.type, self.expressions)

		return '%s(%r, %r)' % (self.__class__._type_, self.type, self.expressions)

	def append_unmapped_filter_string(self, filter_s, rewrite_function, mapping):

		if filter_s:

			filter_p = parse(filter_s)

			walk(filter_p, rewrite_function, arg=mapping)

			self.expressions.append(filter_p)

class expression:

class expression:

	"""LDAP filter expression."""

	"""LDAP filter expression."""

	_type_='expression'

	_type_='expression'




	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
	use_objects = True

	@classmethod
	def parse( self, text ):


class GroupDN( UDM_Objects ):
	udm_modules = ( 'groups/group', )
	use_objects = False

class UserDN( UDM_Objects ):
	udm_modules = ( 'users/user', )
	use_objects = False

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

	udm_modules = ( 'dns/forward_zone', )
	empty_value = True
	size = 'TwoThirds'
	use_objects = False

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

class dnsEntry( complex ):
 	description=_('DNS Entry')

class WritableShare( UDM_Objects ):
	udm_modules = ( 'shares/share', )
	udm_filter = 'writeable=1'
	label = _('%(name)s (%(path)s on %(host)s)') # ldap-optimized for shares/share.description()
	size = 'OneAndAHalf'
	empty_value = True
	use_objects = False

# class share(ldapDnOrNone):
# 	searchFilter='(objectClass=univentionShare)'


class nfsShare(UDM_Objects):
	udm_modules = ( 'shares/share', )
	key = 'dn'
	label = '%(printablename)s'
	udm_filter = 'objectClass=univentionShareNFS'





				self.lo.modify(dn, [ ('sambaPrimaryGroupSID', attr.get('sambaPrimaryGroupSID', []), [newSid]) ] )
			self.update_sambaPrimaryGroupSid = False

def lookup_filter(filter_s=None):
	lookup_filter = \
		univention.admin.filter.conjunction('&', [
			univention.admin.filter.expression('cn', '*'),
			univention.admin.filter.conjunction('|', [
				univention.admin.filter.conjunction('&',
					[univention.admin.filter.expression('objectClass', 'univentionGroup'),]),
				univention.admin.filter.conjunction('&',
					[univention.admin.filter.expression('objectClass', 'sambaGroupMapping'),])
			])
		])
	lookup_filter.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)
	return lookup_filter

def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
		filter_p=univention.admin.filter.parse(filter_s)
		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)
		filter.expressions.append(filter_p)

	filter=lookup_filter(filter_s)
	res=[]
	for dn, attrs in lo.search(unicode(filter), base, scope, [], unique, required, timeout, sizelimit):
		res.append( object( co, lo, None, dn, attributes = attrs ) )




		if not self.hasChanged('serial'):
			self['serial']=str(int(self['serial'])+1)

def lookup_filter(filter_s=None):
	lookup_filter = \
		univention.admin.filter.conjunction('&', [
			univention.admin.filter.expression('objectClass', 'dNSZone'),
			univention.admin.filter.expression('relativeDomainName', '@'),
			univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*%s' % ARPA_IP4)]),
			univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*%s' % ARPA_IP6)]),
		])
	lookup_filter.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)
	return lookup_filter

def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
		filter_p=univention.admin.filter.parse(filter_s)
		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)
		filter.expressions.append(filter_p)

	filter=lookup_filter(filter_s)
	res=[]
	for dn, attrs in lo.search(unicode(filter), base, scope, [], unique, required, timeout, sizelimit):
		res.append((object(co, lo, None, dn=dn, superordinate=superordinate, attributes = attrs )))




			return unmapSubnet(rdn_value)


def lookup_filter(filter_s=None):
	lookup_filter = \
		univention.admin.filter.conjunction('&', [
			univention.admin.filter.expression('objectClass', 'dNSZone'),
			univention.admin.filter.expression('relativeDomainName', '@'),
			univention.admin.filter.conjunction('|', [
				univention.admin.filter.expression('zoneName', '*%s' % ARPA_IP4),
				univention.admin.filter.expression('zoneName', '*%s' % ARPA_IP6)
			]),
		])
	lookup_filter.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)
	return lookup_filter

def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
		filter_p=univention.admin.filter.parse(filter_s)
		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)
		filter.expressions.append(filter_p)

	filter=lookup_filter(filter_s)
	res=[]
	for dn, attrs in lo.search(unicode(filter), base, scope, [], unique, required, timeout, sizelimit):
		res.append((object(co, lo, None, dn=dn, superordinate=superordinate, attributes = attrs )))




		if not hasattr(self,"options"):
			self.open()
		if 'nfs' in self.options:
			ulist=[]
			searchstring="*"+self['host']+":"+self['path']+"*"
			searchResult=self.lo.searchDn(base=self.position.getDomain(), filter='(&(objectClass=person)(automountInformation=%s))'%searchstring, scope='domain')
			if searchResult:

	def description(self):
		return _('%s (%s on %s)') % (self['name'], self['path'], self['host'])

def lookup_filter(filter_s=None):
	lookup_filter = \
		univention.admin.filter.conjunction('&', [
			univention.admin.filter.expression('objectClass', 'univentionShare'),
			univention.admin.filter.expression('cn', '*'),
		])
	lookup_filter.append_unmapped_filter_string(filter_s, univention.admin.mapping.mapRewrite, mapping)
	return lookup_filter

def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
	filter=lookup_filter(filter_s)
		univention.admin.filter.walk(filter_p, univention.admin.mapping.mapRewrite, arg=mapping)
		filter.expressions.append(filter_p)

	res=[]
	for dn in lo.searchDn(unicode(filter), base, scope, unique, required, timeout, sizelimit):
		res.append(object(co, lo, None, dn))




	else:
		univention.admin.mapping.mapRewrite(filter, mapping)

def lookup_filter(filter_s=None):
	lookup_filter = \
		univention.admin.filter.conjunction('&', [
			univention.admin.filter.conjunction('|', [
				univention.admin.filter.conjunction('&', [
					univention.admin.filter.expression('objectClass', 'posixAccount'),
					univention.admin.filter.expression('objectClass', 'shadowAccount'),
				]),
				univention.admin.filter.expression('objectClass', 'univentionMail'),
				univention.admin.filter.expression('objectClass', 'sambaSamAccount'),
				univention.admin.filter.expression('objectClass', 'simpleSecurityObject'),
				univention.admin.filter.conjunction('&', [
					univention.admin.filter.expression('objectClass', 'person'),
					univention.admin.filter.expression('objectClass', 'organizationalPerson'),
					univention.admin.filter.expression('objectClass', 'inetOrgPerson'),
				]),
			]),
			univention.admin.filter.conjunction('!', [univention.admin.filter.expression('uidNumber', '0')]),
			univention.admin.filter.conjunction('!', [univention.admin.filter.expression('uid', '*$')]),
		])
	# ATTENTION: has its own rewrite function.
	lookup_filter.append_unmapped_filter_string(filter_s, rewrite, mapping)
	return lookup_filter
				univention.admin.filter.expression('objectClass', 'inetOrgPerson'),
			]),
		]),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('uidNumber', '0')]),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('uid', '*$')]),
	])

def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
	filter=lookup_filter(filter_s)
		univention.admin.filter.walk(filter_p, rewrite, arg=mapping)
		filter.expressions.append(filter_p)

	res=[]
	for dn, attrs in lo.search(unicode(filter), base, scope, [], unique, required, timeout, sizelimit):
		res.append( object( co, lo, None, dn, attributes = attrs ) )

(-)univention-directory-manager-modules/modules/univention/admin/de.po (+4 lines)

Lines 221-226	Link Here

221

msgid "cannot find fqdn of "

221

msgid "cannot find fqdn of "

222

msgstr "FQDN konnte nicht gefunden werden: "

222

msgstr "FQDN konnte nicht gefunden werden: "

223

224

#: syntax.py:1743

225

msgid "%(name)s (%(path)s on %(host)s)"

226

msgstr "%(name)s (%(path)s auf %(host)s)"

227

224

#: syntax.py:109 syntax.py:162 syntax.py:298

228

#: syntax.py:109 syntax.py:162 syntax.py:298

225

msgid "Invalid value"

229

msgid "Invalid value"

226

msgstr "Ungültiger Wert"

230

msgstr "Ungültiger Wert"

(-)univention-directory-manager-modules/debian/changelog (+6 lines)

Lines 1-3	Link Here

univention-directory-manager-modules (8.0.155-1) unstable; urgency=low

  * Bug #30991: Preliminary work for agressive syntax lookup optimizations

 -- Dirk Wiesenthal <wiesenthal@univention.de>  Tue, 14 May 2013 19:27:56 +0200

univention-directory-manager-modules (8.0.154-1) unstable; urgency=low

univention-directory-manager-modules (8.0.154-1) unstable; urgency=low

  * Bug #31154: Import hook files every time udm_modules.update() is called

  * Bug #31154: Import hook files every time udm_modules.update() is called

(-)univention-management-console-module-udm/debian/changelog (+6 lines)

Lines 1-3	Link Here

univention-management-console-module-udm (3.0.79-1) unstable; urgency=low

  * Bug #30991: Greatly speedup syntax lookup if syntax allows it

 -- Dirk Wiesenthal <wiesenthal@univention.de>  Tue, 14 May 2013 19:37:46 +0200

univention-management-console-module-udm (3.0.78-1) unstable; urgency=low

univention-management-console-module-udm (3.0.78-1) unstable; urgency=low

  * Bug #14123: adjusted texts for GPL license

  * Bug #14123: adjusted texts for GPL license

(-)univention-management-console-module-udm/umc/python/udm/udm_ldap.py (-42 / +113 lines)

Lines 232-237	Link Here

232

			module = self._initialized_with_module

232

			module = self._initialized_with_module

233

		self.module = _module_cache.get( module, force_reload=force_reload )

233

		self.module = _module_cache.get( module, force_reload=force_reload )

234

235

	def allows_simple_lookup( self ):

236

		return self.lookup_filter() is not None

237

238

	def lookup_filter( self, filter_s=None ):

239

		return getattr( self.module, 'lookup_filter', lambda x: None )(filter_s)

240

235

	def __getitem__( self, key ):

241

	def __getitem__( self, key ):

236

		props = getattr( self.module, 'property_descriptions', {} )

242

		props = getattr( self.module, 'property_descriptions', {} )

237

		return props[ key ]

243

		return props[ key ]

Lines 407-413	Link Here

407

			raise UDM_Error( get_exception_msg(e) )

413

			raise UDM_Error( get_exception_msg(e) )

408

414

409

	@LDAP_Connection

415

	@LDAP_Connection

410

	def search( self, container = None, attribute = None, value = None, superordinate = None, scope = 'sub', filter = '', ldap_connection = None, ldap_position = None ):

416

	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 ):

411

		"""Searches for LDAP objects based on a search pattern"""

417

		"""Searches for LDAP objects based on a search pattern"""

412

		if container == 'all':

418

		if container == 'all':

413

			container = ldap_position.getBase()

419

			container = ldap_position.getBase()

Lines 421-427	Link Here

421

		result = None

427

		result = None

422

		try:

428

		try:

423

			sizelimit = int(ucr.get('directory/manager/web/sizelimit', '2000'))

429

			sizelimit = int(ucr.get('directory/manager/web/sizelimit', '2000'))

424

			result = self.module.lookup( None, ldap_connection, filter_s, base = container, superordinate = superordinate, scope = scope, sizelimit = sizelimit )

430

			if simple and self.allows_simple_lookup():

431

				lookup_filter = unicode(self.lookup_filter(filter))

432

				if simple_attrs is not None:

433

					result = ldap_connection.search( filter = lookup_filter, base = container, scope = scope, sizelimit = sizelimit, attr = simple_attrs )

434

				else:

435

					result = ldap_connection.searchDn( filter = lookup_filter, base = container, scope = scope, sizelimit = sizelimit )

436

			else:

437

				result = self.module.lookup( None, ldap_connection, filter_s, base = container, superordinate = superordinate, scope = scope, sizelimit = sizelimit )

425

		except udm_errors.insufficientInformation, e:

438

		except udm_errors.insufficientInformation, e:

426

			return []

439

			return []

427

		except udm_errors.ldapTimeout, e:

440

		except udm_errors.ldapTimeout, e:

Lines 1004-1010	Link Here

1004

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

1017

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

1005

	return filter_s

1018

	return filter_s

1006

1019

1007

LDAP_ATTR_RE = re.compile(r'^%\(([^(]*)\)s$') # '%(username)s' -> 'username'

1020

LDAP_ATTR_RE = re.compile(r'^%\(([^)]*)\)s$') # '%(username)s' -> 'username'

1008

def _get_syntax( syntax_name ):

1021

def _get_syntax( syntax_name ):

1009

	if syntax_name not in udm_syntax.__dict__:

1022

	if syntax_name not in udm_syntax.__dict__:

1010

		return None

1023

		return None

Lines 1051-1057	Link Here

1051

			filter_s = _create_ldap_filter( syn, options, module )

1064

			filter_s = _create_ldap_filter( syn, options, module )

1052

			if filter_s is not None:

1065

			if filter_s is not None:

1053

				try:

1066

				try:

1054

					size += len( module.search( filter = filter_s ) )

1067

					size += len( module.search( filter = filter_s, simple=not syn.use_objects ) )

1055

				except udm_errors.ldapSizelimitExceeded:

1068

				except udm_errors.ldapSizelimitExceeded:

1056

					return {'performs_well' : True, 'size_limit_exceeded' : True}

1069

					return {'performs_well' : True, 'size_limit_exceeded' : True}

1057

		return {'size' : size, 'performs_well' : True }

1070

		return {'size' : size, 'performs_well' : True }

Lines 1065-1110	Link Here

1065

1078

1066

	if issubclass( syn.__class__, udm_syntax.UDM_Objects ):

1079

	if issubclass( syn.__class__, udm_syntax.UDM_Objects ):

1067

		syn.choices = []

1080

		syn.choices = []

1068

		def map_choices( obj_list ):

1081

		# try to avoid using the slow udm interface

1069

			result = []

1082

		simple = False

1070

			for obj in obj_list:

1083

		attr = set()

1071

				obj.open()

1084

		if not syn.use_objects:

1085

			attr.update(re.findall(r'%\(([^)]+)\)', syn.key))

1086

			if syn.label:

1087

				attr.update(re.findall(r'%\(([^)]+)\)', syn.label))

1088

			for udm_module in syn.udm_modules:

1089

				module = UDM_Module( udm_module )

1090

				if not module.allows_simple_lookup():

1091

					break

1092

				if module is not None:

1093

					mapping = module.module.mapping

1094

					if not all([mapping.mapName(att) for att in attr]):

1095

						break

1096

			else:

1097

				simple = True

1098

		def extract_key_label(syn, dn, info):

1099

			key = label = None

1100

			if syn.key == 'dn':

1101

				key = dn

1102

			else:

1103

				try:

1104

					key = syn.key % info

1105

				except KeyError:

1106

					pass

1107

			if syn.label == 'dn':

1108

				label = dn

1109

			elif syn.label is None:

1110

				pass

1111

			else:

1112

				try:

1113

					label = syn.label % info

1114

				except KeyError:

1115

					pass

1116

			return key, label

1117

		if not simple:

1118

			def map_choices( obj_list ):

1119

				result = []

1120

				for obj in obj_list:

1121

					# first try it without obj.open() (expensive)

1122

					key, label = extract_key_label(syn, obj.dn, obj.info)

1123

					if key is None or label is None:

1124

						obj.open()

1125

						key, label = extract_key_label(syn, obj.dn, obj.info)

1126

						if key is None:

1127

							# ignore the entry as the key is important for a selection, there

1128

							# is no sensible fallback for the key (Bug #26994)

1129

							continue

1130

						if label is None:

1131

							# fallback to the default description as this is just what displayed

1132

							# to the user (Bug #26994)

1133

							label = udm_objects.description( obj )

1134

					result.append( (key, label) )

1135

				return result

1072

1136

1073

				if syn.key == 'dn':

1137

			for udm_module in syn.udm_modules:

1074

					key = obj.dn

1138

				module = UDM_Module( udm_module )

1139

				if module is None:

1140

					continue

1141

				filter_s = _create_ldap_filter( syn, options, module )

1142

				if filter_s is None:

1143

					syn.choices = []

1075

				else:

1144

				else:

1076

					try:

1145

					search_options = {'filter' : filter_s}

1077

						key = syn.key % obj.info

1146

					search_options.update(module_search_options)

1078

					except KeyError:

1147

					syn.choices.extend( map_choices( module.search( **search_options ) ) )

1079

						# ignore the entry as the key is important for a selection, there

1148

		else:

1080

						# is no sensible fallback for the key (Bug #26994)

1149

			for udm_module in syn.udm_modules:

1081

						continue

1150

				module = UDM_Module( udm_module )

1082

				if syn.label is None:

1151

				if module is None:

1083

					label = udm_objects.description( obj )

1152

					continue

1084

				elif syn.label == 'dn':

1153

				filter_s = _create_ldap_filter( syn, options, module )

1085

					label = obj.dn

1154

				if filter_s is not None:

1086

				else:

1155

					if filter_s and not filter_s.startswith('('):

1087

					try:

1156

						filter_s = '(%s)' % filter_s

1088

						label = syn.label % obj.info

1157

					mapping = module.module.mapping

1089

					except KeyError:

1158

					ldap_attr = [mapping.mapName(att) for att in attr]

1090

						# fallback to the default description as this is just what displayed

1159

					search_options = {'filter' : filter_s, 'simple' : True}

1091

						# to the user (Bug #26994)

1160

					search_options.update(module_search_options)

1092

						label = udm_objects.description( obj )

1161

					if ldap_attr:

1093

1162

						search_options['simple_attrs'] = ldap_attr

1094

				result.append( (key, label) )

1163

						result = module.search( **search_options )

1095

			return result

1164

						for dn, ldap_map in result:

1096

1165

							info = univention.admin.mapping.mapDict(mapping, ldap_map)

1097

		for udm_module in syn.udm_modules:

1166

							key, label = extract_key_label(syn, dn, info)

1098

			module = UDM_Module( udm_module )

1167

							if key is None:

1099

			if module is None:

1168

								continue

1100

				continue

1169

							if label is None:

1101

			filter_s = _create_ldap_filter( syn, options, module )

1170

								label = ldap_connection.explodeDn(dn, 1)[0]

1102

			if filter_s is None:

1171

							syn.choices.append((key, label))

1103

				syn.choices = []

1172

					else:

1104

			else:

1173

						keys = module.search( **search_options )

1105

				search_options = {'filter' : filter_s}

1174

						if syn.label == 'dn':

1106

				search_options.update(module_search_options)

1175

							labels = keys

1107

				syn.choices.extend( map_choices( module.search( **search_options ) ) )

1176

						else:

1177

							labels = [ldap_connection.explodeDn(dn, 1)[0] for dn in keys]

1178

						syn.choices.extend(zip(keys, labels))

1108

		if isinstance( syn.static_values, ( tuple, list ) ):

1179

		if isinstance( syn.static_values, ( tuple, list ) ):

1109

			for value in syn.static_values:

1180

			for value in syn.static_values:

1110

				syn.choices.insert( 0, value )

1181

				syn.choices.insert( 0, value )

Return to bug 30991