From 1fe91d499179b3e33262cf201d398b1889e19b59 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 23 Aug 2022 16:58:07 +0300 Subject: [PATCH] WIP: fix canonicalization issue in Web UI Signed-off-by: Alexander Bokovoy --- install/ui/src/freeipa/ipa.js | 8 +++++++- ipaserver/rpcserver.py | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js index 758db1b00..e57f8af4d 100644 --- a/install/ui/src/freeipa/ipa.js +++ b/install/ui/src/freeipa/ipa.js @@ -271,7 +271,13 @@ var IPA = function () { var cn = that.whoami.data.krbcanonicalname; if (cn) that.principal = cn[0]; if (!that.principal) { - that.principal = that.whoami.data.krbprincipalname[0]; + var principal = data.result.principal; + var idx = that.whoami.data.krbprincipalname.indexOf(principal); + if (idx > -1) { + that.principal = principal; + } else { + that.principal = that.whoami.data.krbprincipalname[0]; + } } } else if (entity === 'idoverrideuser') { that.principal = that.whoami.data.ipaoriginaluid[0]; diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py index 1f85e9898..4e8a08b66 100644 --- a/ipaserver/rpcserver.py +++ b/ipaserver/rpcserver.py @@ -1109,6 +1109,7 @@ class login_password(Backend, KerberosSession): ccache_name, armor_ccache_name=armor_path, enterprise=True, + canonicalize=True, lifetime=self.api.env.kinit_lifetime) if armor_path: -- 2.37.2