Repository: cxf-fediz Updated Branches: refs/heads/master be7780ffe -> 909cbb950
Update to CXF 3.1.4 Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/909cbb95 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/909cbb95 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/909cbb95 Branch: refs/heads/master Commit: 909cbb950fddba8d071477d903cc17147c9c94c0 Parents: be7780f Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Nov 4 10:42:46 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Nov 4 10:42:46 2015 +0000 ---------------------------------------------------------------------- .../cxf/fediz/core/processor/FederationProcessorImpl.java | 9 ++++----- .../org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java | 2 +- .../fediz/core/samlsso/SAMLProtocolResponseValidator.java | 2 +- pom.xml | 4 ++-- .../service/idp/kerberos/PassThroughKerberosClient.java | 2 +- .../apache/cxf/fediz/samlsso/example/BasicAuthFilter.java | 2 +- .../org/apache/cxf/fediz/integrationtests/KerberosTest.java | 2 +- .../cxf/fediz/integrationtests/AbstractClientCertTests.java | 2 +- .../apache/cxf/fediz/integrationtests/AbstractTests.java | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/909cbb95/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java ---------------------------------------------------------------------- diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java index 25f715e..14f7189 100644 --- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java +++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java @@ -64,9 +64,8 @@ import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSDataRef; import org.apache.wss4j.dom.WSDocInfo; -import org.apache.wss4j.dom.WSSConfig; -import org.apache.wss4j.dom.WSSecurityEngine; -import org.apache.wss4j.dom.WSSecurityEngineResult; +import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.dom.engine.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.processor.EncryptedDataProcessor; import org.apache.wss4j.dom.processor.Processor; @@ -267,8 +266,8 @@ public class FederationProcessorImpl extends AbstractFedizProcessor { // Disable WSS4J processing of the (decrypted) SAML Token WSSConfig wssConfig = WSSConfig.getNewInstance(); - wssConfig.setProcessor(WSSecurityEngine.SAML_TOKEN, new NOOpProcessor()); - wssConfig.setProcessor(WSSecurityEngine.SAML2_TOKEN, new NOOpProcessor()); + wssConfig.setProcessor(WSConstants.SAML_TOKEN, new NOOpProcessor()); + wssConfig.setProcessor(WSConstants.SAML2_TOKEN, new NOOpProcessor()); data.setWssConfig(wssConfig); data.setDecCrypto(decryptionKeyManager.getCrypto()); http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/909cbb95/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java ---------------------------------------------------------------------- diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java index 0992105..4e07e76 100644 --- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java +++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/saml/SAMLTokenValidator.java @@ -51,7 +51,7 @@ import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSDocInfo; -import org.apache.wss4j.dom.WSSConfig; +import org.apache.wss4j.dom.engine.WSSConfig; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor; import org.apache.wss4j.dom.validate.Credential; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/909cbb95/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java ---------------------------------------------------------------------- diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java index 20d6550..d25ab1d 100644 --- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java +++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/samlsso/SAMLProtocolResponseValidator.java @@ -33,7 +33,7 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SAMLUtil; import org.apache.wss4j.dom.WSDocInfo; -import org.apache.wss4j.dom.WSSConfig; +import org.apache.wss4j.dom.engine.WSSConfig; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.saml.WSSSAMLKeyInfoProcessor; import org.apache.wss4j.dom.validate.Credential; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/909cbb95/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a6244f4..24df33f 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ <apacheds.version>2.0.0-M20</apacheds.version> <commons.lang.version>3.4</commons.lang.version> <commons.logging.version>1.2</commons.logging.version> - <cxf.version>3.1.3</cxf.version> + <cxf.version>3.1.4</cxf.version> <cxf.build-utils.version>3.1.0</cxf.build-utils.version> <easymock.version>3.3</easymock.version> <ecj.version>4.4.2</ecj.version> @@ -65,7 +65,7 @@ <spring.security.version>3.1.7.RELEASE</spring.security.version> <tomcat7.version>7.0.64</tomcat7.version> <tomcat8.version>8.0.26</tomcat8.version> - <wss4j.version>2.1.2</wss4j.version> + <wss4j.version>2.1.4</wss4j.version> <xalan.version>2.7.2</xalan.version> <tomcat.url>http://localhost:8080/manager/text</tomcat.url> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/909cbb95/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/PassThroughKerberosClient.java ---------------------------------------------------------------------- diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/PassThroughKerberosClient.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/PassThroughKerberosClient.java index f97ae50..da665a9 100644 --- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/PassThroughKerberosClient.java +++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/kerberos/PassThroughKerberosClient.java @@ -24,7 +24,7 @@ import org.apache.cxf.ws.security.kerberos.KerberosClient; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSSConfig; +import org.apache.wss4j.dom.engine.WSSConfig; import org.apache.wss4j.dom.message.token.KerberosSecurity; import org.apache.xml.security.utils.Base64; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/909cbb95/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/BasicAuthFilter.java ---------------------------------------------------------------------- diff --git a/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/BasicAuthFilter.java b/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/BasicAuthFilter.java index 29cf4df..9007ab6 100644 --- a/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/BasicAuthFilter.java +++ b/systests/federation/samlIdpWebapp/src/main/java/org/apache/cxf/fediz/samlsso/example/BasicAuthFilter.java @@ -34,7 +34,7 @@ import org.apache.cxf.message.Message; import org.apache.cxf.security.SecurityContext; import org.apache.wss4j.common.principal.WSUsernameTokenPrincipalImpl; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSSConfig; +import org.apache.wss4j.dom.engine.WSSConfig; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.message.token.UsernameToken; import org.apache.wss4j.dom.validate.Credential; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/909cbb95/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java index 5d21b18..cd26623 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java @@ -50,7 +50,7 @@ import org.apache.directory.server.core.annotations.CreatePartition; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor; -import org.apache.wss4j.dom.WSSConfig; +import org.apache.wss4j.dom.engine.WSSConfig; import org.apache.xml.security.utils.Base64; import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSException; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/909cbb95/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java ---------------------------------------------------------------------- diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java index a1de1f6..9c4982c 100644 --- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java +++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java @@ -35,7 +35,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; import com.gargoylesoftware.htmlunit.util.NameValuePair; import org.apache.cxf.fediz.core.ClaimTypes; -import org.apache.wss4j.dom.WSSConfig; +import org.apache.wss4j.dom.engine.WSSConfig; import org.junit.Assert; public abstract class AbstractClientCertTests { http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/909cbb95/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java ---------------------------------------------------------------------- diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java index a9d6312..6c56ea3 100644 --- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java +++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java @@ -38,7 +38,7 @@ import org.apache.cxf.fediz.core.FederationConstants; import org.apache.cxf.fediz.core.util.DOMUtils; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.wss4j.dom.WSSConfig; +import org.apache.wss4j.dom.engine.WSSConfig; import org.apache.xml.security.keys.KeyInfo; import org.apache.xml.security.signature.XMLSignature; import org.junit.Assert;
