Make it easier to locate expired certificate

eclipse-ee4j · Oct 15, 2022 · da88a81 · da88a81
1 parent a54dd09
commit da88a81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/docs/error-messages-reference/src/main/asciidoc/error-messages.adoc b/docs/error-messages-reference/src/main/asciidoc/error-messages.adoc
@@ -9990,7 +9990,7 @@ Please provide a valid specification version for this optional package
 +
   Action: Resolve the situation described in the message, if necessary.
 
-[[sthref1941]]NCLS-SECURITY-05054 The SSL certificate has expired: \{0} ::
+[[sthref1941]]NCLS-SECURITY-05054 The SSL certificate with alias \{0} has expired: \{1} ::
   Cause: Certificate expired.
 +
   Action: Check the expiration date of the certificate.

diff --git a/...rity/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/SecuritySupportImpl.java b/...rity/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/SecuritySupportImpl.java
@@ -86,7 +86,7 @@ public class SecuritySupportImpl extends SecuritySupport {
 
     protected static final Logger _logger = Logger.getLogger(SEC_SSL_LOGGER, SHARED_LOGMESSAGE_RESOURCE);
 
-    @LogMessageInfo(message = "The SSL certificate has expired: {0}", level = "SEVERE", cause = "Certificate expired.", action = "Check the expiration date of the certicate.")
+    @LogMessageInfo(message = "The SSL certificate with alias {0} has expired: {1}", level = "SEVERE", cause = "Certificate expired.", action = "Check the expiration date of the certicate.")
     private static final String SSL_CERT_EXPIRED = "NCLS-SECURITY-05054";
 
     private static boolean initialized = false;
@@ -318,10 +318,11 @@ private void checkCertificateDates(KeyStore store) throws KeyStoreException {
 
         Enumeration<String> aliases = store.aliases();
         while (aliases.hasMoreElements()) {
-            Certificate cert = store.getCertificate(aliases.nextElement());
+            var alias = aliases.nextElement();
+            Certificate cert = store.getCertificate(alias);
             if (cert instanceof X509Certificate) {
                 if (((X509Certificate) cert).getNotAfter().before(initDate)) {
-                    _logger.log(Level.SEVERE, SSL_CERT_EXPIRED, cert);
+                    _logger.log(Level.SEVERE, SSL_CERT_EXPIRED, new Object[] { alias, cert });
                 }
             }
         }