This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 2b4a853dae Followup to getSubjectX500Principal() changes - retain
original name
2b4a853dae is described below
commit 2b4a853dae39fd1242042be8ad165a8c0c538398
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Jan 12 17:06:14 2023 +0000
Followup to getSubjectX500Principal() changes - retain original name
As per BZ 66009 getSubjectX500Principal().toString() returns the same
result as getSubjectDN().getName()
---
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 | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/realm/CombinedRealm.java
b/java/org/apache/catalina/realm/CombinedRealm.java
index 0968241e9a..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].getSubjectX500Principal().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 90fe1b64e9..f4254dcb64 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].getSubjectX500Principal().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 3ff9c336e2..0bac871696 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.getSubjectX500Principal().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 a023c0d1e9..508a2ac28f 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -233,10 +233,10 @@ 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].getSubjectX500Principal().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);
+ return
resolveComponent(certificates[0].getSubjectX500Principal().toString(), key);
} else if (key.startsWith("SAN_Email_")) {
// Type rfc822Name, which is 1
key = key.substring("SAN_Email_".length());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
