From 8ad535b618d60fa016061212ff85d0ad28ccae59 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 12 Jul 2021 11:02:10 -0400 Subject: [PATCH] Fall back to krbprincipalname when validating host auth indicators When adding a new host the principal cannot be determined because it relies on either: a) an entry to already exist b) krbprincipalname be a component of the dn As a result the full dn is being passed into ipapython.Kerberos which can't parse it. Look into the entry in validate_validate_auth_indicator() for krbprincipalname in this case. https://pagure.io/freeipa/issue/8206 Signed-off-by: Rob Crittenden Reviewed-By: Alexander Bokovoy Reviewed-By: Florence Blanc-Renaud --- ipaserver/plugins/service.py | 5 +++++ ipatests/test_xmlrpc/test_host_plugin.py | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/ipaserver/plugins/service.py b/ipaserver/plugins/service.py index cfbbff3c6..498f5e444 100644 --- a/ipaserver/plugins/service.py +++ b/ipaserver/plugins/service.py @@ -209,6 +209,11 @@ def validate_auth_indicator(entry): # and shouldn't be allowed to have auth indicators. # https://pagure.io/freeipa/issue/8206 pkey = api.Object['service'].get_primary_key_from_dn(entry.dn) + if pkey == str(entry.dn): + # krbcanonicalname may not be set yet if this is a host entry, + # try krbprincipalname + if 'krbprincipalname' in entry: + pkey = entry['krbprincipalname'] principal = kerberos.Principal(pkey) server = api.Command.server_find(principal.hostname)['result'] if server: diff --git a/ipatests/test_xmlrpc/test_host_plugin.py b/ipatests/test_xmlrpc/test_host_plugin.py index 9cfde3565..ff50e796c 100644 --- a/ipatests/test_xmlrpc/test_host_plugin.py +++ b/ipatests/test_xmlrpc/test_host_plugin.py @@ -615,6 +615,17 @@ class TestProtectedMaster(XMLRPC_test): )): command() + def test_add_non_master_with_auth_ind(self, host5): + host5.ensure_missing() + command = host5.make_command( + 'host_add', host5.fqdn, krbprincipalauthind=['radius'], + force=True + ) + result = command() + # The fact that the command succeeds exercises the change but + # let's check the indicator as well. + assert result['result']['krbprincipalauthind'] == ('radius',) + @pytest.mark.tier1 class TestValidation(XMLRPC_test): -- 2.31.1