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 c1413e4aa Changing some DOM references to common
c1413e4aa is described below
commit c1413e4aa5bd5f8df87d3de1e30934a0b5469b42
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Jun 17 03:30:49 2025 +0100
Changing some DOM references to common
---
.../wss4j/dom/action/SAMLTokenUnsignedAction.java | 6 +++---
.../java/org/apache/wss4j/dom/handler/RequestData.java | 4 ++--
.../java/org/apache/wss4j/dom/message/WSSecHeader.java | 18 +++++++++---------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java
index f7cc633f9..a40a4c340 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java
@@ -21,6 +21,7 @@ package org.apache.wss4j.dom.action;
import javax.security.auth.callback.CallbackHandler;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.SecurityActionToken;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
@@ -28,7 +29,6 @@ import org.apache.wss4j.common.saml.SAMLCallback;
import org.apache.wss4j.common.saml.SAMLUtil;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandler;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.message.WSSecSAMLToken;
public class SAMLTokenUnsignedAction implements Action {
@@ -42,8 +42,8 @@ public class SAMLTokenUnsignedAction implements Action {
CallbackHandler samlCallbackHandler =
handler.getCallbackHandler(
- WSHandlerConstants.SAML_CALLBACK_CLASS,
- WSHandlerConstants.SAML_CALLBACK_REF,
+ ConfigurationConstants.SAML_CALLBACK_CLASS,
+ ConfigurationConstants.SAML_CALLBACK_REF,
reqData
);
if (samlCallbackHandler == null) {
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java
index 84bcb1717..c878fa048 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java
@@ -34,6 +34,7 @@ import javax.xml.namespace.QName;
import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.EncryptionActionToken;
import org.apache.wss4j.common.SignatureActionToken;
+import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.bsp.BSPEnforcer;
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.cache.ReplayCache;
@@ -42,7 +43,6 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.PasswordEncryptor;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.SOAPConstants;
-import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.WSDocInfo;
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.message.WSSecHeader;
@@ -58,7 +58,7 @@ public class RequestData {
private SOAPConstants soapConstants;
private String actor;
private String username;
- private String pwType = WSConstants.PASSWORD_DIGEST; // Make this the
default when no password type is given.
+ private String pwType = WSS4JConstants.PASSWORD_DIGEST; // Make this the
default when no password type is given.
private Crypto sigVerCrypto;
private Crypto decCrypto;
private SignatureActionToken signatureToken;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
index f75a05f1e..65ecdb32f 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
@@ -18,7 +18,7 @@
*/
package org.apache.wss4j.dom.message;
-import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.util.WSSecurityUtil;
@@ -43,7 +43,7 @@ public class WSSecHeader {
private final Document doc;
- private String wsuPrefix = WSConstants.WSU_PREFIX;
+ private String wsuPrefix = WSS4JConstants.WSU_PREFIX;
/**
* Constructor.
@@ -168,13 +168,13 @@ public class WSSecHeader {
String soapNamespace =
WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
String soapPrefix =
XMLUtils.setNamespace(
- securityHeader, soapNamespace, WSConstants.DEFAULT_SOAP_PREFIX
+ securityHeader, soapNamespace,
WSS4JConstants.DEFAULT_SOAP_PREFIX
);
if (actor != null && actor.length() > 0) {
- String actorLocal = WSConstants.ATTR_ACTOR;
- if (WSConstants.URI_SOAP12_ENV.equals(soapNamespace)) {
- actorLocal = WSConstants.ATTR_ROLE;
+ String actorLocal = WSS4JConstants.ATTR_ACTOR;
+ if (WSS4JConstants.URI_SOAP12_ENV.equals(soapNamespace)) {
+ actorLocal = WSS4JConstants.ATTR_ROLE;
}
securityHeader.setAttributeNS(
soapNamespace,
@@ -184,16 +184,16 @@ public class WSSecHeader {
}
if (mustunderstand) {
String mustUnderstandLocal = "1";
- if (WSConstants.URI_SOAP12_ENV.equals(soapNamespace)) {
+ if (WSS4JConstants.URI_SOAP12_ENV.equals(soapNamespace)) {
mustUnderstandLocal = "true";
}
securityHeader.setAttributeNS(
soapNamespace,
- soapPrefix + ":" + WSConstants.ATTR_MUST_UNDERSTAND,
+ soapPrefix + ":" + WSS4JConstants.ATTR_MUST_UNDERSTAND,
mustUnderstandLocal
);
}
- wsuPrefix = XMLUtils.setNamespace(securityHeader, WSConstants.WSU_NS,
WSConstants.WSU_PREFIX);
+ wsuPrefix = XMLUtils.setNamespace(securityHeader,
WSS4JConstants.WSU_NS, WSS4JConstants.WSU_PREFIX);
return securityHeader;
}
