upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2025-04-15 12:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5618 from stonezdj/usergroup_empty

Browse Source 
user group name can not be empty
This commit is contained in:
Daniel Jiang 2018-08-15 10:22:02 +08:00 committed by GitHub
commit 72160c628f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ui/api/usergroup.go
View File

@ -34,6 +34,10 @@ type UserGroupAPI struct {
id int id int
} }
const (
userNameEmptyMsg = "User group name can not be empty!"
)
// Prepare validates the URL and parms // Prepare validates the URL and parms
func (uga *UserGroupAPI) Prepare() { func (uga *UserGroupAPI) Prepare() {
uga.BaseController.Prepare() uga.BaseController.Prepare()
@ -96,6 +100,11 @@ func (uga *UserGroupAPI) Post() {
userGroup.ID = 0 userGroup.ID = 0
userGroup.GroupType = common.LdapGroupType userGroup.GroupType = common.LdapGroupType
userGroup.LdapGroupDN = strings.TrimSpace(userGroup.LdapGroupDN) userGroup.LdapGroupDN = strings.TrimSpace(userGroup.LdapGroupDN)
userGroup.GroupName = strings.TrimSpace(userGroup.GroupName)
if len(userGroup.GroupName) == 0 {
uga.HandleBadRequest(userNameEmptyMsg)
return
}
query := models.UserGroup{GroupType: userGroup.GroupType, LdapGroupDN: userGroup.LdapGroupDN} query := models.UserGroup{GroupType: userGroup.GroupType, LdapGroupDN: userGroup.LdapGroupDN}
result, err := group.QueryUserGroup(query) result, err := group.QueryUserGroup(query)
if err != nil { if err != nil {
@ -134,6 +143,11 @@ func (uga *UserGroupAPI) Put() {
userGroup := models.UserGroup{} userGroup := models.UserGroup{}
uga.DecodeJSONReq(&userGroup) uga.DecodeJSONReq(&userGroup)
ID := uga.id ID := uga.id
userGroup.GroupName = strings.TrimSpace(userGroup.GroupName)
if len(userGroup.GroupName) == 0 {
uga.HandleBadRequest(userNameEmptyMsg)
return
}
userGroup.GroupType = common.LdapGroupType userGroup.GroupType = common.LdapGroupType
log.Debugf("Updated user group %v", userGroup) log.Debugf("Updated user group %v", userGroup)
err := group.UpdateUserGroupName(ID, userGroup.GroupName) err := group.UpdateUserGroupName(ID, userGroup.GroupName)