소스 검색

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

Luke Taylor 19 년 전
부모
커밋
743cc9fec7
1개의 변경된 파일9개의 추가작업 그리고 2개의 파일을 삭제
  1. 9 2
      core/src/main/java/org/acegisecurity/ldap/search/FilterBasedLdapUserSearch.java

+ 9 - 2
core/src/main/java/org/acegisecurity/ldap/search/FilterBasedLdapUserSearch.java

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