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

Merge pull request #2143 from reasonerjt/fix-ldap-1.1.0

Browse Source 
do not return error when ldap bind failed
This commit is contained in:
Daniel Jiang 2017-04-26 16:52:23 +08:00 committed by GitHub
commit ed6e60ba71
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ui/auth/ldap/ldap.go
View File

@ -79,7 +79,8 @@ func (l *Auth) Authenticate(m models.AuthModel) (*models.User, error) {
log.Debugf("username: %s, dn: %s", u.Username, dn) log.Debugf("username: %s, dn: %s", u.Username, dn)
if err := ldapUtils.Bind(ldapConfs, dn, m.Password); err != nil { if err := ldapUtils.Bind(ldapConfs, dn, m.Password); err != nil {
return nil, fmt.Errorf("Failed to bind user, username: %s, dn: %s, error: %v", u.Username, dn, err) log.Warningf("Failed to bind user, username: %s, dn: %s, error: %v", u.Username, dn, err)
return nil, nil
} }
exist, err := dao.UserExists(u, "username") exist, err := dao.UserExists(u, "username")
if err != nil { if err != nil {

9
src/ui/auth/ldap/ldap_test.go
View File

@ -124,8 +124,11 @@ func TestAuthenticate(t *testing.T) {
} }
person.Principal = "test" person.Principal = "test"
person.Password = "1" person.Password = "1"
_, err = auth.Authenticate(person) user, err = auth.Authenticate(person)
if err == nil { if err != nil {
t.Errorf("Expected error for wrong password") t.Errorf("unexpected ldap error: %v", err)
}
if user != nil {
t.Errorf("Nil user expected for wrong password")
} }
} }