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

service: Normalize service principal in get_dn

Browse Source 
This will make any lookup go through the normalization.

Reviewed-By: Martin Kosek <mkosek@redhat.com>
This commit is contained in:
Petr Viktorin 2014-08-20 15:34:34 +02:00 committed by Martin Kosek
parent e5b78c2029
commit e49768864f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ipalib/plugins/service.py
View File

@ -406,6 +406,9 @@ class service(LDAPObject):
raise errors.ValidationError(name='ipakrbauthzdata', raise errors.ValidationError(name='ipakrbauthzdata',
error=_('NONE value cannot be combined with other PAC types')) error=_('NONE value cannot be combined with other PAC types'))
def get_dn(self, *keys, **kwargs):
keys = (normalize_principal(k) for k in keys)
return super(service, self).get_dn(*keys, **kwargs)
@register() @register()

10
ipatests/test_xmlrpc/test_service_plugin.py
View File

@ -33,7 +33,8 @@ from ipapython.dn import DN
fqdn1 = u'testhost1.%s' % api.env.domain fqdn1 = u'testhost1.%s' % api.env.domain
fqdn2 = u'testhost2.%s' % api.env.domain fqdn2 = u'testhost2.%s' % api.env.domain
fqdn3 = u'TestHost3.%s' % api.env.domain fqdn3 = u'TestHost3.%s' % api.env.domain
service1 = u'HTTP/%s@%s' % (fqdn1, api.env.realm) service1_no_realm = u'HTTP/%s' % fqdn1
service1 = u'%s@%s' % (service1_no_realm, api.env.realm)
hostprincipal1 = u'host/%s@%s' % (fqdn1, api.env.realm) hostprincipal1 = u'host/%s@%s' % (fqdn1, api.env.realm)
service1dn = DN(('krbprincipalname',service1),('cn','services'),('cn','accounts'),api.env.basedn) service1dn = DN(('krbprincipalname',service1),('cn','services'),('cn','accounts'),api.env.basedn)
host1dn = DN(('fqdn',fqdn1),('cn','computers'),('cn','accounts'),api.env.basedn) host1dn = DN(('fqdn',fqdn1),('cn','computers'),('cn','accounts'),api.env.basedn)
@ -667,7 +668,7 @@ class test_service_in_role(Declarative):
dict( dict(
desc='Create %r' % service1, desc='Create %r' % service1,
command=('service_add', [service1], dict(force=True)), command=('service_add', [service1_no_realm], dict(force=True)),
expected=dict( expected=dict(
value=service1, value=service1,
summary=u'Added service "%s"' % service1, summary=u'Added service "%s"' % service1,
@ -698,7 +699,8 @@ class test_service_in_role(Declarative):
dict( dict(
desc='Add %r to %r' % (service1, role1), desc='Add %r to %r' % (service1, role1),
command=('role_add_member', [role1], dict(service=service1)), command=('role_add_member', [role1],
dict(service=service1_no_realm)),
expected=dict( expected=dict(
failed=dict( failed=dict(
member=dict( member=dict(
@ -721,7 +723,7 @@ class test_service_in_role(Declarative):
dict( dict(
desc='Verify %r is member of %r' % (service1, role1), desc='Verify %r is member of %r' % (service1, role1),
command=('service_show', [service1], {}), command=('service_show', [service1_no_realm], {}),
expected=dict( expected=dict(
value=service1, value=service1,
summary=None, summary=None,