From bffa9448e1765a329abf4fbf5fe7cb01f9320dee Mon Sep 17 00:00:00 2001
From: NOUMANE <ahmed.noumane@xelians.fr>
Date: Tue, 4 Aug 2020 16:49:15 +0200
Subject: [PATCH] [US TRTL-246]  modification of SSL configuration for Interco

---
 .../gouv/vitamui/commons/rest/client/BaseWebClientFactory.java  | 2 +-
 .../rest/client/configuration/RestClientConfiguration.java      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/commons/commons-rest/src/main/java/fr/gouv/vitamui/commons/rest/client/BaseWebClientFactory.java b/commons/commons-rest/src/main/java/fr/gouv/vitamui/commons/rest/client/BaseWebClientFactory.java
index a75e5edf..269bfc0f 100644
--- a/commons/commons-rest/src/main/java/fr/gouv/vitamui/commons/rest/client/BaseWebClientFactory.java
+++ b/commons/commons-rest/src/main/java/fr/gouv/vitamui/commons/rest/client/BaseWebClientFactory.java
@@ -150,7 +150,7 @@ public class BaseWebClientFactory implements WebClientFactory {
             SslContextBuilder sslContextBuilder = SslContextBuilder.forClient();
             sslContextBuilder = sslContextBuilder.clientAuth(ClientAuth.NONE);
 
-            if (ks != null) {
+            if (ks != null && restClientConfig.isKeystoreNeeded()) {
                 sslContextBuilder = sslContextBuilder.keyManager(createKeyManagerFactory(ks.getType(), ks.getKeyPath(), ks.getKeyPassword().toCharArray()));
             }
 
diff --git a/commons/commons-rest/src/main/java/fr/gouv/vitamui/commons/rest/client/configuration/RestClientConfiguration.java b/commons/commons-rest/src/main/java/fr/gouv/vitamui/commons/rest/client/configuration/RestClientConfiguration.java
index 746bacd7..8c878f21 100644
--- a/commons/commons-rest/src/main/java/fr/gouv/vitamui/commons/rest/client/configuration/RestClientConfiguration.java
+++ b/commons/commons-rest/src/main/java/fr/gouv/vitamui/commons/rest/client/configuration/RestClientConfiguration.java
@@ -59,6 +59,8 @@ public class RestClientConfiguration {
 
     private boolean secure;
 
+    private boolean keystoreNeeded = true;
+
     private SSLConfiguration sslConfiguration;
 
     /**
-- 
GitLab