Reload key and certs in SockerAppender reconnector

Signed-off-by: MichaelMorris <michael.morris@est.tech>

Author: MichaelMorrisEst

log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java

@@ -57,6 +57,11 @@ private static SslConfiguration createTestSslConfigurationFiles() throws StoreCo
         return SslConfiguration.createSSLConfiguration(null, ksc, tsc);
     }
 
+    @Test
+    void testCreateSslSocketFactory() throws StoreConfigurationException {
+        assertNotNull(createTestSslConfigurationFiles().createSslSocketFactory());
+    }
+
     @Test
     void testGettersFromScratchFiles() throws StoreConfigurationException {
         assertNotNull(createTestSslConfigurationFiles().getProtocol());

log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java

@@ -234,7 +234,7 @@ private static SSLSocketFactory createSslSocketFactory(final SslConfiguration ss
         SSLSocketFactory socketFactory;
 
         if (sslConf != null) {
-            socketFactory = sslConf.getSslSocketFactory();
+            socketFactory = sslConf.createSslSocketFactory();
         } else {
             socketFactory = (SSLSocketFactory) SSLSocketFactory.getDefault();
         }

log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java

@@ -33,7 +33,7 @@
  */
 public class AbstractKeyStoreConfiguration extends StoreConfiguration<KeyStore> {
 
-    private final KeyStore keyStore;
+    private KeyStore keyStore;
     private final String keyStoreType;
 
     public AbstractKeyStoreConfiguration(
@@ -44,6 +44,10 @@ public AbstractKeyStoreConfiguration(
         this.keyStore = this.load();
     }
 
+    public void reload() throws StoreConfigurationException {
+        this.keyStore = this.load();
+    }
+
     /**
      * @deprecated Use {@link #AbstractKeyStoreConfiguration(String, PasswordProvider, String)} instead
      */

log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java

@@ -43,7 +43,7 @@ public class SslConfiguration {
     private static final StatusLogger LOGGER = StatusLogger.getLogger();
     private final KeyStoreConfiguration keyStoreConfig;
     private final TrustStoreConfiguration trustStoreConfig;
-    private final SSLContext sslContext;
+    private SSLContext sslContext;
     private final String protocol;
     private final boolean verifyHostName;
 
@@ -71,6 +71,17 @@ public void clearSecrets() {
         }
     }
 
+    public SSLSocketFactory createSslSocketFactory() {
+        try {
+            keyStoreConfig.reload();
+            trustStoreConfig.reload();
+        } catch (StoreConfigurationException e) {
+            LOGGER.debug("Exception occurred reloading SSL configuration. Previously read data will be used", e);
+        }
+        sslContext = createSslContext();
+        return sslContext.getSocketFactory();
+    }
+
     public SSLSocketFactory getSslSocketFactory() {
         return sslContext.getSocketFactory();
     }

log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/package-info.java

@@ -18,7 +18,7 @@
  * Log4j 2 SSL support
  */
 @Export
-@Version("2.20.2")
+@Version("2.21.0")
 package org.apache.logging.log4j.core.net.ssl;
 
 import org.osgi.annotation.bundle.Export;