Unify display of principal names/aliases across entities

Since now users, hosts, and service all support assigning multiple principal
aliases to them, the display of kerberos principal names should be consistent
across all these objects. Principal aliases and canonical names will now be
displayed in all add, mod, show, and find operations.

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

Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>

1 files changed, 34 insertions, 3 deletions

diff --git a/ipatests/test_xmlrpc/test_service_plugin.py b/ipatests/test_xmlrpc/test_service_plugin.py
index 69af06873..54ae55963 100644
--- a/ipatests/test_xmlrpc/test_service_plugin.py
+++ b/ipatests/test_xmlrpc/test_service_plugin.py
@@ -114,6 +114,7 @@ class test_service(Declarative):
                     description=[u'Test host 1'],
                     l=[u'Undisclosed location 1'],
                     krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)],
+                    krbcanonicalname=[u'host/%s@%s' % (fqdn1, api.env.realm)],
                     objectclass=objectclasses.host,
                     ipauniqueid=[fuzzy_uuid],
                     managedby_host=[u'%s' % fqdn1],
@@ -142,6 +143,7 @@ class test_service(Declarative):
                     description=[u'Test host 2'],
                     l=[u'Undisclosed location 2'],
                     krbprincipalname=[u'host/%s@%s' % (fqdn2, api.env.realm)],
+                    krbcanonicalname=[u'host/%s@%s' % (fqdn2, api.env.realm)],
                     objectclass=objectclasses.host,
                     ipauniqueid=[fuzzy_uuid],
                     managedby_host=[u'%s' % fqdn2],
@@ -170,6 +172,8 @@ class test_service(Declarative):
                     description=[u'Test host 3'],
                     l=[u'Undisclosed location 3'],
                     krbprincipalname=[u'host/%s@%s' % (fqdn3.lower(), api.env.realm)],
+                    krbcanonicalname=[u'host/%s@%s' % (
+                        fqdn3.lower(), api.env.realm)],
                     objectclass=objectclasses.host,
                     ipauniqueid=[fuzzy_uuid],
                     managedby_host=[u'%s' % fqdn3.lower()],
@@ -223,6 +227,7 @@ class test_service(Declarative):
                 result=dict(
                     dn=service1dn,
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     has_keytab=False,
                     managedby_host=[fqdn1],
                 ),
@@ -263,7 +268,7 @@ class test_service(Declarative):
                     dict(
                         dn=service1dn,
                         krbprincipalname=[service1],
-                        krbcanonicalname=service1,
+                        krbcanonicalname=[service1],
                         managedby_host=[fqdn1],
                         has_keytab=False,
                     ),
@@ -283,7 +288,7 @@ class test_service(Declarative):
                     dict(
                         dn=service1dn,
                         krbprincipalname=[service1],
-                        krbcanonicalname=service1,
+                        krbcanonicalname=[service1],
                         has_keytab=False,
                     ),
                 ],
@@ -325,6 +330,7 @@ class test_service(Declarative):
                 result=dict(
                     dn=service1dn,
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -340,6 +346,7 @@ class test_service(Declarative):
                 result=dict(
                     dn=service1dn,
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -355,6 +362,7 @@ class test_service(Declarative):
                 result=dict(
                     dn=service1dn,
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1, fqdn2],
                 ),
             ),
@@ -370,6 +378,7 @@ class test_service(Declarative):
                 result=dict(
                     dn=service1dn,
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -385,6 +394,7 @@ class test_service(Declarative):
                 result=dict(
                     dn=service1dn,
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1, fqdn3.lower()],
                 ),
             ),
@@ -400,6 +410,7 @@ class test_service(Declarative):
                 result=dict(
                     dn=service1dn,
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -428,6 +439,7 @@ class test_service(Declarative):
                 result=dict(
                     usercertificate=[base64.b64decode(servercert)],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                     valid_not_before=fuzzy_date,
                     valid_not_after=fuzzy_date,
@@ -463,6 +475,7 @@ class test_service(Declarative):
                 result=dict(
                     usercertificate=[base64.b64decode(servercert)],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                     ipakrbauthzdata=[u'MS-PAC'],
                     valid_not_before=fuzzy_date,
@@ -488,6 +501,7 @@ class test_service(Declarative):
                     dn=service1dn,
                     usercertificate=[base64.b64decode(servercert)],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     has_keytab=False,
                     managedby_host=[fqdn1],
                     ipakrbauthzdata=[u'MS-PAC'],
@@ -515,6 +529,7 @@ class test_service(Declarative):
                 result=dict(
                     usercertificate=[base64.b64decode(servercert)],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                     ipakrbauthzdata=[u'MS-PAC'],
                     valid_not_before=fuzzy_date,
@@ -542,6 +557,7 @@ class test_service(Declarative):
                 result=dict(
                     usercertificate=[base64.b64decode(servercert)],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                     ipakrbauthzdata=[u'MS-PAC'],
                     valid_not_before=fuzzy_date,
@@ -567,6 +583,7 @@ class test_service(Declarative):
                 result=dict(
                     usercertificate=[base64.b64decode(servercert)],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                     ipakrbauthzdata=[u'MS-PAC'],
                     valid_not_before=fuzzy_date,
@@ -623,7 +640,7 @@ class test_service(Declarative):
             desc='Create service with malformed principal "foo"',
             command=('service_add', [u'foo'], {}),
             expected=errors.ValidationError(
-                name='principal',
+                name='canonical_principal',
                 error='Service principal is required')
         ),
 
@@ -702,6 +719,7 @@ class test_service_in_role(Declarative):
                     description=[u'Test host 1'],
                     l=[u'Undisclosed location 1'],
                     krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)],
+                    krbcanonicalname=[u'host/%s@%s' % (fqdn1, api.env.realm)],
                     objectclass=objectclasses.host,
                     ipauniqueid=[fuzzy_uuid],
                     managedby_host=[u'%s' % fqdn1],
@@ -776,6 +794,7 @@ class test_service_in_role(Declarative):
                 result=dict(
                     dn=service1dn,
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                     memberof_role=[role1],
                     has_keytab=False,
@@ -889,6 +908,7 @@ class test_service_allowed_to(Declarative):
                     description=[u'Test host 1'],
                     l=[u'Undisclosed location 1'],
                     krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)],
+                    krbcanonicalname=[u'host/%s@%s' % (fqdn1, api.env.realm)],
                     objectclass=objectclasses.host,
                     ipauniqueid=[fuzzy_uuid],
                     managedby_host=[u'%s' % fqdn1],
@@ -952,6 +972,7 @@ class test_service_allowed_to(Declarative):
                     dn=service1dn,
                     ipaallowedtoperform_read_keys_user=[user1],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -975,6 +996,7 @@ class test_service_allowed_to(Declarative):
                     dn=service1dn,
                     ipaallowedtoperform_read_keys_user=[user1],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -1003,6 +1025,7 @@ class test_service_allowed_to(Declarative):
                     ipaallowedtoperform_read_keys_host=[fqdn1],
                     ipaallowedtoperform_read_keys_hostgroup=[hostgroup1],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -1029,6 +1052,7 @@ class test_service_allowed_to(Declarative):
                     ipaallowedtoperform_read_keys_host=[fqdn1],
                     ipaallowedtoperform_read_keys_hostgroup=[hostgroup1],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -1055,6 +1079,7 @@ class test_service_allowed_to(Declarative):
                     ipaallowedtoperform_read_keys_host=[fqdn1],
                     ipaallowedtoperform_read_keys_hostgroup=[hostgroup1],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -1087,6 +1112,7 @@ class test_service_allowed_to(Declarative):
                     ipaallowedtoperform_write_keys_host=[fqdn1],
                     ipaallowedtoperform_write_keys_hostgroup=[hostgroup1],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -1118,6 +1144,7 @@ class test_service_allowed_to(Declarative):
                     ipaallowedtoperform_write_keys_host=[fqdn1],
                     ipaallowedtoperform_write_keys_hostgroup=[hostgroup1],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -1148,6 +1175,7 @@ class test_service_allowed_to(Declarative):
                     ipaallowedtoperform_write_keys_host=[fqdn1],
                     ipaallowedtoperform_write_keys_hostgroup=[hostgroup1],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -1178,6 +1206,7 @@ class test_service_allowed_to(Declarative):
                     ipaallowedtoperform_write_keys_host=[fqdn1],
                     ipaallowedtoperform_write_keys_hostgroup=[hostgroup1],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -1201,6 +1230,7 @@ class test_service_allowed_to(Declarative):
                     ipaallowedtoperform_write_keys_host=[fqdn1],
                     ipaallowedtoperform_write_keys_hostgroup=[hostgroup1],
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     managedby_host=[fqdn1],
                 ),
             ),
@@ -1225,6 +1255,7 @@ class test_service_allowed_to(Declarative):
                     ipaallowedtoperform_write_keys_hostgroup=[hostgroup1],
                     ipakrbokasdelegate=True,
                     krbprincipalname=[service1],
+                    krbcanonicalname=[service1],
                     krbticketflags=[u'1048704'],
                     managedby_host=[fqdn1],
                 ),