upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 10:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent duplicated entries

Browse Source 
Signed-off-by: Yann David <davidyann88@gmail.com>
This commit is contained in:
Yann David 2019-08-07 13:16:26 -04:00
parent 51eb8bc60f
commit 6435f32bc5
No known key found for this signature in database
GPG Key ID: B005C1919206F2E0
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/utils/ldap/ldap.go
View File

@ -230,9 +230,14 @@ func (session *Session) SearchUser(username string) ([]models.LdapUser, error) {
} }
for _, groupEntry := range result.Entries { for _, groupEntry := range result.Entries {
nestedGroupDNList = append(nestedGroupDNList, strings.TrimSpace(groupEntry.DN)) if !contains(u.GroupDNList, groupEntry.DN) {
log.Debugf("Found group %v", groupEntry.DN) nestedGroupDNList = append(nestedGroupDNList, strings.TrimSpace(groupEntry.DN))
log.Debugf("Found group %v", groupEntry.DN)
} else {
log.Debugf("%v is already in GroupDNList", groupEntry.DN)
}
} }
u.GroupDNList = append(u.GroupDNList, nestedGroupDNList...) u.GroupDNList = append(u.GroupDNList, nestedGroupDNList...)
log.Debugf("Done searching for nested groups") log.Debugf("Done searching for nested groups")
@ -441,3 +446,12 @@ func createNestedGroupFilter(userDN string) string {
filter = "(&(objectClass=group)(member:1.2.840.113556.1.4.1941:=" + userDN + "))" filter = "(&(objectClass=group)(member:1.2.840.113556.1.4.1941:=" + userDN + "))"
return filter return filter
} }
func contains(s []string, e string) bool {
for _, a := range s {
if a == e {
return true
}
}
return false
}