Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-25 16:19:46 +02:00
Code Releases Activity

Preview LDAP connection results

Browse source
This commit is contained in:
sauls8t 2018-09-03 18:19:46 +01:00
parent 1ce7e53398
commit 63b17f9b88
5 changed files with 63 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

24
domain/auth/ldap/ldap.go
View file

@ -257,21 +257,27 @@ func convertUsers(c lm.LDAPConfig, lu []lm.LDAPUser) (du []user.User) {
// FetchUsers from LDAP server using both User and Group filters.
func fetchUsers(c lm.LDAPConfig) (du []user.User, err error) {
du = []user.User{}
e1 := []lm.LDAPUser{}
e2 := []lm.LDAPUser{}
e3 := []lm.LDAPUser{}
e1, err := executeUserFilter(c)
if err != nil {
err = errors.Wrap(err, "unable to execute user filter")
return
if len(c.UserFilter) > 0 {
e1, err = executeUserFilter(c)
if err != nil {
err = errors.Wrap(err, "unable to execute user filter")
return
}
}
e2, err := executeGroupFilter(c)
if err != nil {
err = errors.Wrap(err, "unable to execute group filter")
return
if len(c.GroupFilter) > 0 {
e2, err = executeGroupFilter(c)
if err != nil {
err = errors.Wrap(err, "unable to execute group filter")
return
}
}
// convert users from LDAP format to Documize format.
e3 := []lm.LDAPUser{}
e3 = append(e3, e1...)
e3 = append(e3, e2...)
du = convertUsers(c, e3)