Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Cherry-pick] fix: reset user password (#18208) 

* fix: reset user password

Signed-off-by: Shengwen Yu <yshengwen@vmware.com>

* fix: ci failure

Signed-off-by: Shengwen Yu <yshengwen@vmware.com>

---------

Signed-off-by: Shengwen Yu <yshengwen@vmware.com>
This commit is contained in:
Shengwen YU 2023-02-14 09:28:29 +08:00 committed by GitHub
parent 3208b74279
commit 1121675a30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/v2.0/handler/user.go
View File

@ -308,7 +308,12 @@ func (u *usersAPI) UpdateUserPassword(ctx context.Context, params operation.Upda
if err := requireValidSecret(newPwd); err != nil {
return u.SendError(ctx, err)
}
ok, err := u.ctl.VerifyPassword(ctx, sctx.GetUsername(), newPwd)
user, err := u.getUserByID(ctx, uid)
if err != nil {
log.G(ctx).Errorf("Failed to get user profile for uid: %d, error: %v", uid, err)
return u.SendError(ctx, err)
}
ok, err := u.ctl.VerifyPassword(ctx, user.Username, newPwd)
if err != nil {
log.G(ctx).Errorf("Failed to verify password for user: %s, error: %v", sctx.GetUsername(), err)
return u.SendError(ctx, errors.UnknownError(nil).WithMessage("Failed to verify password"))

12
src/server/v2.0/handler/user_test.go
View File

@ -5,6 +5,7 @@ import (
"testing"
"github.com/goharbor/harbor/src/common"
commonmodels "github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/server/v2.0/models"
"github.com/goharbor/harbor/src/server/v2.0/restapi"
usertesting "github.com/goharbor/harbor/src/testing/controller/user"
@ -36,9 +37,16 @@ func TestRequireValidSecret(t *testing.T) {
type UserTestSuite struct {
htesting.Suite
uCtl *usertesting.Controller
user *commonmodels.User
}
func (uts *UserTestSuite) SetupSuite() {
uts.user = &commonmodels.User{
UserID: 1,
Username: "admin",
}
uts.uCtl = &usertesting.Controller{}
uts.Config = &restapi.Config{
UserAPI: &usersAPI{
@ -69,8 +77,8 @@ func (uts *UserTestSuite) TestUpdateUserPassword() {
{
url := "/users/1/password"
uts.Security.On("Can", mock.Anything, mock.Anything, mock.Anything).Return(true).Times(1)
uts.Security.On("GetUsername").Return("admin").Times(1)
uts.uCtl.On("Get", mock.Anything, mock.Anything, mock.Anything).Return(uts.user, nil).Times(1)
uts.uCtl.On("VerifyPassword", mock.Anything, "admin", "Passw0rd").Return(true, nil).Times(1)
res, err := uts.Suite.PutJSON(url, &body)
uts.NoError(err)
@ -79,8 +87,8 @@ func (uts *UserTestSuite) TestUpdateUserPassword() {
{
url := "/users/1/password"
uts.Security.On("Can", mock.Anything, mock.Anything, mock.Anything).Return(true).Times(1)
uts.Security.On("GetUsername").Return("admin").Times(1)
uts.uCtl.On("Get", mock.Anything, mock.Anything, mock.Anything).Return(uts.user, nil).Times(1)
uts.uCtl.On("VerifyPassword", mock.Anything, "admin", mock.Anything).Return(false, nil).Times(1)
uts.uCtl.On("UpdatePassword", mock.Anything, mock.Anything, mock.Anything).Return(nil)
res, err := uts.Suite.PutJSON(url, &body)