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

SEC-2308: DefaultSpringSecurityContextSource allow empty baseUrl

This commit is contained in:
Rob Winch 2013-09-13 15:53:35 -07:00
parent f6587c8697
commit b4cbcee7f0
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java
View File

@ -95,6 +95,20 @@ public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegra
assertTrue(ctxSrc.isPooled());
}
// SEC-2308
@Test
public void instantiationSuceedsWithEmtpyBaseDn() throws Exception {
String baseDn = "";
List<String> serverUrls = new ArrayList<String>();
serverUrls.add("ldap://foo:789");
serverUrls.add("ldap://bar:389");
serverUrls.add("ldaps://blah:636");
DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource(serverUrls, baseDn);
assertFalse(ctxSrc.isAnonymousReadOnly());
assertTrue(ctxSrc.isPooled());
}
@Test(expected=IllegalArgumentException.class)
public void instantiationFailsWithIncorrectServerUrl() throws Exception {
List<String> serverUrls = new ArrayList<String>();

3
ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java
View File

@ -123,9 +123,6 @@ public class DefaultSpringSecurityContextSource extends LdapContextSource {
if ("".equals(trimmedUrl)) {
continue;
}
if (trimmedUrl.contains(trimmedBaseDn)) {
throw new IllegalArgumentException("LDAP URL string must not include the base DN! '" + trimmedUrl + "'");
}
providerUrl.append(trimmedUrl);
if (! trimmedUrl.endsWith("/")) {