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.

Sign up for GitHub

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-34968] Domain in login is not taken into account #35

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FIXED JENKINS-34968] Domain in login is not taken into account #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions src/main/java/hudson/plugins/active_directory/ActiveDirectoryUnixAuthenticationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,17 +451,18 @@ private String getStringAttribute(Attributes user, String name) throws NamingExc
* Returns the full user principal name of the form "[email protected]".
*
* If people type in 'foo@bar' or 'bar\foo' or just 'foo', it should be treated as
* 'foo@bar' (where 'bar' represents the given domain name)
* 'foo@bar.acme.org' (where 'acme.org' part comes from the given domain name in the AD configuration page)
*/
private String getPrincipalName(String username, String domainName) {
String principalName;
int slash = username.indexOf('\\');
if (slash>0) {
principalName = username.substring(slash+1)+'@'+domainName;
} else if (username.contains("@"))
principalName = username.substring(slash+1) + '@' + username.substring(0, slash) + '.' + domainName;
} else if (username.contains("@")) {
principalName = username;
else
principalName = username+'@'+domainName;
} else {
principalName = username + '@' + domainName;
}
return principalName;
}

Expand Down