This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch coheigea/saml-refactor-new
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/coheigea/saml-refactor-new by
this push:
new 4531bd1fb Removing some WSHandler functionality from Action
4531bd1fb is described below
commit 4531bd1fbab64b4e8ac648174b3a30726db8dc25
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Jun 17 16:58:20 2025 +0100
Removing some WSHandler functionality from Action
---
.../src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java | 4 ----
.../src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java | 3 +--
.../java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java | 3 ---
.../main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java | 3 +--
.../src/main/java/org/apache/wss4j/dom/action/SignatureAction.java | 3 ---
.../main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java | 3 ---
.../main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java | 3 +--
.../java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java | 4 +---
8 files changed, 4 insertions(+), 22 deletions(-)
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java
index 31ccbf275..e99539b53 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/CustomTokenAction.java
@@ -34,10 +34,6 @@ public class CustomTokenAction implements Action {
public void execute(WSHandler handler, SecurityActionToken actionToken,
RequestData reqData)
throws WSSecurityException {
CallbackHandler callbackHandler = reqData.getCallbackHandler();
- if (callbackHandler == null) {
- callbackHandler = handler.getPasswordCallbackHandler(reqData);
- }
-
if (callbackHandler == null) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "noCallback"
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java
index 7bc498714..029f92634 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionAction.java
@@ -109,8 +109,7 @@ public class EncryptionAction implements Action {
byte[] ephemeralKey = encryptionToken.getKey();
if (encryptionToken.isGetSymmetricKeyFromCallbackHandler()
|| !encryptionToken.isEncSymmetricEncryptionKey() && ephemeralKey
== null) {
- CallbackHandler callbackHandler =
- handler.getPasswordCallbackHandler(reqData);
+ CallbackHandler callbackHandler = reqData.getCallbackHandler();
// Get secret key for encryption from a CallbackHandler
WSPasswordCallback pwcb =
new WSPasswordCallback(encryptionToken.getUser(),
WSPasswordCallback.SECRET_KEY);
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
index 4734bd20a..6fdf38e6f 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
@@ -48,9 +48,6 @@ public class EncryptionDerivedAction extends
AbstractDerivedAction implements Ac
public void execute(WSHandler handler, SecurityActionToken actionToken,
RequestData reqData)
throws WSSecurityException {
CallbackHandler callbackHandler = reqData.getCallbackHandler();
- if (callbackHandler == null) {
- callbackHandler = handler.getPasswordCallbackHandler(reqData);
- }
EncryptionActionToken encryptionToken = null;
if (actionToken instanceof EncryptionActionToken) {
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
index edf8493f1..8b83a9c19 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
@@ -87,8 +87,7 @@ public class SAMLTokenSignedAction implements Action {
wsSign.setExpandXopInclude(reqData.isExpandXopInclude());
wsSign.setSignatureProvider(reqData.getSignatureProvider());
- CallbackHandler callbackHandler =
- handler.getPasswordCallbackHandler(reqData);
+ CallbackHandler callbackHandler = reqData.getCallbackHandler();
SignatureActionToken signatureToken = null;
if (actionToken instanceof SignatureActionToken) {
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
index 6184c1f2c..2b64a6364 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
@@ -43,9 +43,6 @@ public class SignatureAction implements Action {
public void execute(WSHandler handler, SecurityActionToken actionToken,
RequestData reqData)
throws WSSecurityException {
CallbackHandler callbackHandler = reqData.getCallbackHandler();
- if (callbackHandler == null) {
- callbackHandler = handler.getPasswordCallbackHandler(reqData);
- }
SignatureActionToken signatureToken = null;
if (actionToken instanceof SignatureActionToken) {
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
index aadab9267..a6de8dafd 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
@@ -49,9 +49,6 @@ public class SignatureDerivedAction extends
AbstractDerivedAction implements Act
public void execute(WSHandler handler, SecurityActionToken actionToken,
RequestData reqData)
throws WSSecurityException {
CallbackHandler callbackHandler = reqData.getCallbackHandler();
- if (callbackHandler == null) {
- callbackHandler = handler.getPasswordCallbackHandler(reqData);
- }
SignatureActionToken signatureToken = null;
if (actionToken instanceof SignatureActionToken) {
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java
index 523835832..0fdeafdec 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenAction.java
@@ -36,8 +36,7 @@ public class UsernameTokenAction implements Action {
String username = reqData.getUsername();
String password = null;
if (reqData.getPwType() != null) {
- CallbackHandler callbackHandler =
- handler.getPasswordCallbackHandler(reqData);
+ CallbackHandler callbackHandler = reqData.getCallbackHandler();
WSPasswordCallback passwordCallback =
handler.getPasswordCB(reqData.getUsername(), WSConstants.UT,
callbackHandler, reqData);
username = passwordCallback.getIdentifier();
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
index 1fce13992..510196277 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
@@ -50,9 +50,7 @@ public class UsernameTokenSignedAction implements Action {
public void execute(WSHandler handler, SecurityActionToken actionToken,
RequestData reqData)
throws WSSecurityException {
CallbackHandler callbackHandler = reqData.getCallbackHandler();
- if (callbackHandler == null) {
- callbackHandler = handler.getPasswordCallbackHandler(reqData);
- }
+
WSPasswordCallback passwordCallback =
handler.getPasswordCB(reqData.getUsername(), WSConstants.UT_SIGN,
callbackHandler, reqData);
