IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ldap: refactoring.

Browse Source
This commit is contained in:
Leonard Gram 2019-01-25 16:43:54 +01:00
parent 21a1507c77
commit b32d420a75
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/login/ldap.go
View File

@ -273,25 +273,28 @@ func (a *ldapAuther) initialBind(username, userPassword string) error {
return nil
}
func appendIfNotEmpty(slice []string, values ...string) []string {
for _, v := range values {
if v != "" {
slice = append(slice, v)
}
}
return slice
}
func (a *ldapAuther) searchForUser(username string) (*LdapUserInfo, error) {
var searchResult *ldap.SearchResult
var err error
for _, searchBase := range a.server.SearchBaseDNs {
attributes := make([]string, 0)
appendIfNotEmpty := func(slice []string, attr string) []string {
if attr == "" {
return slice
}
return append(slice, attr)
}
attributes = appendIfNotEmpty(attributes, a.server.Attr.Username)
attributes = appendIfNotEmpty(attributes, a.server.Attr.Surname)
attributes = appendIfNotEmpty(attributes, a.server.Attr.Email)
attributes = appendIfNotEmpty(attributes, a.server.Attr.Name)
attributes = appendIfNotEmpty(attributes, a.server.Attr.MemberOf)
inputs := a.server.Attr
attributes = appendIfNotEmpty(attributes,
inputs.Username,
inputs.Surname,
inputs.Email,
inputs.Name,
inputs.MemberOf)
searchReq := ldap.SearchRequest{
BaseDN: searchBase,