Merge pull request #12042 from spzala/automated-cherry-pick-of-#11818-upstream-release-3.4

Automated cherry pick of #11818
This commit is contained in:
Gyuho Lee 2020-06-21 19:19:17 -07:00 committed by GitHub
commit 8292fd5051
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -428,9 +428,10 @@ func (s *EtcdServer) Authenticate(ctx context.Context, r *pb.AuthenticateRequest
return nil, err
}
// internalReq doesn't need to have Password because the above s.AuthStore().CheckPassword() already did it.
// In addition, it will let a WAL entry not record password as a plain text.
internalReq := &pb.InternalAuthenticateRequest{
Name: r.Name,
Password: r.Password,
SimpleToken: st,
}