spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Embedded LDAP SSL should not be enabled when its bundle is empty

Browse Source 
See gh-50700

Signed-off-by: leestana01 <leestana01@naver.com>
This commit is contained in:
leestana01
2026-06-09 16:07:40 +02:00
committed by Stéphane Nicoll
parent f9fcaa2a67
commit af2f956c7d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/autoconfigure/embedded/EmbeddedLdapProperties.java
+2 -1
View File
@@ -24,6 +24,7 @@ import org.jspecify.annotations.Nullable;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.convert.Delimiter;
import org.springframework.core.io.Resource;
import org.springframework.util.StringUtils;
/**
* Configuration properties for Embedded LDAP.
@@ -150,7 +151,7 @@ public class EmbeddedLdapProperties {
private @Nullable String bundle;
public boolean isEnabled() {
return (this.enabled != null) ? this.enabled : this.bundle != null;
return (this.enabled != null) ? this.enabled : StringUtils.hasText(this.bundle);
}
public void setEnabled(boolean enabled) {
module/spring-boot-ldap/src/test/java/org/springframework/boot/ldap/autoconfigure/embedded/EmbeddedLdapAutoConfigurationTests.java
+7
View File
@@ -411,6 +411,13 @@ class EmbeddedLdapAutoConfigurationTests {
});
}
@Test
void sslIsNotEnabledWhenBundleIsEmpty() {
EmbeddedLdapProperties properties = new EmbeddedLdapProperties();
properties.getSsl().setBundle("");
assertThat(properties.getSsl().isEnabled()).isFalse();
}
@Configuration(proxyBeanMethods = false)
static class LdapClientConfiguration {