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 bf7374b8f4 Don't overwrite valid Principal from password callback will
null
bf7374b8f4 is described below
commit bf7374b8f4ab6f497b8ff906980904e17f755335
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Sep 19 14:59:04 2024 +0100
Don't overwrite valid Principal from password callback will null
---
.../org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
index e95654c4bc..afb0626eaf 100644
--- a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
@@ -69,7 +69,9 @@ public class CallbackHandlerImpl implements CallbackHandler,
Contained {
if (callback instanceof CallerPrincipalCallback) {
CallerPrincipalCallback cpc = (CallerPrincipalCallback)
callback;
name = cpc.getName();
- principal = cpc.getPrincipal();
+ if (cpc.getPrincipal() != null) {
+ principal = cpc.getPrincipal();
+ }
subject = cpc.getSubject();
} else if (callback instanceof GroupPrincipalCallback) {
GroupPrincipalCallback gpc = (GroupPrincipalCallback)
callback;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
