From 3706bef72bfc3bde45ca822d1035df826823e6b4 Mon Sep 17 00:00:00 2001
From: kcichonczyk <kamil.cichonczyk@hyland.com>
Date: Mon, 13 Mar 2023 20:21:35 +0100
Subject: [PATCH] [ACS-4460] MtlsTestUtils simplified

---
 .../org/alfresco/transform/base/MtlsTestUtils.java | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java b/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
index 6b209df2..1ad3384f 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
@@ -1,7 +1,6 @@
 package org.alfresco.transform.base;
 
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.TrustAllStrategy;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.ssl.SSLContextBuilder;
@@ -10,6 +9,7 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
 import javax.net.ssl.SSLContext;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,8 +27,8 @@ public class MtlsTestUtils {
         return Boolean.parseBoolean(System.getProperty("mtls-enabled"));
     }
 
-    public static CloseableHttpClient httpClientWithMtls() throws NoSuchAlgorithmException, KeyManagementException, UnrecoverableKeyException, KeyStoreException, IOException, CertificateException {
-
+    public static CloseableHttpClient httpClientWithMtls() throws NoSuchAlgorithmException, KeyManagementException, UnrecoverableKeyException, KeyStoreException, IOException, CertificateException
+    {
         String keyStoreFile = System.getProperty("mtls-keystore-file");
         String keyStoreType = System.getProperty("mtls-keystore-type");
         char[] keyStorePassword = System.getProperty("mtls-keystore-password").toCharArray();
@@ -44,12 +44,8 @@ public class MtlsTestUtils {
             sslContextBuilder.loadKeyMaterial(keyStore, keyStorePassword);
         }
 
-        KeyStore trustStore = KeyStore.getInstance(trustStoreType);
-        try (InputStream trustStoreInputStream = new FileInputStream(trustStoreFile))
-        {
-            trustStore.load(trustStoreInputStream, trustStorePassword);
-            sslContextBuilder.loadTrustMaterial(trustStore, TrustAllStrategy.INSTANCE);
-        }
+        File trustStore = new File(trustStoreFile);
+        sslContextBuilder.loadTrustMaterial(trustStore, trustStorePassword);
 
         SSLContext sslContext = sslContextBuilder.build();
         SSLConnectionSocketFactory sslContextFactory = new SSLConnectionSocketFactory(sslContext);