Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-24 09:38:09 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9588 from stonezdj/fix_ldap_group_sql

Browse Source 
Fix User Group Search SQL error
This commit is contained in:
Wenkai Yin(尹文开) 2019-10-28 11:22:14 +08:00 committed by GitHub
commit f007a62b04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/dao/group/usergroup.go
View File

@ -15,7 +15,6 @@
package group package group
import ( import (
"strings"
"time" "time"
"github.com/goharbor/harbor/src/common/utils" "github.com/goharbor/harbor/src/common/utils"
@ -101,17 +100,13 @@ func GetUserGroup(id int) (*models.UserGroup, error) {
// GetGroupIDByGroupName - Return the group ID by given group name. it is possible less group ID than the given group name if some group doesn't exist. // GetGroupIDByGroupName - Return the group ID by given group name. it is possible less group ID than the given group name if some group doesn't exist.
func GetGroupIDByGroupName(groupName []string, groupType int) ([]int, error) { func GetGroupIDByGroupName(groupName []string, groupType int) ([]int, error) {
var retGroupID []int var retGroupID []int
var conditions []string
if len(groupName) == 0 { if len(groupName) == 0 {
return retGroupID, nil return retGroupID, nil
} }
for _, gName := range groupName { sql := fmt.Sprintf("select id from user_group where group_name in ( %s ) and group_type = ? ", dao.ParamPlaceholderForIn(len(groupName)))
con := "'" + gName + "'" log.Debugf("GetGroupIDByGroupName: statement sql is %v", sql)
conditions = append(conditions, con)
}
sql := fmt.Sprintf("select id from user_group where group_name in ( %s ) and group_type = %v", strings.Join(conditions, ","), groupType)
o := dao.GetOrmer() o := dao.GetOrmer()
cnt, err := o.Raw(sql).QueryRows(&retGroupID) cnt, err := o.Raw(sql, groupName, groupType).QueryRows(&retGroupID)
if err != nil { if err != nil {
return retGroupID, err return retGroupID, err
} }