You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2025/06/20 11:36:23 UTC
(ws-wss4j) 01/02: Moving SignatureTrustValidator to common
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
commit a3d442a07aa72f91b06e456904c7f276084f33ab
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jun 20 12:31:19 2025 +0100
Moving SignatureTrustValidator to common
---
.../apache/wss4j/common}/dom/validate/SignatureTrustValidator.java | 4 +---
.../src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java | 5 +++--
.../java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java | 1 +
.../META-INF/services/org.apache.wss4j.common.dom.validate.Validator | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/validate/SignatureTrustValidator.java
similarity index 97%
rename from ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java
rename to ws-security-common/src/main/java/org/apache/wss4j/common/dom/validate/SignatureTrustValidator.java
index 96fa2bb6b..0e3e499a8 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SignatureTrustValidator.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/dom/validate/SignatureTrustValidator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.validate;
+package org.apache.wss4j.common.dom.validate;
import java.security.PublicKey;
import java.security.cert.X509Certificate;
@@ -27,8 +27,6 @@ import java.util.regex.Pattern;
import javax.xml.namespace.QName;
import org.apache.wss4j.common.crypto.Crypto;
-import org.apache.wss4j.common.dom.validate.Credential;
-import org.apache.wss4j.common.dom.validate.Validator;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.dom.WSConstants;
import org.apache.wss4j.common.dom.RequestData;
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
index 1576c9972..d6373fc12 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
@@ -53,7 +53,6 @@ import org.apache.wss4j.common.dom.message.WSSecHeader;
import org.apache.wss4j.common.dom.RequestData;
import org.apache.wss4j.common.dom.message.WSSecSignature;
import org.apache.wss4j.common.dom.transform.STRTransform;
-import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -111,7 +110,9 @@ public class WSSecSignatureSAML extends WSSecSignature {
prepare(uCrypto, samlAssertion, iCrypto, iKeyName, iKeyPW);
if (getParts().isEmpty()) {
- getParts().add(WSSecurityUtil.getDefaultEncryptionPart(getDocument()));
+ String soapNamespace = XMLUtils.getSOAPNamespace(getDocument().getDocumentElement());
+ WSEncryptionPart defaulEncryptionPart = new WSEncryptionPart(WSConstants.ELEM_BODY, soapNamespace, "Content");
+ getParts().add(defaulEncryptionPart);
} else {
for (WSEncryptionPart part : getParts()) {
if ("STRTransform".equals(part.getName()) && part.getId() == null) {
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java
index 453f5ca6d..bfd8fe97a 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/SamlAssertionValidator.java
@@ -26,6 +26,7 @@ import javax.xml.namespace.QName;
import org.apache.wss4j.common.cache.ReplayCache;
import org.apache.wss4j.common.dom.validate.Credential;
+import org.apache.wss4j.common.dom.validate.SignatureTrustValidator;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.OpenSAMLUtil;
import org.apache.wss4j.common.saml.SAMLKeyInfo;
diff --git a/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator b/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator
index 175a3dbb0..c0d49d350 100644
--- a/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator
+++ b/ws-security-dom/src/main/resources/META-INF/services/org.apache.wss4j.common.dom.validate.Validator
@@ -1,4 +1,4 @@
+org.apache.wss4j.common.dom.validate.SignatureTrustValidator
org.apache.wss4j.dom.validate.SamlAssertionValidator
-org.apache.wss4j.dom.validate.SignatureTrustValidator
org.apache.wss4j.dom.validate.TimestampValidator
org.apache.wss4j.dom.validate.UsernameTokenValidator