llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 10:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: LDAP user can reset password with old password and new password (#3516)

Browse Source 
* feat: support user reset password with old password and new password

* feat: merge similar code
This commit is contained in:
DacongDA 2025-01-20 21:42:05 +08:00 committed by GitHub
parent 18b49bb731
commit db551eb24a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/user.go
View File

@ -574,7 +574,11 @@ func (c *ApiController) SetPassword() {
if user.Ldap == "" { if user.Ldap == "" {
_, err = object.UpdateUser(userId, targetUser, []string{"password", "need_update_password", "password_type", "last_change_password_time"}, false) _, err = object.UpdateUser(userId, targetUser, []string{"password", "need_update_password", "password_type", "last_change_password_time"}, false)
} else { } else {
err = object.ResetLdapPassword(targetUser, newPassword, c.GetAcceptLanguage()) if isAdmin {
err = object.ResetLdapPassword(targetUser, "", newPassword, c.GetAcceptLanguage())
} else {
err = object.ResetLdapPassword(targetUser, oldPassword, newPassword, c.GetAcceptLanguage())
}
} }
if err != nil { if err != nil {

11
object/ldap_conn.go
View File

@ -375,7 +375,7 @@ func GetExistUuids(owner string, uuids []string) ([]string, error) {
return existUuids, nil return existUuids, nil
} }
func ResetLdapPassword(user *User, newPassword string, lang string) error { func ResetLdapPassword(user *User, oldPassword string, newPassword string, lang string) error {
ldaps, err := GetLdaps(user.Owner) ldaps, err := GetLdaps(user.Owner)
if err != nil { if err != nil {
return err return err
@ -418,6 +418,15 @@ func ResetLdapPassword(user *User, newPassword string, lang string) error {
} }
modifyPasswordRequest.Replace("unicodePwd", []string{pwdEncoded}) modifyPasswordRequest.Replace("unicodePwd", []string{pwdEncoded})
modifyPasswordRequest.Replace("userAccountControl", []string{"512"}) modifyPasswordRequest.Replace("userAccountControl", []string{"512"})
} else if oldPassword != "" {
modifyPasswordRequestWithOldPassword := goldap.NewPasswordModifyRequest(userDn, oldPassword, newPassword)
_, err = conn.Conn.PasswordModify(modifyPasswordRequestWithOldPassword)
if err != nil {
conn.Close()
return err
}
conn.Close()
return nil
} else { } else {
switch ldapServer.PasswordType { switch ldapServer.PasswordType {
case "SSHA": case "SSHA":

2
web/src/common/modal/PasswordModal.js
View File

@ -105,7 +105,7 @@ export const PasswordModal = (props) => {
}); });
}; };
const hasOldPassword = user.password !== ""; const hasOldPassword = (user.password !== "" || user.ldap !== "");
return ( return (
<Row> <Row>