mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-01-12 17:21:55 -06:00
ipa passwd: use correct normalizer for user principals
Commit c2af032c03
introduced a regression in the
handling of user principals supplied to the`ipa passwd` command. This patch
restores the original behavior which lowercases the username portion of the
principal.
https://fedorahosted.org/freeipa/ticket/6329
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
parent
7cac839203
commit
f3f9087ee8
@ -29,7 +29,8 @@ from ipalib.plugable import Registry
|
|||||||
from ipalib.request import context
|
from ipalib.request import context
|
||||||
from ipapython import kerberos
|
from ipapython import kerberos
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipaserver.plugins.service import validate_realm, normalize_principal
|
from ipaserver.plugins.baseuser import normalize_user_principal
|
||||||
|
from ipaserver.plugins.service import validate_realm
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
unicode = str
|
unicode = str
|
||||||
@ -66,7 +67,7 @@ def get_current_password(principal):
|
|||||||
be ignored later.
|
be ignored later.
|
||||||
"""
|
"""
|
||||||
current_principal = krb_utils.get_principal()
|
current_principal = krb_utils.get_principal()
|
||||||
if current_principal == unicode(normalize_principal(principal)):
|
if current_principal == unicode(normalize_user_principal(principal)):
|
||||||
return None
|
return None
|
||||||
else:
|
else:
|
||||||
return MAGIC_VALUE
|
return MAGIC_VALUE
|
||||||
@ -84,7 +85,7 @@ class passwd(Command):
|
|||||||
primary_key=True,
|
primary_key=True,
|
||||||
autofill=True,
|
autofill=True,
|
||||||
default_from=lambda: kerberos.Principal(krb_utils.get_principal()),
|
default_from=lambda: kerberos.Principal(krb_utils.get_principal()),
|
||||||
normalizer=lambda value: normalize_principal(value),
|
normalizer=lambda value: normalize_user_principal(value),
|
||||||
),
|
),
|
||||||
Password('password',
|
Password('password',
|
||||||
label=_('New Password'),
|
label=_('New Password'),
|
||||||
|
Loading…
Reference in New Issue
Block a user