Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test in "Truststore password if SSLstoreprovider present"

Browse Source 
See gh-13088
This commit is contained in:
Madhura Bhave
2018-05-29 15:06:39 -07:00
parent e75d45ca45
commit ad1283195a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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,10 +173,10 @@ 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");
ssl.setTrustStorePassword("trustStoreSecret");
SslStoreProvider sslStoreProvider = mock(SslStoreProvider.class);
given(sslStoreProvider.getTrustStore()).willReturn(loadStore());
given(sslStoreProvider.getKeyStore()).willReturn(loadStore());
@@ -180,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,