Bug Fixes:

- Resolved issues with default key password settings for PEM Signed-off-by: Andrey Pleskach <[email protected]>
willyborankin · Aug 22, 2024 · 83a6e67 · 83a6e67
1 parent 00bc347
commit 83a6e67
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/opensearch/security/ssl/config/KeyStoreUtils.java b/src/main/java/org/opensearch/security/ssl/config/KeyStoreUtils.java
@@ -36,6 +36,8 @@
 import io.netty.handler.ssl.ApplicationProtocolNegotiator;
 import io.netty.handler.ssl.SslContext;
 
+import static java.util.Objects.isNull;
+
 final class KeyStoreUtils {
 
     private final static class SecuritySslContext extends SslContext {
@@ -167,7 +169,7 @@ public static KeyStore keyStore(final Path certificateChainPath, final Path keyP
         final var certificateChain = x509Certificates(certificateChainPath);
         try {
             final var keyStore = newKeyStore();
-            final var key = SecuritySslContext.toPrivateKey(keyPath.toFile(), new String(keyPassword));
+            final var key = SecuritySslContext.toPrivateKey(keyPath.toFile(), isNull(keyPassword) ? null : new String(keyPassword));
             keyStore.setKeyEntry("key", key, keyPassword, certificateChain);
             return keyStore;
         } catch (Exception e) {

diff --git a/src/main/java/org/opensearch/security/ssl/config/SslCertificatesLoader.java b/src/main/java/org/opensearch/security/ssl/config/SslCertificatesLoader.java
@@ -45,8 +45,6 @@ public class SslCertificatesLoader {
 
     private final static Logger LOGGER = LogManager.getLogger(SslCertificatesLoader.class);
 
-    private final static char[] EMPTY_PASSWORD = new char[0];
-
     private final String sslConfigSuffix;
 
     private final String fullSslConfigSuffix;
@@ -114,7 +112,7 @@ private char[] resolvePassword(final String legacyPasswordSettings, final Settin
                 return legacyPassword.toCharArray();
             }
         }
-        return EMPTY_PASSWORD;
+        return null;
     }
 
     private KeyStoreConfiguration.JdkKeyStoreConfiguration buildJdkKeyStoreConfiguration(