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

Use empty trust-store password if SSL store provider present 

For Tomcat, if an SslStoreProvider is configured,
`SslStoreProviderUrlStreamHandlerFactory` stores the trust-store with an
empty password. Previously, if a password was supplied using the
ssl.trust-store-password property, that would be the password used to
load the trust-store and the connector would warn with "Password
verification failed" message.

Fixes gh-12688
This commit is contained in:
Ian Chan 2018-05-07 00:10:06 +01:00 committed by Madhura Bhave
parent 7849d73828
commit e75d45ca45
2 changed files with 2 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); SslStoreProviderUrlStreamHandlerFactory.KEY_STORE_URL);
} }
if (sslStoreProvider.getTrustStore() != null) { if (sslStoreProvider.getTrustStore() != null) {
protocol.setTruststorePass("");
protocol.setTruststoreFile( protocol.setTruststoreFile(
SslStoreProviderUrlStreamHandlerFactory.TRUST_STORE_URL); SslStoreProviderUrlStreamHandlerFactory.TRUST_STORE_URL);
} }

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

@ -170,6 +170,7 @@ public class SslConnectorCustomizerTests {
Ssl ssl = new Ssl(); Ssl ssl = new Ssl();
ssl.setKeyPassword("password"); ssl.setKeyPassword("password");
ssl.setKeyStorePassword("secret"); ssl.setKeyStorePassword("secret");
ssl.setTrustStorePassword("trustStoreSecret");
SslStoreProvider sslStoreProvider = mock(SslStoreProvider.class); SslStoreProvider sslStoreProvider = mock(SslStoreProvider.class);
given(sslStoreProvider.getTrustStore()).willReturn(loadStore()); given(sslStoreProvider.getTrustStore()).willReturn(loadStore());
given(sslStoreProvider.getKeyStore()).willReturn(loadStore()); given(sslStoreProvider.getKeyStore()).willReturn(loadStore());