PRIO (Testfix included): CustomKeyAndCertificateFactorySupplier added

mockserver-core/src/main/java/org/mockserver/socket/tls/KeyAndCertificateFactoryFactory.java

@@ -7,17 +7,22 @@
 import org.slf4j.event.Level;
 
 import java.lang.reflect.Constructor;
+import java.util.function.Function;
 
 /**
  * @author jamesdbloom
  */
 public class KeyAndCertificateFactoryFactory {
 
+    private static Function<MockServerLogger, KeyAndCertificateFactory> customKeyAndCertificateFactorySupplier = null;
+
     private static final ClassLoader CLASS_LOADER = KeyAndCertificateFactoryFactory.class.getClassLoader();
 
     @SuppressWarnings("unchecked")
     public static KeyAndCertificateFactory createKeyAndCertificateFactory(MockServerLogger mockServerLogger) {
-        if (ConfigurationProperties.useBouncyCastleForKeyAndCertificateGeneration()) {
+        if (customKeyAndCertificateFactorySupplier != null) {
+            return customKeyAndCertificateFactorySupplier.apply(mockServerLogger);
+        } else if (ConfigurationProperties.useBouncyCastleForKeyAndCertificateGeneration()) {
             Class<?> bouncyCastleProvider = null;
             Class<?> bouncyCastleX509Holder = null;
             try {
@@ -70,4 +75,12 @@ public static KeyAndCertificateFactory createKeyAndCertificateFactory(MockServer
         }
     }
 
+    public static Function<MockServerLogger, KeyAndCertificateFactory> getCustomKeyAndCertificateFactorySupplier() {
+        return customKeyAndCertificateFactorySupplier;
+    }
+
+    public static void setCustomKeyAndCertificateFactorySupplier(
+        Function<MockServerLogger, KeyAndCertificateFactory> customKeyAndCertificateFactorySupplier) {
+        KeyAndCertificateFactoryFactory.customKeyAndCertificateFactorySupplier = customKeyAndCertificateFactorySupplier;
+    }
 }

mockserver-core/src/main/java/org/mockserver/socket/tls/NettySslContextFactory.java

@@ -21,6 +21,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Supplier;
+import java.util.function.Function;
+import javax.net.ssl.SSLException;
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.mockserver.socket.tls.KeyAndCertificateFactoryFactory.createKeyAndCertificateFactory;
@@ -32,6 +34,15 @@
  */
 public class NettySslContextFactory {
 
+    public static Function<SslContextBuilder, SslContext> clientSslContextBuilderFunction =
+        sslContextBuilder -> {
+            try {
+                return sslContextBuilder.build();
+            } catch (SSLException e) {
+                throw new RuntimeException(e);
+            }
+        };
+
     private final MockServerLogger mockServerLogger;
     private final KeyAndCertificateFactory keyAndCertificateFactory;
     private SslContext clientSslContext = null;
@@ -72,7 +83,8 @@ public synchronized SslContext createClientSslContext(boolean forwardProxyClient
                 } else {
                     sslContextBuilder.trustManager(trustCertificateChain());
                 }
-                clientSslContext = sslContextBuilder.build();
+                clientSslContext = clientSslContextBuilderFunction
+                    .apply(sslContextBuilder);
                 ConfigurationProperties.rebuildTLSContext(false);
             } catch (Throwable throwable) {
                 throw new RuntimeException("Exception creating SSL context for client", throwable);

mockserver-core/src/test/java/org/mockserver/socket/tls/CustomKeyAndCertificateFactorySupplierTest.java

@@ -0,0 +1,26 @@
+package org.mockserver.socket.tls;
+
+import static org.junit.Assert.assertTrue;
+
+import java.math.BigInteger;
+import org.junit.AfterClass;
+import org.junit.Test;
+import org.mockserver.socket.tls.bouncycastle.BCKeyAndCertificateFactory;
+
+public class CustomKeyAndCertificateFactorySupplierTest {
+
+    @Test
+    public void setSupplier_shouldUseSupplier() {
+        KeyAndCertificateFactory factoryInstance = new BCKeyAndCertificateFactory(null);
+        KeyAndCertificateFactoryFactory.setCustomKeyAndCertificateFactorySupplier(logger -> factoryInstance);
+
+        assertTrue("Should give exact instance",
+            KeyAndCertificateFactoryFactory.createKeyAndCertificateFactory(null)
+                == factoryInstance);
+    }
+
+    @AfterClass
+    public static void resetSupplier() {
+        KeyAndCertificateFactoryFactory.setCustomKeyAndCertificateFactorySupplier(null);
+    }
+}

mockserver-netty/src/test/resources/org/mockserver/netty/integration/tls/generate_custom_certifcates.md

@@ -23,4 +23,6 @@ rm -rf leaf-cert-and-key.json
 
 
 # download certificates from domain
-openssl s_client -host stackoverflow.com -port 443 -prexit -showcerts > stackoverflow-chain.pem
+openssl s_client -host stackoverflow.com -port 443 -prexit -showcerts > stackoverflow-chain.pem
+
+# finally update the chains