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 808036c33 Removing SAML from the API StAX module
808036c33 is described below
commit 808036c3336cad22ef28201dc069f1e51ed27d38
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Wed Jul 16 12:27:05 2025 +0100
Removing SAML from the API StAX module
---
ws-security-api-stax/pom.xml | 7 -------
.../wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java | 5 ++---
.../org/apache/wss4j/api/stax/securityToken/SamlSecurityToken.java | 4 +---
.../policy/stax/assertionStates/IssuedTokenAssertionState.java | 5 +++--
.../wss4j/policy/stax/assertionStates/SamlTokenAssertionState.java | 2 +-
.../wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java | 2 +-
6 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/ws-security-api-stax/pom.xml b/ws-security-api-stax/pom.xml
index 7c23fe701..c24e8b234 100644
--- a/ws-security-api-stax/pom.xml
+++ b/ws-security-api-stax/pom.xml
@@ -41,13 +41,6 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
- <!-- TODO remove -->
- <dependency>
- <groupId>org.apache.wss4j</groupId>
- <artifactId>wss4j-ws-security-dom-saml</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git
a/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java
b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java
index e6c6f8985..ab851df2e 100644
---
a/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java
+++
b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityEvent/SamlTokenSecurityEvent.java
@@ -19,7 +19,6 @@
package org.apache.wss4j.api.stax.securityEvent;
import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.api.stax.securityToken.SamlSecurityToken;
public class SamlTokenSecurityEvent extends
IssuedTokenSecurityEvent<SamlSecurityToken> {
@@ -33,7 +32,7 @@ public class SamlTokenSecurityEvent extends
IssuedTokenSecurityEvent<SamlSecurit
return getSecurityToken().getIssuerName();
}
- public SamlAssertionWrapper getSamlAssertionWrapper() throws
WSSecurityException {
- return getSecurityToken().getSamlAssertionWrapper();
+ public Object getSamlAssertion() throws WSSecurityException {
+ return getSecurityToken().getSamlAssertion();
}
}
diff --git
a/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityToken/SamlSecurityToken.java
b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityToken/SamlSecurityToken.java
index 2e040bf90..ba3f0ef02 100644
---
a/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityToken/SamlSecurityToken.java
+++
b/ws-security-api-stax/src/main/java/org/apache/wss4j/api/stax/securityToken/SamlSecurityToken.java
@@ -18,11 +18,9 @@
*/
package org.apache.wss4j.api.stax.securityToken;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
-
public interface SamlSecurityToken extends SubjectAndPrincipalSecurityToken {
- SamlAssertionWrapper getSamlAssertionWrapper();
+ Object getSamlAssertion();
String getIssuerName();
}
diff --git
a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java
b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java
index d27cdd4e5..a0c7f850d 100644
---
a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java
+++
b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java
@@ -140,7 +140,7 @@ public class IssuedTokenAssertionState extends
TokenAssertionState {
}
if ("TokenType".equals(child.getLocalName())) {
String content = child.getTextContent();
- final SAMLVersion samlVersion =
samlTokenSecurityEvent.getSamlAssertionWrapper().getSamlVersion();
+ final SAMLVersion samlVersion =
((SamlAssertionWrapper)samlTokenSecurityEvent.getSamlAssertion()).getSamlVersion();
if (WSSConstants.NS_SAML11_TOKEN_PROFILE_TYPE.equals(content)
&& samlVersion != SAMLVersion.VERSION_11) {
return "Policy enforces SAML V1.1 token but got " +
samlVersion.toString();
@@ -216,7 +216,8 @@ public class IssuedTokenAssertionState extends
TokenAssertionState {
String claimTypeOptional = claimType.getAttributeNS(null,
"Optional");
if (claimTypeOptional.length() == 0 ||
!Boolean.parseBoolean(claimTypeOptional)) {
- String errorMsg =
findClaimInAssertion(samlTokenSecurityEvent.getSamlAssertionWrapper(),
URI.create(claimTypeUri));
+ String errorMsg =
findClaimInAssertion((SamlAssertionWrapper)samlTokenSecurityEvent.getSamlAssertion(),
+ URI.create(claimTypeUri));
if (errorMsg != null) {
return errorMsg;
}
diff --git
a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SamlTokenAssertionState.java
b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SamlTokenAssertionState.java
index 21f9ccf7e..d0f259760 100644
---
a/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SamlTokenAssertionState.java
+++
b/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SamlTokenAssertionState.java
@@ -96,7 +96,7 @@ public class SamlTokenAssertionState extends
TokenAssertionState {
}
}
if (samlToken.getSamlTokenType() != null) {
- final SamlAssertionWrapper samlAssertionWrapper =
samlTokenSecurityEvent.getSamlAssertionWrapper();
+ final SamlAssertionWrapper samlAssertionWrapper =
(SamlAssertionWrapper)samlTokenSecurityEvent.getSamlAssertion();
switch (samlToken.getSamlTokenType()) {
case WssSamlV11Token10:
if (samlAssertionWrapper.getSamlVersion() !=
SAMLVersion.VERSION_11) {
diff --git
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
index ed57e8a93..23882910b 100644
---
a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
+++
b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
@@ -258,7 +258,7 @@ public class SamlSecurityTokenImpl extends
AbstractInboundSecurityToken implemen
}
@Override
- public SamlAssertionWrapper getSamlAssertionWrapper() {
+ public Object getSamlAssertion() {
return samlAssertionWrapper;
}
