This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fb7939c9aae7f98eb7f97e278b40babae308de48 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Jan 12 15:25:36 2023 +0000 Replace methods deprecated in Java 16+ --- java/org/apache/catalina/realm/CombinedRealm.java | 2 +- java/org/apache/catalina/realm/LockOutRealm.java | 2 +- java/org/apache/catalina/realm/RealmBase.java | 2 +- java/org/apache/catalina/valves/rewrite/ResolverImpl.java | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/org/apache/catalina/realm/CombinedRealm.java b/java/org/apache/catalina/realm/CombinedRealm.java index eaf46cecd1..8c880e6396 100644 --- a/java/org/apache/catalina/realm/CombinedRealm.java +++ b/java/org/apache/catalina/realm/CombinedRealm.java @@ -320,7 +320,7 @@ public class CombinedRealm extends RealmBase { Principal authenticatedUser = null; String username = null; if (certs != null && certs.length >0) { - username = certs[0].getSubjectDN().getName(); + username = certs[0].getSubjectX500Principal().toString(); } for (Realm realm : realms) { diff --git a/java/org/apache/catalina/realm/LockOutRealm.java b/java/org/apache/catalina/realm/LockOutRealm.java index 1eaff96ba8..abaee00b37 100644 --- a/java/org/apache/catalina/realm/LockOutRealm.java +++ b/java/org/apache/catalina/realm/LockOutRealm.java @@ -166,7 +166,7 @@ public class LockOutRealm extends CombinedRealm { public Principal authenticate(X509Certificate[] certs) { String username = null; if (certs != null && certs.length >0) { - username = certs[0].getSubjectDN().getName(); + username = certs[0].getSubjectX500Principal().toString(); } Principal authenticatedUser = super.authenticate(certs); diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java index e5da7792a8..dbce28d313 100644 --- a/java/org/apache/catalina/realm/RealmBase.java +++ b/java/org/apache/catalina/realm/RealmBase.java @@ -452,7 +452,7 @@ public abstract class RealmBase extends LifecycleMBeanBase implements Realm { for (X509Certificate cert : certs) { if (log.isDebugEnabled()) { log.debug(" Checking validity for '" + - cert.getSubjectDN().getName() + "'"); + cert.getSubjectX500Principal().toString() + "'"); } try { cert.checkValidity(); diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java index 8e925dcff3..f6adc5a128 100644 --- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java +++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java @@ -233,7 +233,7 @@ public class ResolverImpl extends Resolver { } else if (key.equals("M_SERIAL")) { return certificates[0].getSerialNumber().toString(); } else if (key.equals("S_DN")) { - return certificates[0].getSubjectDN().getName(); + return certificates[0].getSubjectX500Principal().toString(); } else if (key.startsWith("S_DN_")) { key = key.substring("S_DN_".length()); return resolveComponent(certificates[0].getSubjectX500Principal().getName(), key); @@ -246,10 +246,10 @@ public class ResolverImpl extends Resolver { key = key.substring("SAN_DNS_".length()); return resolveAlternateName(certificates[0], 2, Integer.parseInt(key)); } else if (key.equals("I_DN")) { - return certificates[0].getIssuerDN().getName(); + return certificates[0].getIssuerX500Principal().getName(); } else if (key.startsWith("I_DN_")) { key = key.substring("I_DN_".length()); - return resolveComponent(certificates[0].getIssuerX500Principal().getName(), key); + return resolveComponent(certificates[0].getIssuerX500Principal().toString(), key); } else if (key.equals("V_START")) { return String.valueOf(certificates[0].getNotBefore().getTime()); } else if (key.equals("V_END")) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org