Attachment #10059 for bug #49638

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




			raise ldap.NO_SUCH_OBJECT({'desc': 'no object'})
		return []

	def search(self, filter='(objectClass=*)', base='', scope='sub', attr=[], unique=False, required=False, timeout=-1, sizelimit=0, serverctrls=None, response=None):
		# type: (str, str, str, List[str], bool, bool, int, int, Optional[List[ldap.controls.LDAPControl]]) -> List[Tuple[str, Dict[str, List[str]]]]
		"""
		Perform LDAP search and return values.

			base = self.base

		if scope == 'base+one':
			res = self.__search(response, base, ldap.SCOPE_BASE, filter, attr, serverctrls=serverctrls, clientctrls=None, timeout=timeout, sizelimit=sizelimit) + \
				self.__search(response, base, ldap.SCOPE_ONELEVEL, filter, attr, serverctrls=serverctrls, clientctrls=None, timeout=timeout, sizelimit=sizelimit)
		else:
			if scope == 'sub' or scope == 'domain':
				ldap_scope = ldap.SCOPE_SUBTREE

				ldap_scope = ldap.SCOPE_ONELEVEL
			else:
				ldap_scope = ldap.SCOPE_BASE
			res = self.__search(response, base, ldap_scope, filter, attr, serverctrls=serverctrls, clientctrls=None, timeout=timeout, sizelimit=sizelimit)

		if unique and len(res) > 1:
			raise ldap.INAPPROPRIATE_MATCHING({'desc': 'more than one object'})

			raise ldap.NO_SUCH_OBJECT({'desc': 'no object'})
		return res

	def __search(self, response, *args, **kwargs):
		try:
			rtype, rdata, rmsgid, resp_ctrls = self.lo.result3(self.lo.search_ext(*args, **kwargs))
		except ldap.REFERRAL as exc:
			if not self.follow_referral:
				raise
			lo_ref = self._handle_referral(exc)
			rtype, rdata, rmsgid, resp_ctrls = lo_ref.result3(lo_ref.search_ext(*args, **kwargs))

		if kwargs.get('serverctrls') and isinstance(response, dict):
			response['ctrls'] = resp_ctrls
		return rdata

	def searchDn(self, filter='(objectClass=*)', base='', scope='sub', unique=False, required=False, timeout=-1, sizelimit=0, serverctrls=None, response=None):
		# type: (str, str, str, bool, bool, int, int, Optional[List[ldap.controls.LDAPControl]]) -> List[str]
		"""
		Perform LDAP search and return distinguished names only.

		:raises ldap.INAPPROPRIATE_MATCHING: Indicates that the matching rule specified in the search filter does not match a rule defined for the attribute's syntax.
		"""
		_d = univention.debug.function('uldap.searchDn filter=%s base=%s scope=%s unique=%d required=%d' % (filter, base, scope, unique, required))  # noqa F841
		return [x[0] for x in self.search(filter, base, scope, ['dn'], unique, required, timeout, sizelimit, serverctrls, response)]

	def getPolicies(self, dn, policies=None, attrs=None, result=None, fixedattrs=None):
		# type: (str, List[str], Dict[str, List[Any]], Any, Any) -> Dict[str, Dict[str, Any]]

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py (-2 / +2 lines)

Lines 1691-1697 class simpleLdap(object):	Link Here

1691

		return containers

1691

		return containers

1692

1693

	@classmethod

1693

	@classmethod

1694

	def lookup(cls, co, lo, filter_s, base='', superordinate=None, scope='sub', unique=False, required=False, timeout=-1, sizelimit=0):  # type: (univention.admin.uldap.config, univention.admin.uldap.access, str, str, Optional[str], str, bool, bool, int, int) -> list[simpleLdap]

1694

	def lookup(cls, co, lo, filter_s, base='', superordinate=None, scope='sub', unique=False, required=False, timeout=-1, sizelimit=0, serverctrls=None, response=None):  # type: (univention.admin.uldap.config, univention.admin.uldap.access, str, str, Optional[str], str, bool, bool, int, int) -> list[simpleLdap]

1695

"""

1695

"""

1696

		Perform a LDAP search and return a list of instances.

1696

		Perform a LDAP search and return a list of instances.

1697

Lines 1714-1720 class simpleLdap(object):	Link Here

1714

		filter_str = unicode(filter_s or '')

1714

		filter_str = unicode(filter_s or '')

1715

		attr = cls._ldap_attributes()

1715

		attr = cls._ldap_attributes()

1716

		result = []

1716

		result = []

1717

		for dn, attrs in lo.search(filter_str, base, scope, attr, unique, required, timeout, sizelimit):

1717

		for dn, attrs in lo.search(filter_str, base, scope, attr, unique, required, timeout, sizelimit, serverctrls=serverctrls, response=response):

1718

			try:

1718

			try:

1719

				result.append(cls(co, lo, None, dn=dn, superordinate=superordinate, attributes=attrs))

1719

				result.append(cls(co, lo, None, dn=dn, superordinate=superordinate, attributes=attrs))

1720

			except univention.admin.uexceptions.base as exc:

1720

			except univention.admin.uexceptions.base as exc:




		"""
		return self.lo.getAttr(dn, attr, required)

	def search(self, filter='(objectClass=*)', base='', scope='sub', attr=[], unique=False, required=False, timeout=-1, sizelimit=0, serverctrls=None, response=None):
		# type: (str, str, str, List[str], bool, bool, int, int) -> List[Tuple[str, Dict[str, List[str]]]]
		"""
		Perform LDAP search and return values.

		:raises univention.admin.uexceptions.ldapError: on any other LDAP error.
		"""
		try:
			return self.lo.search(filter, base, scope, attr, unique, required, timeout, sizelimit, serverctrls=serverctrls, response=response)
		except ldap.NO_SUCH_OBJECT as msg:
			raise univention.admin.uexceptions.noObject(_err2str(msg))
		except ldap.INAPPROPRIATE_MATCHING as msg:

		except ldap.LDAPError as msg:
			raise univention.admin.uexceptions.ldapError(_err2str(msg), original_exception=msg)

	def searchDn(self, filter='(objectClass=*)', base='', scope='sub', unique=False, required=False, timeout=-1, sizelimit=0, serverctrls=None, response=None):
		# type: (str, str, str, bool, bool, int, int) -> List[str]
		"""
		Perform LDAP search and return distinguished names only.

		:raises univention.admin.uexceptions.ldapError: on any other LDAP error.
		"""
		try:
			return self.lo.searchDn(filter, base, scope, unique, required, timeout, sizelimit, serverctrls=serverctrls, response=response)
		except ldap.NO_SUCH_OBJECT as msg:
			raise univention.admin.uexceptions.noObject(_err2str(msg))
		except ldap.INAPPROPRIATE_MATCHING as msg:

Return to bug 49638