Fix truststore REST Client config when password is not set

Relates quarkusio#27925 (comment) (cherry picked from commit 4502d6a)
gsmet · Mar 16, 2023 · 6977c63 · 6977c63
1 parent 7182c47
commit 6977c63
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...ient/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java b/...ient/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java
@@ -173,9 +173,6 @@ public ClientBuilder clientLogger(ClientLogger clientLogger) {
 
     @Override
     public ClientImpl build() {
-        Buffer keyStore = asBuffer(this.keyStore, keystorePassword);
-        Buffer trustStore = asBuffer(this.trustStore, this.trustStorePassword);
-
         HttpClientOptions options = Optional.ofNullable(configuration.getFromContext(HttpClientOptions.class))
                 .orElseGet(HttpClientOptions::new);
 
@@ -185,6 +182,9 @@ public ClientImpl build() {
             options.setVerifyHost(false);
         }
 
+        char[] effectiveTrustStorePassword = trustStorePassword == null ? EMPTY_CHAR_ARARAY : trustStorePassword;
+        Buffer keyStore = asBuffer(this.keyStore, keystorePassword);
+        Buffer trustStore = asBuffer(this.trustStore, effectiveTrustStorePassword);
         if (keyStore != null || trustStore != null) {
             options = options.setSsl(true);
             if (keyStore != null) {
@@ -196,7 +196,7 @@ public ClientImpl build() {
             if (trustStore != null) {
                 JksOptions jks = new JksOptions();
                 jks.setValue(trustStore);
-                jks.setPassword(trustStorePassword == null ? "" : new String(trustStorePassword));
+                jks.setPassword(new String(effectiveTrustStorePassword));
                 options.setTrustStoreOptions(jks);
             }
         }