Merge pull request #15512 from engow/automated-cherry-pick-of-#15432-origin-release-3.5

[3.5] server/auth: fix auth panic bug when user changes password
This commit is contained in:
Benjamin Wang
2023-04-08 06:22:37 +08:00
committed by GitHub
2 changed files with 25 additions and 3 deletions

View File

@@ -479,7 +479,8 @@ func (as *authStore) UserChangePassword(r *pb.AuthUserChangePasswordRequest) (*p
var password []byte
var err error
if !user.Options.NoPassword {
// Backward compatible with old versions of etcd, user options is nil
if user.Options == nil || !user.Options.NoPassword {
password, err = as.selectPassword(r.Password, r.HashedPassword)
if err != nil {
return nil, ErrNoPasswordUser