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 f907b2b9c Moving TokenContext to Stax API
f907b2b9c is described below
commit f907b2b9c881c03b4667f3490454228d1dd34e41
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Mon Aug 11 11:35:58 2025 +0100
Moving TokenContext to Stax API
---
.../src/main/java/org/apache/wss4j/api}/stax/validate/TokenContext.java | 2 +-
.../stax/impl/processor/input/BinarySecurityTokenInputHandler.java | 2 +-
.../apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java | 2 +-
.../stax/impl/processor/input/SecurityContextTokenInputHandler.java | 2 +-
.../apache/wss4j/stax/impl/processor/input/TimestampInputHandler.java | 2 +-
.../wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java | 2 +-
.../org/apache/wss4j/stax/validate/BinarySecurityTokenValidator.java | 1 +
.../apache/wss4j/stax/validate/BinarySecurityTokenValidatorImpl.java | 1 +
.../org/apache/wss4j/stax/validate/JAASUsernameTokenValidatorImpl.java | 1 +
.../main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java | 1 +
.../java/org/apache/wss4j/stax/validate/SamlTokenValidatorImpl.java | 1 +
.../org/apache/wss4j/stax/validate/SecurityContextTokenValidator.java | 1 +
.../apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java | 1 +
.../main/java/org/apache/wss4j/stax/validate/TimestampValidator.java | 1 +
.../java/org/apache/wss4j/stax/validate/TimestampValidatorImpl.java | 1 +
.../java/org/apache/wss4j/stax/validate/UsernameTokenValidator.java | 1 +
.../java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java | 1 +
.../test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java | 2 +-
18 files changed, 18 insertions(+), 7 deletions(-)
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/TokenContext.java
b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/validate/TokenContext.java
similarity index 97%
rename from
ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/TokenContext.java
rename to
ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/validate/TokenContext.java
index 1ea2ad636..918cac2b9 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/TokenContext.java
+++
b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/validate/TokenContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.wss4j.stax.validate;
+package org.apache.wss4j.api.stax.validate;
import org.apache.wss4j.api.stax.ext.WSInboundSecurityContext;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java
index 63f86eaf0..dac376826 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java
@@ -34,9 +34,9 @@ import
org.apache.wss4j.api.stax.securityEvent.KerberosTokenSecurityEvent;
import org.apache.wss4j.api.stax.securityEvent.X509TokenSecurityEvent;
import org.apache.wss4j.api.stax.securityToken.KerberosServiceSecurityToken;
import org.apache.wss4j.api.stax.securityToken.X509SecurityToken;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.stax.validate.BinarySecurityTokenValidator;
import org.apache.wss4j.stax.validate.BinarySecurityTokenValidatorImpl;
-import org.apache.wss4j.stax.validate.TokenContext;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractInputSecurityHeaderHandler;
import org.apache.xml.security.stax.ext.InputProcessorChain;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
index 0875a9151..9d29f811d 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
@@ -53,10 +53,10 @@ import
org.apache.wss4j.api.stax.securityEvent.SignedPartSecurityEvent;
import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants;
import org.apache.wss4j.api.stax.securityToken.SamlSecurityToken;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.api.stax.utils.WSSUtils;
import org.apache.wss4j.stax.validate.SamlTokenValidator;
import org.apache.wss4j.stax.validate.SamlTokenValidatorImpl;
-import org.apache.wss4j.stax.validate.TokenContext;
import org.apache.xml.security.binding.xmldsig.KeyInfoType;
import org.apache.xml.security.binding.xmldsig.KeyValueType;
import org.apache.xml.security.binding.xmldsig.X509DataType;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityContextTokenInputHandler.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityContextTokenInputHandler.java
index 22d5e742d..3aed31ccf 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityContextTokenInputHandler.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityContextTokenInputHandler.java
@@ -23,9 +23,9 @@ import org.apache.wss4j.api.stax.ext.WSInboundSecurityContext;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
import
org.apache.wss4j.api.stax.securityEvent.SecurityContextTokenSecurityEvent;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.stax.validate.SecurityContextTokenValidator;
import org.apache.wss4j.stax.validate.SecurityContextTokenValidatorImpl;
-import org.apache.wss4j.stax.validate.TokenContext;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/TimestampInputHandler.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/TimestampInputHandler.java
index b0b2dcc80..f18ed9948 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/TimestampInputHandler.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/TimestampInputHandler.java
@@ -25,9 +25,9 @@ import org.apache.wss4j.api.stax.ext.WSInboundSecurityContext;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.api.stax.securityEvent.TimestampSecurityEvent;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.stax.validate.TimestampValidator;
import org.apache.wss4j.stax.validate.TimestampValidatorImpl;
-import org.apache.wss4j.stax.validate.TokenContext;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractInputSecurityHeaderHandler;
import org.apache.xml.security.stax.ext.InputProcessorChain;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java
index 3f47e11b3..96d50e50f 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java
@@ -31,7 +31,7 @@ import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.api.stax.securityToken.UsernameSecurityToken;
import org.apache.wss4j.api.stax.securityEvent.UsernameTokenSecurityEvent;
-import org.apache.wss4j.stax.validate.TokenContext;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.stax.validate.UsernameTokenValidator;
import org.apache.wss4j.stax.validate.UsernameTokenValidatorImpl;
import org.apache.xml.security.exceptions.XMLSecurityException;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/BinarySecurityTokenValidator.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/BinarySecurityTokenValidator.java
index c2c742474..ce8718f21 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/BinarySecurityTokenValidator.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/BinarySecurityTokenValidator.java
@@ -18,6 +18,7 @@
*/
package org.apache.wss4j.stax.validate;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.api.stax.validate.Validator;
import org.apache.wss4j.binding.wss10.BinarySecurityTokenType;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/BinarySecurityTokenValidatorImpl.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/BinarySecurityTokenValidatorImpl.java
index 2a54562df..1920e3f24 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/BinarySecurityTokenValidatorImpl.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/BinarySecurityTokenValidatorImpl.java
@@ -31,6 +31,7 @@ import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.stax.impl.securityToken.X509V3SecurityTokenImpl;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import
org.apache.wss4j.stax.impl.securityToken.KerberosServiceSecurityTokenImpl;
import org.apache.wss4j.stax.impl.securityToken.X509PKIPathv1SecurityTokenImpl;
import org.apache.xml.security.binding.xop.Include;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/JAASUsernameTokenValidatorImpl.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/JAASUsernameTokenValidatorImpl.java
index fdef6a246..17c5147de 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/JAASUsernameTokenValidatorImpl.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/JAASUsernameTokenValidatorImpl.java
@@ -32,6 +32,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.securityToken.UsernameSecurityToken;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.stax.impl.securityToken.UsernameSecurityTokenImpl;
import org.apache.xml.security.stax.ext.XMLSecurityUtils;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java
index 65891dce3..382abf133 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidator.java
@@ -21,6 +21,7 @@ package org.apache.wss4j.stax.validate;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.api.stax.securityToken.SamlSecurityToken;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.api.stax.validate.Validator;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidatorImpl.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidatorImpl.java
index af2f939bf..d71695abb 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidatorImpl.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SamlTokenValidatorImpl.java
@@ -31,6 +31,7 @@ import org.apache.wss4j.dom.saml.builder.SAML2Constants;
import org.apache.wss4j.api.stax.securityToken.SamlSecurityToken;
import org.apache.wss4j.stax.impl.securityToken.SamlSecurityTokenImpl;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.opensaml.saml.common.SAMLVersion;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidator.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidator.java
index c571f7bbb..402a4a970 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidator.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidator.java
@@ -18,6 +18,7 @@
*/
package org.apache.wss4j.stax.validate;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.api.stax.validate.Validator;
import org.apache.wss4j.binding.wssc.AbstractSecurityContextTokenType;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java
index 1bd9f04e3..a7773db40 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java
@@ -23,6 +23,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
import org.apache.wss4j.api.stax.utils.WSSUtils;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.xml.security.algorithms.JCEMapper;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/TimestampValidator.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/TimestampValidator.java
index 81869f407..9116ad260 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/TimestampValidator.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/TimestampValidator.java
@@ -18,6 +18,7 @@
*/
package org.apache.wss4j.stax.validate;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.api.stax.validate.Validator;
import org.apache.wss4j.binding.wsu10.TimestampType;
import org.apache.wss4j.common.ext.WSSecurityException;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/TimestampValidatorImpl.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/TimestampValidatorImpl.java
index e3bdabf62..0a9c271cb 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/TimestampValidatorImpl.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/TimestampValidatorImpl.java
@@ -22,6 +22,7 @@ import java.time.Instant;
import java.time.ZonedDateTime;
import java.time.format.DateTimeParseException;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.binding.wsu10.TimestampType;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.DateUtil;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidator.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidator.java
index 1f0d5a6d4..462e6dbcc 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidator.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidator.java
@@ -21,6 +21,7 @@ package org.apache.wss4j.stax.validate;
import org.apache.wss4j.binding.wss10.UsernameTokenType;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.stax.securityToken.UsernameSecurityToken;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.api.stax.validate.Validator;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java
index 244cc1c04..e350d9359 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java
@@ -33,6 +33,7 @@ import org.apache.wss4j.api.stax.ext.WSSConstants;
import org.apache.wss4j.api.stax.securityToken.UsernameSecurityToken;
import org.apache.wss4j.api.stax.securityToken.WSSecurityTokenConstants;
import org.apache.wss4j.api.stax.utils.WSSUtils;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.stax.impl.securityToken.UsernameSecurityTokenImpl;
import org.apache.xml.security.stax.ext.XMLSecurityUtils;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
diff --git
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
index dc06e901b..739d82327 100644
---
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
+++
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
@@ -53,6 +53,7 @@ import
org.apache.wss4j.api.stax.securityEvent.EncryptedPartSecurityEvent;
import org.apache.wss4j.api.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.api.stax.securityEvent.SignedPartSecurityEvent;
import org.apache.wss4j.api.stax.securityEvent.WSSecurityEventConstants;
+import org.apache.wss4j.api.stax.validate.TokenContext;
import org.apache.wss4j.stax.setup.InboundWSSec;
import org.apache.wss4j.stax.setup.OutboundWSSec;
import org.apache.wss4j.stax.setup.WSSec;
@@ -61,7 +62,6 @@ import org.apache.wss4j.stax.test.utils.StAX2DOM;
import org.apache.wss4j.stax.test.utils.XmlReaderToWriter;
import org.apache.wss4j.stax.validate.SecurityContextTokenValidator;
import org.apache.wss4j.stax.validate.SecurityContextTokenValidatorImpl;
-import org.apache.wss4j.stax.validate.TokenContext;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent;
