Attachment #7426 for bug #38635

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

(-)a/management/univention-management-console-module-udm/umc/python/udm/__init__.py (-3 / +16 lines)

Lines 69-75	Link Here

from .udm_ldap import (

from .udm_ldap import (

	UDM_Error, UDM_Module, UDM_Settings,

	UDM_Error, UDM_Module, UDM_Settings,

	ldap_dn2path, get_module, read_syntax_choices, list_objects,

	ldap_dn2path, get_module, read_syntax_choices, list_objects, _get_syntax,

	LDAP_Connection, set_bind_function, container_modules,

	LDAP_Connection, set_bind_function, container_modules,

	info_syntax_choices, search_syntax_choices_by_key,

	info_syntax_choices, search_syntax_choices_by_key,

	UserWithoutDN, ObjectDoesNotExist, SuperordinateDoesNotExist, NoIpLeft,

	UserWithoutDN, ObjectDoesNotExist, SuperordinateDoesNotExist, NoIpLeft,

Lines 894-906 def _thread(request):	Link Here

894

		thread = notifier.threads.Simple('Validate', notifier.Callback(_thread, request), notifier.Callback(self.thread_finished_callback, request))

894

		thread = notifier.threads.Simple('Validate', notifier.Callback(_thread, request), notifier.Callback(self.thread_finished_callback, request))

895

		thread.run()

895

		thread.run()

896

897

	@sanitize(key=LDAPSearchSanitizer(use_asterisks=False))

897

	@sanitize(

898

		syntax=StringSanitizer(required=True),

899

		key=LDAPSearchSanitizer(use_asterisks=False),

900

898

	@simple_response

901

	@simple_response

899

	def syntax_choices_key(self, syntax, key):

902

	def syntax_choices_key(self, syntax, key):

903

		syntax = _get_syntax(syntax)

904

		if syntax is None:

905

			return

900

		return search_syntax_choices_by_key(syntax, key)

906

		return search_syntax_choices_by_key(syntax, key)

901

907

908

	@sanitize(syntax=StringSanitizer(required=True))

902

	@simple_response

909

	@simple_response

903

	def syntax_choices_info(self, syntax):

910

	def syntax_choices_info(self, syntax):

911

		syntax = _get_syntax(syntax)

912

		if syntax is None:

913

			return

904

		return info_syntax_choices(syntax)

914

		return info_syntax_choices(syntax)

905

915

906

	@sanitize(

916

	@sanitize(

Lines 918-924 def syntax_choices(self, request):	Link Here

918

"""

928

"""

919

929

920

		def _thread(request):

930

		def _thread(request):

921

			return read_syntax_choices(request.options['syntax'], request.options)

931

			syntax = _get_syntax(request.options['syntax'])

932

			if syntax is None:

933

				return

934

			return read_syntax_choices(syntax, request.options)

922

935

923

		thread = notifier.threads.Simple('SyntaxChoice', notifier.Callback(_thread, request), notifier.Callback(self.thread_finished_callback, request))

936

		thread = notifier.threads.Simple('SyntaxChoice', notifier.Callback(_thread, request), notifier.Callback(self.thread_finished_callback, request))

924

		thread.run()

937

		thread.run()




			if key == property_name:
				value = default_value(prop.syntax)
				if isinstance(value, (list, tuple)):
					value = read_syntax_choices(prop.syntax)
				return value

	def _map_properties(self, obj, properties):

	return udm_syntax.__dict__[syntax_name]()


def search_syntax_choices_by_key(syn, key):
	syn = _get_syntax(syntax_name)
	if syn is None:
		return None

	if issubclass(syn.__class__, udm_syntax.UDM_Objects):
		if syn.key == 'dn':
			module_search_options = {'scope': 'base', 'container': key}
			try:
				return read_syntax_choices(syn, {}, module_search_options)
			except udm_errors.base:  # TODO: which exception is raised here exactly?
				# invalid DN
				return []

			if match:
				attr = match.groups()[0]
				options = {'objectProperty': attr, 'objectPropertyValue': key}
				return read_syntax_choices(syn, options)

	MODULE.warn('Syntax %r: No fast search function' % syn.name)
	# return them all, as there is no reason to filter after everything has loaded
	# frontend will cache it.
	return read_syntax_choices(syn)


def info_syntax_choices(syntax_name, options={}):
	syn = _get_syntax(syntax_name)
	if syn is None:
		return None

def info_syntax_choices(syn, options={}):
	if issubclass(syn.__class__, udm_syntax.UDM_Objects):
		size = 0
		if syn.static_values is not None:



@LDAP_Connection
def read_syntax_choices(syn, options={}, module_search_options={}, ldap_connection=None, ldap_position=None):
	syntax_name = syn.name
	if syn is None:
		return None

	if issubclass(syn.__class__, udm_syntax.UDM_Objects):
		syn.choices = []

			syn.choices.append((dn, dn_list[0].split('=', 1)[1]))
	elif issubclass(syn.__class__, udm_syntax.LDAP_Search):
		options = options.get('options', {})
		try:
			syntax = udm_syntax.LDAP_Search(options['syntax'], options['filter'], options['attributes'], options['base'], options['value'], options['viewonly'], options['empty'], options['empty_end'])
		except KeyError:
			syntax = syn

		if '$dn$' in options:
			filter_mod = get_module(None, options['$dn$'])

					id = obj.oldattr[store][0]
				else:
					# no valid store object, ignore
					MODULE.warn('LDAP_Search syntax %r: %r is no valid property for object %r - ignoring entry.' % (syntax.name, store, dn))
					continue

			# find the value to display

Return to bug 38635