Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIXED JENKINS-32033] Support for multiple domain controllers #41

Merged
merged 1 commit into from
Sep 16, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,8 @@ public DirContext bind(String principalName, String password, List<SocketInfo> l
newProps.put("java.naming.ldap.attributes.binary","tokenGroups objectSid");
newProps.put("java.naming.ldap.factory.socket",TrustAllSocketFactory.class.getName());
newProps.putAll(props);
NamingException error = null;
NamingException namingException = null;
javax.naming.AuthenticationException authenticationException = null;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use BadCredentialsException here, as it seems the only subtype used.


for (SocketInfo ldapServer : ldapServers) {
try {
Expand All @@ -537,15 +538,18 @@ public DirContext bind(String principalName, String password, List<SocketInfo> l
// servers can be configured to hide the distinction between "no such user" and "bad password"
// to reveal what user names are available.
LOGGER.log(Level.WARNING, "Failed to authenticate while binding to "+ldapServer, e);
throw new BadCredentialsException("Either no such user '"+principalName+"' or incorrect password",e);
authenticationException = e; // retry
} catch (NamingException e) {
LOGGER.log(Level.WARNING, "Failed to bind to "+ldapServer, e);
error = e; // retry
namingException = e; // retry
}
}

// if all the attempts failed
throw new BadCredentialsException("Either no such user '"+principalName+"' or incorrect password", error);
if (authenticationException !=null ) {
throw new BadCredentialsException("Either no such user '" + principalName + "' or incorrect password", authenticationException);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can throw the previously created one if you want.

} else {
throw new BadCredentialsException("Either no such user '" + principalName + "' or incorrect password", namingException);
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto

}

/**
Expand Down