root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge pull request #13088 from icha024 

* gh-13088:
  Fix test in "Truststore password if SSLstoreprovider present"
  Use empty trust-store password if SSL store provider present
This commit is contained in:
Madhura Bhave 2018-05-29 15:12:53 -07:00
parent 7849d73828 ad1283195a
commit 9229b6f248
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizer.java
View File

@ -118,6 +118,7 @@ class SslConnectorCustomizer implements TomcatConnectorCustomizer {
SslStoreProviderUrlStreamHandlerFactory.KEY_STORE_URL);
}
if (sslStoreProvider.getTrustStore() != null) {
protocol.setTruststorePass("");
protocol.setTruststoreFile(
SslStoreProviderUrlStreamHandlerFactory.TRUST_STORE_URL);
}

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java
View File

@ -31,8 +31,10 @@ import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.boot.testsupport.rule.OutputCapture;
import org.springframework.boot.web.server.Ssl;
import org.springframework.boot.web.server.SslStoreProvider;
import org.springframework.core.io.ClassPathResource;
@ -54,6 +56,9 @@ public class SslConnectorCustomizerTests {
private Connector connector;
@Rule
public OutputCapture output = new OutputCapture();
@Before
public void setup() {
this.tomcat = new Tomcat();
@ -64,6 +69,7 @@ public class SslConnectorCustomizerTests {
@After
public void stop() throws Exception {
System.clearProperty("javax.net.ssl.trustStorePassword");
ReflectionTestUtils.setField(TomcatURLStreamHandlerFactory.class, "instance",
null);
ReflectionTestUtils.setField(URL.class, "factory", null);
@ -167,6 +173,7 @@ public class SslConnectorCustomizerTests {
@Test
public void customizeWhenSslStoreProviderPresentShouldIgnorePasswordFromSsl()
throws Exception {
System.setProperty("javax.net.ssl.trustStorePassword", "trustStoreSecret");
Ssl ssl = new Ssl();
ssl.setKeyPassword("password");
ssl.setKeyStorePassword("secret");
@ -179,6 +186,7 @@ public class SslConnectorCustomizerTests {
customizer.customize(connector);
this.tomcat.start();
assertThat(connector.getState()).isEqualTo(LifecycleState.STARTED);
assertThat(this.output.toString()).doesNotContain("Password verification failed");
}
private KeyStore loadStore() throws KeyStoreException, IOException,