Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-7995] pulled up a member
  • Loading branch information
kohsuke committed Nov 4, 2011
1 parent 26b7a72 commit 4aa2ca8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
Expand Up @@ -11,4 +11,9 @@
*/
public abstract class AbstractActiveDirectoryAuthenticationProvider extends AbstractUserDetailsAuthenticationProvider implements UserDetailsService, GroupDetailsService {
protected abstract UserDetails retrieveUser(String username, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException;

protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
// active directory authentication is not by comparing clear text password,
// so there's nothing to do here.
}
}
Expand Up @@ -57,11 +57,6 @@ public ActiveDirectoryAuthenticationProvider() {
con.open("Active Directory Provider",""/*default*/,""/*default*/,-1/*default*/);
}

protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
// active directory authentication is not by comparing clear text password,
// so there's nothing to do here.
}

public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException {
return retrieveUser(username,null);
}
Expand Down
Expand Up @@ -70,11 +70,6 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
throw new UsernameNotFoundException("Active-directory plugin doesn't support user retrieval");
}

protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
// active directory authentication is not by comparing clear text password,
// so there's nothing to do here.
}

protected UserDetails retrieveUser(String username, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
UserDetails userDetails = null;
for (String domainName : domainNames) {
Expand Down

0 comments on commit 4aa2ca8

Please sign in to comment.