From aefc98af84a5c0c628d64c4df6acdfdc9a72a3db Mon Sep 17 00:00:00 2001
From: lvydra <torgal@hotmail.cz>
Date: Tue, 13 Aug 2024 11:22:24 +0200
Subject: [PATCH] [ELY-2704] Missing keystore password does not throw a
 meaningful exception

---
 .../org/wildfly/security/auth/client/ElytronXmlParser.java   | 3 +++
 .../security/auth/client/_private/ElytronMessages.java       | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/auth/client/src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java b/auth/client/src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java
index 967df3725b8..8a933f4951c 100644
--- a/auth/client/src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java
+++ b/auth/client/src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java
@@ -3649,6 +3649,9 @@ protected AbstractLoadingKeyStoreFactory(final ExceptionSupplier<KeyStore, Confi
         public KeyStore get() throws ConfigXMLParseException {
             try {
                 KeyStore keyStore = delegateFactory.get();
+                if (passwordFactory == null || passwordFactory.get() == null) {
+                    xmlLog.noKeystorePasswordSpecified(location);
+                }
                 try (InputStream fis = createStream()) {
                     keyStore.load(fis, passwordFactory == null ? null : passwordFactory.get());
                 }
diff --git a/auth/client/src/main/java/org/wildfly/security/auth/client/_private/ElytronMessages.java b/auth/client/src/main/java/org/wildfly/security/auth/client/_private/ElytronMessages.java
index b30d33f0db4..6479d576062 100644
--- a/auth/client/src/main/java/org/wildfly/security/auth/client/_private/ElytronMessages.java
+++ b/auth/client/src/main/java/org/wildfly/security/auth/client/_private/ElytronMessages.java
@@ -18,6 +18,7 @@
 
 package org.wildfly.security.auth.client._private;
 
+import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.WARN;
 
 import java.io.IOException;
@@ -129,6 +130,10 @@ ConfigXMLParseException xmlDuplicateAuthenticationConfigurationName(String name,
     ConfigXMLParseException xmlInvalidKeyStoreEntryType(@Param Location location, String alias, Class<?> expectedClass,
             Class<?> actualClass);
 
+    @LogMessage(level = INFO)
+    @Message(id = 1138, value = "No Keystore password specified \"%s\"")
+    void noKeystorePasswordSpecified(Location location);
+
     @Message(id = 1139, value = "Failed to create credential store")
     ConfigXMLParseException xmlFailedToCreateCredentialStore(@Param Location location, @Cause Throwable cause);