Skip to content

Commit ed6e60b

Browse files
authored
Merge pull request goharbor#2143 from reasonerjt/fix-ldap-1.1.0
do not return error when ldap bind failed
2 parents ee93627 + 2f6dd6f commit ed6e60b

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/ui/auth/ldap/ldap.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ func (l *Auth) Authenticate(m models.AuthModel) (*models.User, error) {
7979

8080
log.Debugf("username: %s, dn: %s", u.Username, dn)
8181
if err := ldapUtils.Bind(ldapConfs, dn, m.Password); err != nil {
82-
return nil, fmt.Errorf("Failed to bind user, username: %s, dn: %s, error: %v", u.Username, dn, err)
82+
log.Warningf("Failed to bind user, username: %s, dn: %s, error: %v", u.Username, dn, err)
83+
return nil, nil
8384
}
8485
exist, err := dao.UserExists(u, "username")
8586
if err != nil {

src/ui/auth/ldap/ldap_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,11 @@ func TestAuthenticate(t *testing.T) {
124124
}
125125
person.Principal = "test"
126126
person.Password = "1"
127-
_, err = auth.Authenticate(person)
128-
if err == nil {
129-
t.Errorf("Expected error for wrong password")
127+
user, err = auth.Authenticate(person)
128+
if err != nil {
129+
t.Errorf("unexpected ldap error: %v", err)
130+
}
131+
if user != nil {
132+
t.Errorf("Nil user expected for wrong password")
130133
}
131134
}

0 commit comments

Comments
 (0)