zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed secure startup

Browse source
This commit is contained in:
anhefti 2019-10-08 14:21:46 +02:00
parent 2e3ba3ae2c
commit 1c1e427efd
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/ch/ethz/seb/sebserver/ClientHttpRequestFactoryService.java
View file

@ -153,11 +153,15 @@ public class ClientHttpRequestFactoryService {
sslContext = SSLContextBuilder
.create()
.loadTrustMaterial(trustStoreFile, password)
.setKeyStoreType("pkcs12")
.setKeyStoreType(this.environment.getProperty(
"server.ssl.key-store-type",
"pkcs12"))
.build();
}
if (proxy.proxyAuthType != null && proxy.proxyAuthType != ProxyAuthType.NONE) {
if (proxy != null &&
proxy.proxyAuthType != null &&
proxy.proxyAuthType != ProxyAuthType.NONE) {
log.info("Initialize ClientHttpRequestFactory with proxy auth: {} : {}",
proxy.proxyAuthType,