소스 검색

Fix for SEC-225. Allow empty search base in authorities populator.

Luke Taylor 19 년 전
부모
커밋
3f06c51379
1개의 변경된 파일6개의 추가작업 그리고 1개의 파일을 삭제
  1. 6 1
      core/src/main/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulator.java

+ 6 - 1
core/src/main/java/org/acegisecurity/providers/ldap/populator/DefaultLdapAuthoritiesPopulator.java

@@ -161,9 +161,14 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator
      */
     public DefaultLdapAuthoritiesPopulator(InitialDirContextFactory initialDirContextFactory, String groupSearchBase) {
         Assert.notNull(initialDirContextFactory, "InitialDirContextFactory must not be null");
-        Assert.hasLength(groupSearchBase, "The groupSearchBase (name to search under), must be specified.");
+        Assert.notNull(groupSearchBase, "The groupSearchBase (name to search under), must not be null.");
         this.initialDirContextFactory = initialDirContextFactory;
         this.groupSearchBase = groupSearchBase;
+
+        if(groupSearchBase.length() == 0) {
+            logger.info("groupSearchBase is empty. Searches will be performed from the root: " +
+                    initialDirContextFactory.getRootDn());
+        }
     }
 
     //~ Methods ================================================================