Merge pull request #9706 from liggitt/ldap-logging

OpenShift Bot · web-flow · commit bb6a0984c0cd · 2016-07-06T15:58:44.000-04:00
Merged by openshift-bot
diff --git a/pkg/auth/authenticator/password/ldappassword/ldap.go b/pkg/auth/authenticator/password/ldappassword/ldap.go
@@ -95,6 +95,9 @@ func (a *Authenticator) getIdentity(username, password string) (authapi.UserIden
 
 	if bindDN, bindPassword := a.options.ClientConfig.GetBindCredentials(); len(bindDN) > 0 {
 		if err := l.Bind(bindDN, bindPassword); err != nil {
+			// If the configured bindDN/bindPassword encounters errors, that blocks all logins
+			// Handle as a severe error in addition to returning an error to fail this particular login
+			utilruntime.HandleError(fmt.Errorf("error binding to %s for search phase: %v", bindDN, err))
 			return nil, false, err
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,9 @@ func (a *Authenticator) getIdentity(username, password string) (authapi.UserIden`
`95`	`95`
`96`	`96`	`if bindDN, bindPassword := a.options.ClientConfig.GetBindCredentials(); len(bindDN) > 0 {`
`97`	`97`	`if err := l.Bind(bindDN, bindPassword); err != nil {`
	`98`	`+ // If the configured bindDN/bindPassword encounters errors, that blocks all logins`
	`99`	`+ // Handle as a severe error in addition to returning an error to fail this particular login`
	`100`	`+ utilruntime.HandleError(fmt.Errorf("error binding to %s for search phase: %v", bindDN, err))`
`98`	`101`	`return nil, false, err`
`99`	`102`	`}`
`100`	`103`	`}`