From 0af53e93f3fd191310915971922069f4f89ad432 Mon Sep 17 00:00:00 2001 From: kcichonczyk Date: Tue, 14 Feb 2023 16:26:00 +0100 Subject: [PATCH] [ACS-4460] introduce mTLS, config fix --- .../alfresco/transform/base/config/MTLSConfig.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java b/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java index 69cf3fae..2ccc4739 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java @@ -99,8 +99,7 @@ public class MTLSConfig { } @Bean - public WebClient.Builder clientBuilder() throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException, UnrecoverableKeyException - { + public WebClient.Builder clientBuilder() throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException, UnrecoverableKeyException { if(sslEnabled) { HttpClient httpClient = getHttpClientWithMTLS(); @@ -110,8 +109,7 @@ public class MTLSConfig { } } - private HttpClient getHttpClientWithMTLS() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException - { + private HttpClient getHttpClientWithMTLS() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException { KeyManagerFactory keyManagerFactory = initKeyManagerFactory(); TrustManagerFactory trustManagerFactory = initTrustManagerFactory(); @@ -125,16 +123,15 @@ public class MTLSConfig { private TrustManagerFactory initTrustManagerFactory() throws NoSuchAlgorithmException, KeyStoreException, IOException, CertificateException { - TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); KeyStore trustStore = getKeyStore(trustStoreType, trustStoreResource, trustStorePassword); + TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); trustManagerFactory.init(trustStore); return trustManagerFactory; } - private KeyManagerFactory initKeyManagerFactory() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException - { + private KeyManagerFactory initKeyManagerFactory() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException { KeyStore clientKeyStore = getKeyStore(keyStoreType, keyStoreResource, keyStorePassword); - KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(keyStoreType); + KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); keyManagerFactory.init(clientKeyStore, keyPassword); return keyManagerFactory; }