SpringCloud/spring-cloud-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt to changes in Spring Vault.

Browse Source
This commit is contained in:
Mark Paluch
2017-07-14 22:32:40 +02:00
parent d6c6295cfa
commit dd7aeab4ef
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfiguration.java
View File

@@ -102,25 +102,34 @@ public class ReactiveVaultBootstrapConfiguration {
SslConfiguration sslConfiguration;
if (ssl != null) {
KeyStoreConfiguration keyStore = KeyStoreConfiguration.EMPTY;
KeyStoreConfiguration trustStore = KeyStoreConfiguration.EMPTY;
KeyStoreConfiguration keyStore = KeyStoreConfiguration.unconfigured();
KeyStoreConfiguration trustStore = KeyStoreConfiguration.unconfigured();
if (ssl.getKeyStore() != null) {
keyStore = new KeyStoreConfiguration(ssl.getKeyStore(),
ssl.getKeyStorePassword() != null ? ssl.getKeyStorePassword()
.toCharArray() : null, null);
if (StringUtils.hasText(ssl.getKeyStorePassword())) {
keyStore = KeyStoreConfiguration.of(ssl.getKeyStore(), ssl
.getKeyStorePassword().toCharArray());
}
else {
keyStore = KeyStoreConfiguration.of(ssl.getKeyStore());
}
}
if (ssl.getTrustStore() != null) {
trustStore = new KeyStoreConfiguration(ssl.getTrustStore(),
ssl.getTrustStorePassword() != null ? ssl.getTrustStorePassword()
.toCharArray() : null, null);
if (StringUtils.hasText(ssl.getTrustStorePassword())) {
trustStore = KeyStoreConfiguration.of(ssl.getTrustStore(), ssl
.getTrustStorePassword().toCharArray());
}
else {
trustStore = KeyStoreConfiguration.of(ssl.getTrustStore());
}
}
sslConfiguration = new SslConfiguration(keyStore, trustStore);
}
else {
sslConfiguration = SslConfiguration.NONE;
sslConfiguration = SslConfiguration.unconfigured();
}
return ClientHttpConnectorFactory.create(clientOptions, sslConfiguration);

27
spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapConfiguration.java
View File

@@ -125,25 +125,34 @@ public class VaultBootstrapConfiguration implements InitializingBean {
SslConfiguration sslConfiguration;
if (ssl != null) {
KeyStoreConfiguration keyStore = KeyStoreConfiguration.EMPTY;
KeyStoreConfiguration trustStore = KeyStoreConfiguration.EMPTY;
KeyStoreConfiguration keyStore = KeyStoreConfiguration.unconfigured();
KeyStoreConfiguration trustStore = KeyStoreConfiguration.unconfigured();
if (ssl.getKeyStore() != null) {
keyStore = new KeyStoreConfiguration(ssl.getKeyStore(),
ssl.getKeyStorePassword() != null ? ssl.getKeyStorePassword()
.toCharArray() : null, null);
if (StringUtils.hasText(ssl.getKeyStorePassword())) {
keyStore = KeyStoreConfiguration.of(ssl.getKeyStore(), ssl
.getKeyStorePassword().toCharArray());
}
else {
keyStore = KeyStoreConfiguration.of(ssl.getKeyStore());
}
}
if (ssl.getTrustStore() != null) {
trustStore = new KeyStoreConfiguration(ssl.getTrustStore(),
ssl.getTrustStorePassword() != null ? ssl.getTrustStorePassword()
.toCharArray() : null, null);
if (StringUtils.hasText(ssl.getTrustStorePassword())) {
trustStore = KeyStoreConfiguration.of(ssl.getTrustStore(), ssl
.getTrustStorePassword().toCharArray());
}
else {
trustStore = KeyStoreConfiguration.of(ssl.getTrustStore());
}
}
sslConfiguration = new SslConfiguration(keyStore, trustStore);
}
else {
sslConfiguration = SslConfiguration.NONE;
sslConfiguration = SslConfiguration.unconfigured();
}
return new ClientFactoryWrapper(ClientHttpRequestFactoryFactory.create(