This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 0cff320bb0 Updating to WSS4J 4.0.0 (#1476)
0cff320bb0 is described below
commit 0cff320bb0bd4a50624a266b07247f2f35d0400a
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Fri Feb 14 13:38:32 2025 +0000
Updating to WSS4J 4.0.0 (#1476)
---
parent/pom.xml | 2 +-
.../apache/cxf/rs/security/oauth2/saml/SamlOAuthValidator.java | 2 +-
.../apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java | 2 +-
.../cxf/rs/security/saml/sso/SamlpRequestComponentBuilder.java | 2 +-
.../cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java | 8 ++++++--
.../cxf/rt/security/saml/xacml2/DefaultXACMLRequestBuilder.java | 2 +-
.../cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java | 2 +-
.../apache/cxf/sts/token/delegation/SAMLDelegationHandler.java | 4 ++--
.../java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java | 4 ++--
9 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8595336f83..a737a934d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -234,7 +234,7 @@
<cxf.woodstox.core.version>7.1.0</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>4.2.1</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
- <cxf.jakarta.wss4j.version>3.0.4</cxf.jakarta.wss4j.version>
+ <cxf.jakarta.wss4j.version>4.0.0</cxf.jakarta.wss4j.version>
<cxf.xmlschema.version>2.3.1</cxf.xmlschema.version>
<cxf.xnio.version>3.8.16.Final</cxf.xnio.version>
<cxf.zest.version>2.1</cxf.zest.version>
diff --git
a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/saml/SamlOAuthValidator.java
b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/saml/SamlOAuthValidator.java
index 9da501b2d0..27ccf9ebfb 100644
---
a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/saml/SamlOAuthValidator.java
+++
b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/saml/SamlOAuthValidator.java
@@ -98,7 +98,7 @@ public class SamlOAuthValidator {
for (AudienceRestriction ar : restrictions) {
List<Audience> audiences = ar.getAudiences();
for (Audience a : audiences) {
- if (absoluteAddress.equals(a.getAudienceURI())) {
+ if (absoluteAddress.equals(a.getURI())) {
return;
}
}
diff --git
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
index dbc9b32d04..85c0e0ede9 100644
---
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
+++
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
@@ -295,7 +295,7 @@ public class SAMLSSOResponseValidator {
if (audienceRestriction.getAudiences() != null) {
boolean matchFound = false;
for (org.opensaml.saml.saml2.core.Audience audience :
audienceRestriction.getAudiences()) {
- if (appliesTo.equals(audience.getAudienceURI())) {
+ if (appliesTo.equals(audience.getURI())) {
matchFound = true;
oneMatchFound = true;
break;
diff --git
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlpRequestComponentBuilder.java
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlpRequestComponentBuilder.java
index 415aedb3be..9e9bbad53d 100644
---
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlpRequestComponentBuilder.java
+++
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlpRequestComponentBuilder.java
@@ -192,7 +192,7 @@ public final class SamlpRequestComponentBuilder {
builderFactory.getBuilder(AuthnContextClassRef.DEFAULT_ELEMENT_NAME);
}
AuthnContextClassRef authnCtxClassRef =
requestedAuthnCtxClassRefBuilder.buildObject();
- authnCtxClassRef.setAuthnContextClassRef(authnCtxClassRefValue);
+ authnCtxClassRef.setURI(authnCtxClassRefValue);
return authnCtxClassRef;
}
diff --git
a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
index 52e90f32dd..1b4bb80b52 100644
---
a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
+++
b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
@@ -286,7 +286,9 @@ public class SAMLResponseValidatorTest {
DOMUtils.findAllElementsByTagNameNS(policyElement,
SAMLConstants.SAML20_NS, "Assertion");
assertNotNull(assertions);
assertTrue(assertions.size() == 1);
- assertions.get(0).setAttributeNS(null, "newattr", "http://apache.org";);
+ Thread.sleep(1000L);
+ Instant issueInstant = Instant.now();
+ assertions.get(0).setAttributeNS(null, "IssueInstant",
issueInstant.toString());
Response marshalledResponse =
(Response)OpenSAMLUtil.fromDom(policyElement);
@@ -395,7 +397,9 @@ public class SAMLResponseValidatorTest {
doc.appendChild(policyElement);
assertNotNull(policyElement);
- policyElement.setAttributeNS(null, "newattr", "http://apache.org";);
+ Thread.sleep(1000L);
+ Instant issueInstant = Instant.now();
+ policyElement.setAttributeNS(null, "IssueInstant",
issueInstant.toString());
Response marshalledResponse =
(Response)OpenSAMLUtil.fromDom(policyElement);
diff --git
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/DefaultXACMLRequestBuilder.java
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/DefaultXACMLRequestBuilder.java
index bf03f55c79..75a345ec10 100644
---
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/DefaultXACMLRequestBuilder.java
+++
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/xacml2/DefaultXACMLRequestBuilder.java
@@ -27,7 +27,7 @@ import java.util.List;
import javax.xml.namespace.QName;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
+import net.shibboleth.shared.xml.DOMTypeSupport;
import org.apache.cxf.message.Message;
import org.apache.cxf.rt.security.saml.xacml.CXFMessageParser;
import org.apache.cxf.rt.security.saml.xacml.XACMLConstants;
diff --git
a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java
b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java
index de3f660ad1..3c10018100 100644
---
a/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java
+++
b/rt/security-saml/src/test/java/org/apache/cxf/rt/security/saml/xacml2/RequestComponentBuilderTest.java
@@ -31,7 +31,7 @@ import javax.xml.parsers.ParserConfigurationException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
+import net.shibboleth.shared.xml.DOMTypeSupport;
import org.apache.cxf.rt.security.saml.xacml.XACMLConstants;
import org.apache.wss4j.common.saml.OpenSAMLUtil;
import org.opensaml.xacml.ctx.ActionType;
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java
index 796b3013b0..d377361389 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java
@@ -124,14 +124,14 @@ public class SAMLDelegationHandler implements
TokenDelegationHandler {
for (AudienceRestrictionCondition restriction
:
assertion.getSaml1().getConditions().getAudienceRestrictionConditions()) {
for (org.opensaml.saml.saml1.core.Audience audience :
restriction.getAudiences()) {
- addresses.add(audience.getUri());
+ addresses.add(audience.getURI());
}
}
} else if (assertion.getSaml2() != null) {
for (org.opensaml.saml.saml2.core.AudienceRestriction restriction
:
assertion.getSaml2().getConditions().getAudienceRestrictions()) {
for (org.opensaml.saml.saml2.core.Audience audience :
restriction.getAudiences()) {
- addresses.add(audience.getAudienceURI());
+ addresses.add(audience.getURI());
}
}
}
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
index 7a7d740f1c..d7d0d3cdfa 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
@@ -390,7 +390,7 @@ public class SAMLTokenRenewer extends
AbstractSAMLTokenProvider implements Token
for (AudienceRestrictionCondition restrCondition :
restrConditions) {
if (restrCondition.getAudiences() != null) {
for (Audience audience : restrCondition.getAudiences()) {
- if (appliesTo.equals(audience.getUri())) {
+ if (appliesTo.equals(audience.getURI())) {
return true;
}
}
@@ -409,7 +409,7 @@ public class SAMLTokenRenewer extends
AbstractSAMLTokenProvider implements Token
for (AudienceRestriction audienceRestriction :
audienceRestrictions) {
if (audienceRestriction.getAudiences() != null) {
for (org.opensaml.saml.saml2.core.Audience audience :
audienceRestriction.getAudiences()) {
- if (appliesTo.equals(audience.getAudienceURI())) {
+ if (appliesTo.equals(audience.getURI())) {
return true;
}
}
