From 0b7117596d1ba201d8c8713bbc43fdbb04726d2d Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 24 Mar 2008 10:53:33 -0400 Subject: [PATCH] We are really changing the kerberos principal key and not the password when we do updates, so use the right terminology internally. Also fix the actual field we update (and grant permission appropriately in delegations). The DS password handles updating userPassword and any Samba passwords as necessary. 438256 --- ipa-server/ipa-gui/ipagui/forms/delegate.py | 2 +- ipa-server/ipa-gui/ipagui/forms/user.py | 16 ++++----- .../ipa-gui/ipagui/subcontrollers/user.py | 12 +++---- .../ipa-gui/ipagui/templates/usereditform.kid | 36 +++++++++---------- .../ipa-gui/ipagui/templates/usernewform.kid | 24 ++++++------- ipa-server/xmlrpc-server/attrs.py | 8 ++--- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/ipa-server/ipa-gui/ipagui/forms/delegate.py b/ipa-server/ipa-gui/ipagui/forms/delegate.py index bb9134834..0c080b32a 100644 --- a/ipa-server/ipa-gui/ipagui/forms/delegate.py +++ b/ipa-server/ipa-gui/ipagui/forms/delegate.py @@ -29,7 +29,7 @@ aci_attrs = [ UserFields.displayname, UserFields.initials, UserFields.uid, - UserFields.userpassword, + UserFields.krbprincipalkey, UserFields.uidnumber, UserFields.gidnumber, UserFields.homedirectory, diff --git a/ipa-server/ipa-gui/ipagui/forms/user.py b/ipa-server/ipa-gui/ipagui/forms/user.py index 439b3a34c..a149dc476 100644 --- a/ipa-server/ipa-gui/ipagui/forms/user.py +++ b/ipa-server/ipa-gui/ipagui/forms/user.py @@ -29,8 +29,8 @@ class UserFields(object): initials = widgets.TextField(name="initials", label="Initials") uid = widgets.TextField(name="uid", label="Login", attrs=dict(onchange="warnRDN(this.id)")) - userpassword = widgets.PasswordField(name="userpassword", label="Password") - userpassword_confirm = widgets.PasswordField(name="userpassword_confirm", + krbprincipalkey = widgets.PasswordField(name="krbprincipalkey", label="Password") + krbprincipalkey_confirm = widgets.PasswordField(name="krbprincipalkey_confirm", label="Confirm Password") uidnumber = widgets.TextField(name="uidnumber", label="UID") gidnumber = widgets.TextField(name="gidnumber", label="GID") @@ -85,15 +85,15 @@ class UserFields(object): class UserNewValidator(validators.Schema): uid = validators.PlainText(not_empty=True) - userpassword = validators.String(not_empty=False) - userpassword_confirm = validators.String(not_empty=False) + krbprincipalkey = validators.String(not_empty=False) + krbprincipalkey_confirm = validators.String(not_empty=False) givenname = validators.String(not_empty=True) sn = validators.String(not_empty=True) cn = validators.ForEach(validators.String(not_empty=True)) mail = validators.Email(not_empty=False) chained_validators = [ - validators.FieldsMatch('userpassword', 'userpassword_confirm') + validators.FieldsMatch('krbprincipalkey', 'krbprincipalkey_confirm') ] @@ -121,8 +121,8 @@ class UserNewForm(widgets.Form): super(UserNewForm,self).update_params(params) class UserEditValidator(validators.Schema): - userpassword = validators.String(not_empty=False) - userpassword_confirm = validators.String(not_empty=False) + krbprincipalkey = validators.String(not_empty=False) + krbprincipalkey_confirm = validators.String(not_empty=False) givenname = validators.String(not_empty=True) sn = validators.String(not_empty=True) cn = validators.ForEach(validators.String(not_empty=True)) @@ -137,7 +137,7 @@ class UserEditValidator(validators.Schema): ] chained_validators = [ - validators.FieldsMatch('userpassword', 'userpassword_confirm') + validators.FieldsMatch('krbprincipalkey', 'krbprincipalkey_confirm') ] class UserEditForm(widgets.Form): diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py index f20c423e7..6cb064902 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py @@ -264,9 +264,9 @@ class UserController(IPAController): # # Set the Password # - if kw.get('userpassword'): + if kw.get('krbprincipalkey'): try: - client.modifyPassword(user_dict['krbprincipalname'], "", kw.get('userpassword')) + client.modifyPassword(user_dict['krbprincipalname'], "", kw.get('krbprincipalkey')) except ipaerror.IPAError, e: message = "User successfully created.
" message += "There was an error setting the password.
" @@ -357,8 +357,8 @@ class UserController(IPAController): user_dict = self.initialize_mv_fields(user_dict) # Edit shouldn't fill in the password field. - if user_dict.has_key('userpassword'): - del(user_dict['userpassword']) + if user_dict.has_key('krbprincipalkey'): + del(user_dict['krbprincipalkey']) user_dict['uid_hidden'] = user_dict.get('uid') @@ -512,7 +512,7 @@ class UserController(IPAController): new_user.setValueNotEmpty('labeleduri', kw.get('labeleduri')) if kw.get('editprotected') == 'true': - if kw.get('userpassword'): + if kw.get('krbprincipalkey'): password_change = True new_user.setValueNotEmpty('uidnumber', str(kw.get('uidnumber'))) new_user.setValueNotEmpty('gidnumber', str(kw.get('gidnumber'))) @@ -547,7 +547,7 @@ class UserController(IPAController): # try: if password_change: - rv = client.modifyPassword(orig_user_dict['krbprincipalname'], "", kw.get('userpassword')) + rv = client.modifyPassword(orig_user_dict['krbprincipalname'], "", kw.get('krbprincipalkey')) except ipaerror.IPAError, e: turbogears.flash("User password change failed: " + str(e) + "
" + e.detail[0]['desc']) return dict(form=user_edit_form, user=kw, diff --git a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid index e6d9b7d25..b2a3c39c5 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid @@ -54,8 +54,8 @@ from ipagui.helpers import ipahelper