Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check That Credentials Are Non-Null

Browse Source 
Closes gh-538
This commit is contained in:
Josh Cummings
2022-02-17 10:14:33 -07:00
parent 359a91cf88
commit 279c110604
2 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
View File

@@ -16,17 +16,11 @@
package org.springframework.ldap.core.support;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.ldap.UncategorizedLdapException;
import org.springframework.ldap.core.AuthenticationSource;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.support.LdapEncoder;
import org.springframework.ldap.support.LdapUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Hashtable;
import java.util.ListIterator;
import java.util.Map;
import javax.naming.Context;
import javax.naming.NamingEnumeration;
@@ -37,11 +31,18 @@ import javax.naming.directory.DirContext;
import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Hashtable;
import java.util.ListIterator;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.ldap.UncategorizedLdapException;
import org.springframework.ldap.core.AuthenticationSource;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.support.LdapEncoder;
import org.springframework.ldap.support.LdapUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
/**
* Abstract implementation of the {@link ContextSource} interface. By default,
@@ -424,8 +425,13 @@ public abstract class AbstractContextSource implements BaseLdapPathContextSource
LOG.info("Property 'userDn' not set - " + "anonymous context will be used for read-write operations");
anonymousReadOnly = true;
}
else if (!StringUtils.hasText(password)) {
LOG.info("Property 'password' not set - " + "blank password will be used");
if (!anonymousReadOnly) {
if (password == null) {
throw new IllegalArgumentException("Property 'password' cannot be null. To use a blank password, please ensure it is set to \"\"");
}
if (!StringUtils.hasText(password)) {
LOG.info("Property 'password' not set - " + "blank password will be used");
}
}
authenticationSource = new SimpleAuthenticationSource();
}

11
core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTest.java
View File

@@ -46,7 +46,16 @@ public class LdapContextSourceTest {
tested.afterPropertiesSet();
}
@Test
// gh-538
@Test(expected = IllegalArgumentException.class)
public void testAfterPropertiesSet_NullPassword() {
tested.setUrl("ldap://ldap.example.com:389");
tested.setUserDn("value");
tested.setPassword(null);
tested.afterPropertiesSet();
}
@Test
public void testGetAnonymousEnv() throws Exception {
tested.setBase("dc=some example,dc=se");
tested.setUrl("ldap://ldap.example.com:389");