[java-identity-provider] branch main updated: Fix deprecated method call in log statement.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=21df6fad0ade962f11bc3473d44ad7c5cc8b0a56

The following commit(s) were added to refs/heads/main by this push:
     new 21df6fad0 Fix deprecated method call in log statement.
21df6fad0 is described below

commit 21df6fad0ade962f11bc3473d44ad7c5cc8b0a56
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Oct 4 12:58:33 2022 -0400

    Fix deprecated method call in log statement.
---
 .../java/net/shibboleth/idp/authn/impl/X509AuthServlet.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java
index a7695dc03..fc73369a8 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java
@@ -59,7 +59,7 @@ public class X509AuthServlet extends HttpServlet {
     @Nonnull @NotEmpty private static final String TRUST_ENGINE_PARAM = "trustEngine";
 
     /** Init parameter controlling certificate preservation. */
-    @Nonnull @NotEmpty private static final String SAVECERT_ENGINE_PARAM = "saveCertificateToCredentialSet";
+    @Nonnull @NotEmpty private static final String SAVECERT_PARAM = "saveCertificateToCredentialSet";
 
     /** Parameter/cookie for bypassing prompt page. */
     @Nonnull @NotEmpty private static final String PASSTHROUGH_PARAM = "x509passthrough";
@@ -120,7 +120,7 @@ public class X509AuthServlet extends HttpServlet {
             }
         }
         
-        param = config.getInitParameter(SAVECERT_ENGINE_PARAM);
+        param = config.getInitParameter(SAVECERT_PARAM);
         if (param != null) {
             setSaveCertificateToCredentialSet(Boolean.valueOf(param));
         }
@@ -138,9 +138,8 @@ public class X509AuthServlet extends HttpServlet {
             X509Certificate[] certs =
                     (X509Certificate[]) httpRequest.getAttribute("jakarta.servlet.request.X509Certificate");
             if (certs == null || certs.length == 0) {
-                // Check for newer Jakarta variant.
-                // TODO: Once Jakarta is "common", probably reverse these checks.
-                certs = (X509Certificate[]) httpRequest.getAttribute("jakarta.servlet.request.X509Certificate");
+                // Check for older variant.
+                certs = (X509Certificate[]) httpRequest.getAttribute("javax.servlet.request.X509Certificate");
             }
             log.debug("{} X.509 Certificate(s) found in request", certs != null ? certs.length : 0);
 
@@ -153,7 +152,7 @@ public class X509AuthServlet extends HttpServlet {
 
             final X509Certificate cert = certs[0];
             log.debug("End-entity X.509 certificate found with subject '{}', issued by '{}'",
-                    cert.getSubjectDN().getName(), cert.getIssuerDN().getName());
+                    cert.getSubjectX500Principal().getName(), cert.getIssuerX500Principal().getName());
             
             if (trustEngine != null) {
                 try {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.