Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-17 15:55:26 +01:00
Code Issues Projects Releases Wiki Activity

Allow sys admin to call /c/UserExists

Browse Source 
The commit fix a regression introduced by #11672 which impacts admin
adding new users.
When admin is creating new users, /c/UserExists is called by UI. We must
allow it called by admin when self-registration is turned off.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
This commit is contained in:
Daniel Jiang 2020-04-23 11:40:54 +08:00
parent 7d784ef02f
commit 447ec13527
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/controllers/base.go
View File

@ -30,6 +30,7 @@ import (
"github.com/goharbor/harbor/src/common" "github.com/goharbor/harbor/src/common"
"github.com/goharbor/harbor/src/common/dao" "github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/common/models" "github.com/goharbor/harbor/src/common/models"
"github.com/goharbor/harbor/src/common/security"
"github.com/goharbor/harbor/src/common/utils" "github.com/goharbor/harbor/src/common/utils"
email_util "github.com/goharbor/harbor/src/common/utils/email" email_util "github.com/goharbor/harbor/src/common/utils/email"
"github.com/goharbor/harbor/src/core/api" "github.com/goharbor/harbor/src/core/api"
@ -126,8 +127,10 @@ func (cc *CommonController) UserExists() {
if err != nil { if err != nil {
log.Errorf("Failed to get the status of self registration flag, error: %v, disabling user existence check", err) log.Errorf("Failed to get the status of self registration flag, error: %v, disabling user existence check", err)
} }
if !flag { securityCtx, ok := security.FromContext(cc.Ctx.Request.Context())
cc.CustomAbort(http.StatusPreconditionFailed, "self registration disabled.") isAdmin := ok && securityCtx.IsSysAdmin()
if !flag && !isAdmin {
cc.CustomAbort(http.StatusPreconditionFailed, "self registration disabled, only sysadmin can check user existence")
} }
target := cc.GetString("target") target := cc.GetString("target")