Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-07 19:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for SEC-226. Added ability to set derefLinkFlag property.

Browse Source
This commit is contained in:
Luke Taylor 2006-04-16 15:15:55 +00:00
parent 267c846e12
commit 072a4c3d18
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
core/src/main/java/org/acegisecurity/ldap/search/FilterBasedLdapUserSearch.java
View File

@ -35,6 +35,8 @@ import javax.naming.NamingEnumeration;
/** /**
* LdapUserSearch implementation which uses an Ldap filter to locate the user. * LdapUserSearch implementation which uses an Ldap filter to locate the user.
* *
* @see SearchControls
*
* @author Robert Sanders * @author Robert Sanders
* @author Luke Taylor * @author Luke Taylor
* @version $Id$ * @version $Id$
@ -53,12 +55,10 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch {
private String searchBase = ""; private String searchBase = "";
/** /**
* If true then searches the entire subtree as identified by context, * The LDAP SearchControls object used for the search. Shared between searches
* if false (the default) then only searches the level identified by the context. * so shouldn't be modified once the bean has been configured.
*/ */
// private boolean searchSubtree = false; private SearchControls searchControls = new SearchControls();
private int searchScope = SearchControls.ONELEVEL_SCOPE;
/** /**
* The filter expression used in the user search. This is an LDAP * The filter expression used in the user search. This is an LDAP
@ -77,12 +77,6 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch {
*/ */
private String searchFilter; private String searchFilter;
/**
* The time (in milliseconds) which to wait before the search fails;
* the default is zero, meaning forever.
*/
private int searchTimeLimit = 0;
private InitialDirContextFactory initialDirContextFactory; private InitialDirContextFactory initialDirContextFactory;
//~ Methods ================================================================ //~ Methods ================================================================
@ -114,9 +108,6 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch {
*/ */
public LdapUserInfo searchForUser(String username) { public LdapUserInfo searchForUser(String username) {
DirContext ctx = initialDirContextFactory.newInitialDirContext(); DirContext ctx = initialDirContextFactory.newInitialDirContext();
SearchControls ctls = new SearchControls();
ctls.setTimeLimit( searchTimeLimit );
ctls.setSearchScope( searchScope );
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Searching for user '" + username + "', in context " + ctx + logger.debug("Searching for user '" + username + "', in context " + ctx +
@ -126,7 +117,7 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch {
try { try {
String[] args = new String[] { LdapUtils.escapeNameForFilter(username) }; String[] args = new String[] { LdapUtils.escapeNameForFilter(username) };
NamingEnumeration results = ctx.search(searchBase, searchFilter, args, ctls); NamingEnumeration results = ctx.search(searchBase, searchFilter, args, searchControls);
if (!results.hasMore()) { if (!results.hasMore()) {
throw new UsernameNotFoundException("User " + username + " not found in directory."); throw new UsernameNotFoundException("User " + username + " not found in directory.");
@ -157,14 +148,30 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch {
} }
} }
/**
* If true then searches the entire subtree as identified by context,
* if false (the default) then only searches the level identified by the context.
*/
public void setSearchSubtree(boolean searchSubtree) { public void setSearchSubtree(boolean searchSubtree) {
// this.searchSubtree = searchSubtree; searchControls.setSearchScope(searchSubtree ?
this.searchScope = searchSubtree ? SearchControls.SUBTREE_SCOPE : SearchControls.ONELEVEL_SCOPE);
SearchControls.SUBTREE_SCOPE : SearchControls.ONELEVEL_SCOPE;
} }
/**
* The time (in milliseconds) which to wait before the search fails;
* the default is zero, meaning forever.
*/
public void setSearchTimeLimit(int searchTimeLimit) { public void setSearchTimeLimit(int searchTimeLimit) {
this.searchTimeLimit = searchTimeLimit; searchControls.setTimeLimit(searchTimeLimit);
}
/**
* Sets the corresponding property on the SearchControls instance used
* in the search.
*
*/
public void setDerefLinkFlag(boolean deref) {
searchControls.setDerefLinkFlag(deref);
} }
public String toString() { public String toString() {
@ -172,9 +179,10 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch {
sb.append("[ searchFilter: '").append(searchFilter).append("', "); sb.append("[ searchFilter: '").append(searchFilter).append("', ");
sb.append("searchBase: '").append(searchBase).append("'"); sb.append("searchBase: '").append(searchBase).append("'");
sb.append(", scope: ").append(searchScope == sb.append(", scope: ").append(searchControls.getSearchScope() ==
SearchControls.SUBTREE_SCOPE ? "subtree" : "single-level, "); SearchControls.SUBTREE_SCOPE ? "subtree" : "single-level, ");
sb.append("searchTimeLimit: ").append(searchTimeLimit).append(" ]"); sb.append("searchTimeLimit: ").append(searchControls.getTimeLimit());
sb.append("derefLinkFlag: ").append(searchControls.getDerefLinkFlag()).append(" ]");
return sb.toString(); return sb.toString();
} }