-
Notifications
You must be signed in to change notification settings - Fork 104
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
||
for (SocketInfo ldapServer : ldapServers) { | ||
try { | ||
|
@@ -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); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ditto |
||
} | ||
|
||
/** | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.