Browse Source

Populate base for embedded LDAPContextSource

Fixes gh-23030
pull/32643/head
Madhura Bhave 4 years ago
parent
commit
263433cd81
  1. 1
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java
  2. 9
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfiguration.java

@ -205,6 +205,7 @@ public class EmbeddedLdapAutoConfiguration { @@ -205,6 +205,7 @@ public class EmbeddedLdapAutoConfiguration {
LdapContextSource ldapContextSource(Environment environment, LdapProperties properties,
EmbeddedLdapProperties embeddedProperties) {
LdapContextSource source = new LdapContextSource();
source.setBase(properties.getBase());
if (embeddedProperties.getCredential().isAvailable()) {
source.setUserDn(embeddedProperties.getCredential().getUsername());
source.setPassword(embeddedProperties.getCredential().getPassword());

9
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java

@ -178,6 +178,15 @@ class EmbeddedLdapAutoConfigurationTests { @@ -178,6 +178,15 @@ class EmbeddedLdapAutoConfigurationTests {
});
}
@Test
void ldapContextIsCreatedWithBase() {
this.contextRunner.withPropertyValues("spring.ldap.embedded.base-dn:dc=spring,dc=org",
"spring.ldap.base:dc=spring,dc=org").run((context) -> {
LdapContextSource ldapContextSource = context.getBean(LdapContextSource.class);
assertThat(ldapContextSource.getBaseLdapPathAsString()).isEqualTo("dc=spring,dc=org");
});
}
@Configuration(proxyBeanMethods = false)
static class LdapClientConfiguration {

Loading…
Cancel
Save