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

Merge pull request #50624 from dlwldnjs1009

Browse Source 
* treat-empty-ssl-bundle-as-unset:
  Polish "Treat empty SSL bundle as unset"
  Treat empty SSL bundle as unset

Closes gh-50624
This commit is contained in:
Stéphane Nicoll
2026-05-30 16:22:01 +02:00
parent 8288b8fc36 88a7a44baf
commit a009ea4bee
8 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java
+2 -1
View File
@@ -23,6 +23,7 @@ import com.datastax.oss.driver.api.core.DefaultConsistencyLevel;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.core.io.Resource;
import org.springframework.util.StringUtils;
/**
* Configuration properties for Cassandra.
@@ -236,7 +237,7 @@ public class CassandraProperties {
private 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) {
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java
+2 -1
View File
@@ -20,6 +20,7 @@ import java.time.Duration;
import java.util.List;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.util.StringUtils;
/**
* Configuration properties for Redis.
@@ -425,7 +426,7 @@ public class RedisProperties {
private 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) {
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java
+1 -1
View File
@@ -69,7 +69,7 @@ class MailSenderPropertiesConfiguration {
if (ssl.isEnabled()) {
javaMailProperties.setProperty("mail." + protocol + ".ssl.enable", "true");
}
if (ssl.getBundle() != null) {
if (StringUtils.hasLength(ssl.getBundle())) {
SslBundle sslBundle = sslBundles.getBundle(ssl.getBundle());
javaMailProperties.put("mail." + protocol + ".ssl.socketFactory",
sslBundle.createSslContext().getSocketFactory());
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
+2 -1
View File
@@ -22,6 +22,7 @@ import com.mongodb.ConnectionString;
import org.bson.UuidRepresentation;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.util.StringUtils;
/**
* Configuration properties for Mongo.
@@ -289,7 +290,7 @@ public class MongoProperties {
private 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) {
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraPropertiesTests.java
+7
View File
@@ -58,4 +58,11 @@ class CassandraPropertiesTests {
assertThat(driverDefaults.get(TypedDriverOption.HEARTBEAT_TIMEOUT)).isEqualTo(Duration.ofSeconds(5));
}
@Test
void sslIsNotEnabledWhenBundleIsEmpty() {
CassandraProperties properties = new CassandraProperties();
properties.getSsl().setBundle("");
assertThat(properties.getSsl().isEnabled()).isFalse();
}
}
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisPropertiesTests.java
+7
View File
@@ -39,4 +39,11 @@ class RedisPropertiesTests {
.isEqualTo(defaultClusterTopologyRefreshOptions.useDynamicRefreshSources());
}
@Test
void sslIsNotEnabledWhenBundleIsEmpty() {
RedisProperties properties = new RedisProperties();
properties.getSsl().setBundle("");
assertThat(properties.getSsl().isEnabled()).isFalse();
}
}
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java
+15
View File
@@ -245,6 +245,21 @@ class MailSenderAutoConfigurationTests {
});
}
@Test
@WithPackageResources("test.jks")
void sslIsNotEnabledWhenBundleIsEmpty() {
this.contextRunner
.withPropertyValues("spring.mail.host:localhost", "spring.mail.ssl.bundle: ",
"spring.ssl.bundle.jks.test-bundle.keystore.location:classpath:test.jks",
"spring.ssl.bundle.jks.test-bundle.keystore.password:secret",
"spring.ssl.bundle.jks.test-bundle.key.password:password")
.run((context) -> {
assertThat(context).hasSingleBean(JavaMailSenderImpl.class);
JavaMailSenderImpl mailSender = context.getBean(JavaMailSenderImpl.class);
assertThat(mailSender.getJavaMailProperties().get("mail.smtp.ssl.socketFactory")).isNull();
});
}
@Test
void smtpSslEnabled() {
this.contextRunner.withPropertyValues("spring.mail.host:localhost", "spring.mail.ssl.enabled:true")
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java
+7
View File
@@ -37,6 +37,13 @@ class MongoPropertiesTests {
assertThat(springBootDefault).isEqualTo(springDataDefault);
}
@Test
void sslIsNotEnabledWhenBundleIsEmpty() {
MongoProperties properties = new MongoProperties();
properties.getSsl().setBundle("");
assertThat(properties.getSsl().isEnabled()).isFalse();
}
private UuidRepresentation springDataDefaultUuidRepresentation() {
return new MongoConfigurationSupport() {