Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Abort syncrhonization from LDAP source if there is some error. (#7960)

Browse source 
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
This commit is contained in:
David Svantesson 2019-08-24 20:53:37 +02:00 committed by Lauris BH
parent e3115cc019
commit 8c24bb9e43
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
models/user.go
View file

@ -1673,7 +1673,12 @@ func SyncExternalUsers() {
return return
} }
sr := s.LDAP().SearchEntries() sr, err := s.LDAP().SearchEntries()
if err != nil {
log.Error("SyncExternalUsers LDAP source failure [%s], skipped", s.Name)
continue
}
for _, su := range sr { for _, su := range sr {
if len(su.Username) == 0 { if len(su.Username) == 0 {
continue continue

10
modules/auth/ldap/ldap.go
View file

@ -308,12 +308,12 @@ func (ls *Source) UsePagedSearch() bool {
} }
// SearchEntries : search an LDAP source for all users matching userFilter // SearchEntries : search an LDAP source for all users matching userFilter
func (ls *Source) SearchEntries() []*SearchResult { func (ls *Source) SearchEntries() ([]*SearchResult, error) {
l, err := dial(ls) l, err := dial(ls)
if err != nil { if err != nil {
log.Error("LDAP Connect error, %s:%v", ls.Host, err) log.Error("LDAP Connect error, %s:%v", ls.Host, err)
ls.Enabled = false ls.Enabled = false
return nil return nil, err
} }
defer l.Close() defer l.Close()
@ -321,7 +321,7 @@ func (ls *Source) SearchEntries() []*SearchResult {
err := l.Bind(ls.BindDN, ls.BindPassword) err := l.Bind(ls.BindDN, ls.BindPassword)
if err != nil { if err != nil {
log.Debug("Failed to bind as BindDN[%s]: %v", ls.BindDN, err) log.Debug("Failed to bind as BindDN[%s]: %v", ls.BindDN, err)
return nil return nil, err
} }
log.Trace("Bound as BindDN %s", ls.BindDN) log.Trace("Bound as BindDN %s", ls.BindDN)
} else { } else {
@ -350,7 +350,7 @@ func (ls *Source) SearchEntries() []*SearchResult {
} }
if err != nil { if err != nil {
log.Error("LDAP Search failed unexpectedly! (%v)", err) log.Error("LDAP Search failed unexpectedly! (%v)", err)
return nil return nil, err
} }
result := make([]*SearchResult, len(sr.Entries)) result := make([]*SearchResult, len(sr.Entries))
@ -368,5 +368,5 @@ func (ls *Source) SearchEntries() []*SearchResult {
} }
} }
return result return result, nil
} }