Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for SEC-215. Check for empty nameInNameSpace before appending.

This commit is contained in:
Luke Taylor 2006-04-16 16:11:02 +00:00
parent d5885baf6b
commit 743cc9fec7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,10 @@ import org.acegisecurity.ldap.LdapUtils;
import org.acegisecurity.ldap.InitialDirContextFactory; import org.acegisecurity.ldap.InitialDirContextFactory;
import org.acegisecurity.ldap.LdapUserInfo; import org.acegisecurity.ldap.LdapUserInfo;
import org.acegisecurity.ldap.LdapDataAccessException; import org.acegisecurity.ldap.LdapDataAccessException;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -136,8 +139,12 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch {
userDn.append(searchBase); userDn.append(searchBase);
} }
String nameInNamespace = ctx.getNameInNamespace();
if(StringUtils.hasLength(nameInNamespace)) {
userDn.append(","); userDn.append(",");
userDn.append(ctx.getNameInNamespace()); userDn.append(nameInNamespace);
}
return new LdapUserInfo(userDn.toString(), searchResult.getAttributes()); return new LdapUserInfo(userDn.toString(), searchResult.getAttributes());