Updated as per review

quarkusio · Jun 17, 2020 · 7f9ea6b · 7f9ea6b
1 parent 9df17f8
commit 7f9ea6b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 70 deletions.
diff --git a/...pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java b/...pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java
@@ -2,7 +2,12 @@
 
 import static io.quarkus.credentials.CredentialsProvider.PASSWORD_PROPERTY_NAME;
 import static io.quarkus.credentials.CredentialsProvider.USER_PROPERTY_NAME;
-import static io.quarkus.vertx.core.runtime.SSLConfigHelper.*;
+import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configureJksKeyCertOptions;
+import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configureJksTrustOptions;
+import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configurePemKeyCertOptions;
+import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configurePemTrustOptions;
+import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configurePfxKeyCertOptions;
+import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configurePfxTrustOptions;
 
 import java.util.Map;
 

diff --git a/...sions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/SSLConfigHelper.java b/...sions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/SSLConfigHelper.java
@@ -1,17 +1,18 @@
 package io.quarkus.vertx.core.runtime;
 
-import java.util.regex.Pattern;
-
 import io.quarkus.vertx.core.runtime.config.JksConfiguration;
 import io.quarkus.vertx.core.runtime.config.PemKeyCertConfiguration;
 import io.quarkus.vertx.core.runtime.config.PemTrustCertConfiguration;
 import io.quarkus.vertx.core.runtime.config.PfxConfiguration;
-import io.vertx.core.net.*;
+import io.vertx.core.net.JksOptions;
+import io.vertx.core.net.KeyCertOptions;
+import io.vertx.core.net.PemKeyCertOptions;
+import io.vertx.core.net.PemTrustOptions;
+import io.vertx.core.net.PfxOptions;
+import io.vertx.core.net.TCPSSLOptions;
 
 public class SSLConfigHelper {
 
-    private static final Pattern COMMA_PATTERN = Pattern.compile(",");
-
     public static void configurePemTrustOptions(TCPSSLOptions options, PemTrustCertConfiguration configuration) {
         if (configuration.enabled) {
             ensureTrustOptionsNotSet(options);
@@ -22,8 +23,8 @@ public static void configurePemTrustOptions(TCPSSLOptions options, PemTrustCertC
     private static PemTrustOptions toPemTrustOptions(PemTrustCertConfiguration configuration) {
         PemTrustOptions pemTrustOptions = new PemTrustOptions();
         if (configuration.certs.isPresent()) {
-            for (String cert : COMMA_PATTERN.split(configuration.certs.get())) {
-                pemTrustOptions.addCertPath(cert.trim());
+            for (String cert : configuration.certs.get()) {
+                pemTrustOptions.addCertPath(cert);
             }
         }
         return pemTrustOptions;
@@ -81,13 +82,13 @@ public static void configurePemKeyCertOptions(TCPSSLOptions options, PemKeyCertC
     private static KeyCertOptions toPemKeyCertOptions(PemKeyCertConfiguration configuration) {
         PemKeyCertOptions pemKeyCertOptions = new PemKeyCertOptions();
         if (configuration.certs.isPresent()) {
-            for (String cert : COMMA_PATTERN.split(configuration.certs.get())) {
-                pemKeyCertOptions.addCertPath(cert.trim());
+            for (String cert : configuration.certs.get()) {
+                pemKeyCertOptions.addCertPath(cert);
             }
         }
         if (configuration.keys.isPresent()) {
-            for (String cert : COMMA_PATTERN.split(configuration.keys.get())) {
-                pemKeyCertOptions.addKeyPath(cert.trim());
+            for (String cert : configuration.keys.get()) {
+                pemKeyCertOptions.addKeyPath(cert);
             }
         }
         return pemKeyCertOptions;

diff --git a/...ons/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java b/...ons/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java
@@ -1,10 +1,14 @@
 package io.quarkus.vertx.core.runtime;
 
+import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configureJksKeyCertOptions;
+import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configurePemKeyCertOptions;
+import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configurePemTrustOptions;
+import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configurePfxKeyCertOptions;
+import static io.quarkus.vertx.core.runtime.SSLConfigHelper.configurePfxTrustOptions;
 import static io.vertx.core.file.impl.FileResolver.CACHE_DIR_BASE_PROP_NAME;
 
 import java.io.File;
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -13,8 +17,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import org.jboss.logging.Logger;
 import org.wildfly.common.cpu.ProcessorInfo;
@@ -36,19 +38,13 @@
 import io.vertx.core.file.FileSystemOptions;
 import io.vertx.core.http.ClientAuth;
 import io.vertx.core.impl.VertxImpl;
-import io.vertx.core.net.JksOptions;
-import io.vertx.core.net.PemKeyCertOptions;
-import io.vertx.core.net.PemTrustOptions;
-import io.vertx.core.net.PfxOptions;
 import io.vertx.core.spi.resolver.ResolverProvider;
 
 @Recorder
 public class VertxCoreRecorder {
 
     private static final Logger LOGGER = Logger.getLogger(VertxCoreRecorder.class.getName());
 
-    private static final Pattern COMMA_PATTERN = Pattern.compile(",");
-
     static volatile VertxSupplier vertx;
 
     public Supplier<Vertx> configureVertx(VertxConfiguration config,
@@ -257,54 +253,14 @@ private static void setEventBusOptions(VertxConfiguration conf, VertxOptions opt
         opts.setTrustAll(eb.trustAll);
 
         // Certificates and trust.
-        if (eb.keyCertificatePem != null) {
-            List<String> certs = new ArrayList<>();
-            List<String> keys = new ArrayList<>();
-            eb.keyCertificatePem.certs.ifPresent(
-                    s -> certs.addAll(COMMA_PATTERN.splitAsStream(s).map(String::trim).collect(Collectors.toList())));
-            eb.keyCertificatePem.keys.ifPresent(
-                    s -> keys.addAll(COMMA_PATTERN.splitAsStream(s).map(String::trim).collect(Collectors.toList())));
-            PemKeyCertOptions o = new PemKeyCertOptions()
-                    .setCertPaths(certs)
-                    .setKeyPaths(keys);
-            opts.setPemKeyCertOptions(o);
-        }
-
-        if (eb.keyCertificateJks != null) {
-            JksOptions o = new JksOptions();
-            eb.keyCertificateJks.path.ifPresent(o::setPath);
-            eb.keyCertificateJks.password.ifPresent(o::setPassword);
-            opts.setKeyStoreOptions(o);
-        }
+        configurePemKeyCertOptions(opts, eb.keyCertificatePem);
+        configureJksKeyCertOptions(opts, eb.keyCertificateJks);
+        configurePfxKeyCertOptions(opts, eb.keyCertificatePfx);
 
-        if (eb.keyCertificatePfx != null) {
-            PfxOptions o = new PfxOptions();
-            eb.keyCertificatePfx.path.ifPresent(o::setPath);
-            eb.keyCertificatePfx.password.ifPresent(o::setPassword);
-            opts.setPfxKeyCertOptions(o);
-        }
+        configurePemTrustOptions(opts, eb.trustCertificatePem);
+        configureJksKeyCertOptions(opts, eb.trustCertificateJks);
+        configurePfxTrustOptions(opts, eb.trustCertificatePfx);
 
-        if (eb.trustCertificatePem != null) {
-            eb.trustCertificatePem.certs.ifPresent(s -> {
-                PemTrustOptions o = new PemTrustOptions();
-                COMMA_PATTERN.splitAsStream(s).map(String::trim).forEach(o::addCertPath);
-                opts.setPemTrustOptions(o);
-            });
-        }
-
-        if (eb.trustCertificateJks != null) {
-            JksOptions o = new JksOptions();
-            eb.trustCertificateJks.path.ifPresent(o::setPath);
-            eb.trustCertificateJks.password.ifPresent(o::setPassword);
-            opts.setTrustStoreOptions(o);
-        }
-
-        if (eb.trustCertificatePfx != null) {
-            PfxOptions o = new PfxOptions();
-            eb.trustCertificatePfx.path.ifPresent(o::setPath);
-            eb.trustCertificatePfx.password.ifPresent(o::setPassword);
-            opts.setPfxTrustOptions(o);
-        }
         options.setEventBusOptions(opts);
     }
 

diff --git a/...e/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemKeyCertConfiguration.java b/...e/runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemKeyCertConfiguration.java
@@ -1,5 +1,6 @@
 package io.quarkus.vertx.core.runtime.config;
 
+import java.util.List;
 import java.util.Optional;
 
 import io.quarkus.runtime.annotations.ConfigGroup;
@@ -18,12 +19,12 @@ public class PemKeyCertConfiguration {
      * Comma-separated list of the path to the key files (Pem format).
      */
     @ConfigItem
-    public Optional<String> keys;
+    public Optional<List<String>> keys;
 
     /**
      * Comma-separated list of the path to the certificate files (Pem format).
      */
     @ConfigItem
-    public Optional<String> certs;
+    public Optional<List<String>> certs;
 
 }
diff --git a/...runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemTrustCertConfiguration.java b/...runtime/src/main/java/io/quarkus/vertx/core/runtime/config/PemTrustCertConfiguration.java
@@ -1,5 +1,6 @@
 package io.quarkus.vertx.core.runtime.config;
 
+import java.util.List;
 import java.util.Optional;
 
 import io.quarkus.runtime.annotations.ConfigGroup;
@@ -18,6 +19,6 @@ public class PemTrustCertConfiguration {
      * Comma-separated list of the trust certificate files (Pem format).
      */
     @ConfigItem
-    public Optional<String> certs;
+    public Optional<List<String>> certs;
 
 }