Attachment #8331 for bug #43286




	def _ldap_post_remove(self):
		pass

	def remove_value(self, key, value=None):
		"""Removes a specific value from the specified property.
			If this value is currently not set univention.admin.uexceptions.valueNotSet is raised.
			if value is None the whole values of this property gets removed.
		"""
		if not self.has_key(key):
			raise univention.admin.uexceptions.noProperty(key)

		if value is None:
			# remove all currently set values
			self[key] = [] if self.descriptions[key].multivalue else None
			return

		if not self.contains_value(key, value):
			raise univention.admin.uexceptions.valueNotSet(key, value)

		if not self.descriptions[key].multivalue:
			self[key] = value
			return

		current_values = list(self[key])
		for val in current_values[:]:
			if self.compare_value(key, value, val):
				current_values.remove(val)
		self[key] = current_values

	def contains_value(self, key, value):
		if self.descriptions[key].multivalue and any(self.compare_value(key, value, val) for val in self[key]):
			return True
		if not self.descriptions[key].multivalue and self.compare_value(key, value, self[key]):
			return True
		return False

	def compare_value(self, key, a, b):
		return self.descriptions[key].syntax.compare(a, b)

	def append_value(self, key, value):
		if not self.has_key(key):
			raise univention.admin.uexceptions.noProperty(key)

		if self.contains_value(key, value):
			raise univention.admin.uexceptions.valueAlreadySet(key, value)

		if not self.descriptions[key].multivalue:
			self[key] = value
			return

		current_values = self[key]
		current_values.append(value)
		self[key] = current_values


def _not_implemented_method(attr):
	def _not_implemented_error(self, *args, **kwargs):

(-)a/management/univention-directory-manager-modules/modules/univention/admin/syntax.py (-3 / +13 lines)

Lines 138-143 def type(cls):	Link Here

138

	def tostring(self, text):

138

	def tostring(self, text):

139

		return text

139

		return text

140

141

	@classmethod

142

	def compare(cls, a, b):

143

		return a == b

144

141

145

142

class simple(ISyntax):

146

class simple(ISyntax):

143

	regex = None

147

	regex = None

Lines 2055-2071 class soundModule(select):	Link Here

2055

2059

2056

2060

2057

2061

2058

class GroupDN(UDM_Objects):

2062

class _DNCompare(UDM_Objects):

2063

	@classmethod

2064

	def compare(cls, a, b):

2065

		return univention.admin.uldap.DN(a) == univention.admin.uldap.DN(b)

2066

2067

2068

class GroupDN(_DNCompare):

2059

	udm_modules = ('groups/group', )

2069

	udm_modules = ('groups/group', )

2060

	use_objects = False

2070

	use_objects = False

2061

2071

2062

2072

2063

class UserDN(UDM_Objects):

2073

class UserDN(_DNCompare):

2064

	udm_modules = ('users/user', )

2074

	udm_modules = ('users/user', )

2065

	use_objects = False

2075

	use_objects = False

2066

2076

2067

2077

2068

class HostDN(UDM_Objects):

2078

class HostDN(_DNCompare):

2069

	udm_modules = ('computers/computer', )

2079

	udm_modules = ('computers/computer', )

2070

	udm_filter = '!(univentionObjectFlag=docker)'

2080

	udm_filter = '!(univentionObjectFlag=docker)'

2071

2081

(-)a/management/univention-directory-manager-modules/modules/univention/admin/uexceptions.py (+8 lines)

Lines 97-102 class valueMismatch(valueError):	Link Here

	message = _('Values do not match.')

	message = _('Values do not match.')

100

class valueNotSet(valueError):

101

	message = _('The value is not set.')

102

103

104

class valueAlreadySet(valueError):

105

	message = _('The value is already set.')

106

107

100

class noLock(base):

108

class noLock(base):

101

	message = _('Could not acquire lock.')

109

	message = _('Could not acquire lock.')

102

110




def object_input(module, object, input, append=None, remove=None):
	out = []
	if append:
		for key, values in append.items():
			if module.property_descriptions[key].syntax.name == 'file':
				if os.path.exists(values):
					fh = open(values, 'r')
					content = ''
					for line in fh.readlines():
						content += line
					object[key] = content
					fh.close()
				else:
					out.append('WARNING: file not found: %s' % values)
				continue

			elif univention.admin.syntax.is_syntax(module.property_descriptions[key].syntax, univention.admin.syntax.complex):
				for i in range(0, len(value)):
					test_val = value[i].split('"')
					if test_val[0] and test_val[0] == value[i]:
						val = value[i].split(' ')
					else:
						val = []
						for j in test_val:
							if j and j.rstrip().lstrip():
								val.append(j.rstrip().lstrip())

					if not object.has_key(key):
						object[key] = []
					if val in object[key]:
						out.append('WARNING: cannot append %s to %s, value exists' % (val, key))
					elif object[key] == [''] or object[key] == []:
						object[key] = [val]
					else:
						object[key].append(val)
			else:
				for val in value:
					if val in object[key]:
						out.append('WARNING: cannot append %s to %s, value exists' % (val, key))
					elif object[key] == [''] or object[key] == []:
						object[key] = [val]
					else:
						try:
							tmp = list(object[key])
							tmp.append(val)
							object[key] = list(tmp)
						except univention.admin.uexceptions.valueInvalidSyntax, errmsg:
							out.append('E: Invalid Syntax: %s' % str(errmsg))
	if remove:
		for key, value in remove.items():
			if univention.admin.syntax.is_syntax(module.property_descriptions[key].syntax, univention.admin.syntax.complex):
				values = _parse_complex_syntax_input(values)
					for i in range(0, len(value)):
						test_val = value[i].split('"')
						if test_val[0] and test_val[0] == value[i]:
							val = value[i].split(' ')
						else:
							val = []
							out.append('test_val=%s' % test_val)
							for j in test_val:
								if j and j.rstrip().lstrip():
									val.append(j.rstrip().lstrip())

			for value in values:
				try:
					object.append_value(key, value)
				except univention.admin.uexceptions.noProperty as exc:
					out.append("WARNING: No attribute with name %s in this module, value not appended." % (key,))
				except univention.admin.uexceptions.valueNotSet as exc:
					out.append("WARNING: cannot append %s to %s: %s" % (value, key, exc))
				except univention.admin.uexceptions.valueInvalidSyntax as exc:
					out.append('E: Invalid Syntax: %s' % (exc,))
	if remove:
		for key, values in remove.items():
			if not values:
				values = [None]  # remove the whole property

			if univention.admin.syntax.is_syntax(module.property_descriptions[key].syntax, univention.admin.syntax.complex):
				values = _parse_complex_syntax_input(values)
				if value is None:
					current_values = []
				else:
					vallist = [value] if isinstance(value, basestring) else value

			for value in values:
				try:
					object.remove_value(key, value)
				except univention.admin.uexceptions.noProperty as exc:
					out.append("WARNING: No attribute with name %s in this module, value not removed." % (key,))
				except univention.admin.uexceptions.valueNotSet as exc:
					out.append("WARNING: cannot remove %s from %s: %s" % (value, key, exc))
						current_values = current_values[0]
					except IndexError:
						current_values = None
				object[key] = current_values
	if input:
		for key, value in input.items():
			if module.property_descriptions[key].syntax.name == 'binaryfile':

					out.append('WARNING: file not found: %s' % value)

			elif univention.admin.syntax.is_syntax(module.property_descriptions[key].syntax, univention.admin.syntax.complex):
				val = _parse_complex_syntax_input(value)
					for i in range(0, len(value)):
						test_val = value[i].split('"')
						if test_val[0] and test_val[0] == value[i]:
							val = value[i].split(' ')
						else:
							val = []
							for j in test_val:
								if j and j.rstrip().lstrip():
									val.append(j.rstrip().lstrip())
				else:
					val = value.split(' ')
				if module.property_descriptions[key].multivalue:
					object[key] = [val]
				else:

	return out


def _parse_complex_syntax_input(values):
	parsed_values = []
	for value in values:
		if '"' not in value:
			value = value.split(' ')
		else:
			value = ['"%s"' % (x.strip(),) for x in value.split('"') if x.strip()]
		parsed_values.append(value)
	return parsed_values



def list_available_modules(o=[]):

	o.append("Available Modules are:")


	for opt, val in opts:
		if opt == '--set':
			try:
				name, value = val.split('=', 1)
			except ValueError:
				name, value = val, ''
			value = _2utf8(value)

			was_set = 0
			for mod, (properties, options) in information.items():
				if name not in properties:
					out.append("WARNING: No attribute with name '%s' in this module, value not set." % name)
					continue
				if properties[name].multivalue:
					input.setdefault(name, [])
					if value:
						input[name].append(value)
				else:
					input[name] = value
						input[name] = value
						was_set = 1

			if not was_set:
				out.append("WARNING: No attribute with name '%s' in this module, value not set." % name)
		elif opt == '--append':
			try:
				name, value = val.split('=', 1)
			except ValueError:
				name, value = val, ''
			value = _2utf8(value)
			for mod, (properties, options) in information.items():
				try:
					properties[name]
				except KeyError:
					pass
				else:
					if properties[name].multivalue:
						append.setdefault(name, [])
							append[name] = []
						if value:
							append[name].append(value)
					else:  # hmm. this should be illegal ^^
					else:
						append[name] = value
						was_set = 1
			if not was_set:
				out.append("WARNING: No attribute with name %s in this module, value not appended." % name)

		elif opt == '--remove':
			try:
				name, value = val.split('=', 1)
			except ValueError:
				name = val
				remove[name] = None
			else:
				value = _2utf8(value)
				remove.setdefault(name, []).append(value)
			was_set = False
			for mod, (properties, options) in information.items():
				if properties.has_key(name):
					was_set = True
					if properties[name].multivalue:
						if value is None:
							remove[name] = value
						elif value:
							remove.setdefault(name, [])
							if remove[name] is not None:
								remove[name].append(value)
					else:
						remove[name] = value
			if not was_set:
				out.append("WARNING: No attribute with name %s in this module, value not removed." % name)
		elif opt == '--remove_referring':
			remove_referring = 1
		elif opt == '--recursive':

Return to bug 43286