Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
leestana01 wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ain/java/org/springframework/boot/ldap/autoconfigure/embedded/EmbeddedLdapProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
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.
Expand Down Expand Up @@ -150,7 +151,7 @@ public static class Ssl {
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) {
Expand Down
7 changes: 7 additions & 0 deletions .../springframework/boot/ldap/autoconfigure/embedded/EmbeddedLdapAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,13 @@ void whenInvalidSslBundleIsConfiguredThenStartFails() {
});
}

@Test
void sslIsNotEnabledWhenBundleIsEmpty() {
EmbeddedLdapProperties properties = new EmbeddedLdapProperties();
properties.getSsl().setBundle("");
assertThat(properties.getSsl().isEnabled()).isFalse();
}

@Configuration(proxyBeanMethods = false)
static class LdapClientConfiguration {

Expand Down