You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/01/12 17:26:37 UTC
[tomcat] branch 8.5.x updated: Replace methods deprecated in Java 16+
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 86ff195758 Replace methods deprecated in Java 16+
86ff195758 is described below
commit 86ff195758b05b976e18740bfedd011a26221d02
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 0f5eca6158..67c3567e59 100644
--- a/java/org/apache/catalina/realm/CombinedRealm.java
+++ b/java/org/apache/catalina/realm/CombinedRealm.java
@@ -327,7 +327,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 148279cfe6..ebc89cecb2 100644
--- a/java/org/apache/catalina/realm/LockOutRealm.java
+++ b/java/org/apache/catalina/realm/LockOutRealm.java
@@ -171,7 +171,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 bf53b6a787..022f1dff05 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -454,7 +454,7 @@ public abstract class RealmBase extends LifecycleMBeanBase implements org.apache
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 a909b5c871..a63eb4ee73 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -222,7 +222,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);
@@ -235,10 +235,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org