root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 176 Packages Projects Releases Wiki Activity

LDAP: multildap + ldap integration (#18588) 

It seems `ldap` module introduced new error type of which
multildap module didn't know about.

This broke the multildap login logic

Fixes #18491
Ref #18587
This commit is contained in:
Oleg Gaidarenko 2019-08-19 00:52:32 +03:00 committed by GitHub
parent 302a1f06bc
commit 02af966964
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/multildap/multildap.go
View File

@ -19,6 +19,9 @@ var newLDAP = ldap.New
// ErrInvalidCredentials is returned if username and password do not match
var ErrInvalidCredentials = ldap.ErrInvalidCredentials
// ErrCouldNotFindUser is returned when username hasn't been found (not username+password)
var ErrCouldNotFindUser = ldap.ErrCouldNotFindUser
// ErrNoLDAPServers is returned when there is no LDAP servers specified
var ErrNoLDAPServers = errors.New("No LDAP servers are configured")
@ -76,7 +79,7 @@ func (multiples *MultiLDAP) Login(query *models.LoginUserQuery) (
}
// Continue if we couldn't find the user
if err == ErrInvalidCredentials {
if err == ErrCouldNotFindUser {
continue
}

4
pkg/services/multildap/multildap_test.go
View File

@ -82,10 +82,10 @@ func TestMultiLDAP(t *testing.T) {
teardown()
})
Convey("Should still call a second error for invalid cred error", func() {
Convey("Should still call a second error for invalid not found error", func() {
mock := setup()
mock.loginErrReturn = ErrInvalidCredentials
mock.loginErrReturn = ErrCouldNotFindUser
multi := New([]*ldap.ServerConfig{
{}, {},