IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

trusts: Make trust_show.get_dn raise properly formatted NotFound

Browse Source 
The trust_show command does not raise a properly formatted NotFound
error if the trust is not found, only a generic EmptyResult error
is raised.

This patch makes the trust_show tell us what actually could not be
found.

https://fedorahosted.org/freeipa/ticket/5389

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Tomas Babej 2015-10-23 10:39:47 +02:00
parent 288a9b9dba
commit 4d0d5913dd
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ipalib/plugins/trust.py
View File

@ -539,22 +539,38 @@ class trust(LDAPObject):
error=_("invalid SID: %(value)s") % dict(value=value)) error=_("invalid SID: %(value)s") % dict(value=value))
def get_dn(self, *keys, **kwargs): def get_dn(self, *keys, **kwargs):
trust_type = kwargs.get('trust_type')
sdn = [('cn', x) for x in keys] sdn = [('cn', x) for x in keys]
sdn.reverse() sdn.reverse()
trust_type = kwargs.get('trust_type')
if trust_type is None: if trust_type is None:
ldap = self.backend ldap = self.backend
filter = ldap.make_filter({'objectclass': ['ipaNTTrustedDomain'], 'cn': [keys[-1]] }, trustfilter = ldap.make_filter({
rules=ldap.MATCH_ALL) 'objectclass': ['ipaNTTrustedDomain'],
filter = ldap.combine_filters((filter, "ipaNTSecurityIdentifier=*"), rules=ldap.MATCH_ALL) 'cn': [keys[-1]]},
result = ldap.get_entries(DN(self.container_dn, self.env.basedn), rules=ldap.MATCH_ALL
ldap.SCOPE_SUBTREE, filter, ['']) )
trustfilter = ldap.combine_filters(
(trustfilter, "ipaNTSecurityIdentifier=*"),
rules=ldap.MATCH_ALL
)
try:
result = ldap.get_entries(
DN(self.container_dn, self.env.basedn),
ldap.SCOPE_SUBTREE, trustfilter, ['']
)
except errors.NotFound:
self.handle_not_found(keys[-1])
if len(result) > 1: if len(result) > 1:
raise errors.OnlyOneValueAllowed(attr='trust domain') raise errors.OnlyOneValueAllowed(attr='trust domain')
return result[0].dn return result[0].dn
dn=make_trust_dn(self.env, trust_type, DN(*sdn)) return make_trust_dn(self.env, trust_type, DN(*sdn))
return dn
@register() @register()
class trust_add(LDAPCreate): class trust_add(LDAPCreate):