Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/24c140d8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/24c140d8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/24c140d8 Branch: refs/heads/2.7.x-fixes Commit: 24c140d81ce29bb2237636883619d677b9698e34 Parents: 60e2a98 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Aug 6 15:32:24 2014 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed Aug 6 15:32:24 2014 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 +- .../cxf/ws/security/SecurityConstants.java | 6 --- .../ws/security/kerberos/KerberosClient.java | 8 +--- .../ws/security/wss4j/WSS4JInInterceptor.java | 7 ---- .../kerberos/KerberosDelegationTokenTest.java | 2 - .../systest/sts/kerberos/KerberosTokenTest.java | 4 -- .../systest/sts/kerberos/cxf-intermediary.xml | 2 +- .../cxf/systest/sts/kerberos/cxf-service.xml | 40 +------------------- 8 files changed, 4 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/24c140d8/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 5df66f8..a5f00fd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -156,7 +156,7 @@ <cxf.woodstox.core.version>4.4.0</cxf.woodstox.core.version> <cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version> <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version> - <cxf.wss4j.version>1.6.16</cxf.wss4j.version> + <cxf.wss4j.version>1.6.17-SNAPSHOT</cxf.wss4j.version> <cxf.xerces.version>2.11.0</cxf.xerces.version> <cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version> <cxf.xmlschema.version>2.1.0</cxf.xmlschema.version> http://git-wip-us.apache.org/repos/asf/cxf/blob/24c140d8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java index 4ab0e50..adc932d 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java @@ -563,15 +563,9 @@ public final class SecurityConstants { DISABLE_STS_CLIENT_WSMEX_CALL_USING_EPR_ADDRESS, STS_TOKEN_CRYPTO, STS_TOKEN_PROPERTIES, STS_TOKEN_USERNAME, STS_TOKEN_ACT_AS, STS_TOKEN_ON_BEHALF_OF, TOKEN, TOKEN_ID, SUBJECT_ROLE_CLASSIFIER, SUBJECT_ROLE_CLASSIFIER_TYPE, MUST_UNDERSTAND, -<<<<<<< HEAD ASYMMETRIC_SIGNATURE_ALGORITHM, ENABLE_SAML_ONE_TIME_USE_CACHE, SAML_ONE_TIME_USE_CACHE_INSTANCE, - CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT, PREFER_WSMEX_OVER_STS_CLIENT_CONFIG -======= - ASYMMETRIC_SIGNATURE_ALGORITHM, PASSWORD_ENCRYPTOR_INSTANCE, ENABLE_SAML_ONE_TIME_USE_CACHE, - SAML_ONE_TIME_USE_CACHE_INSTANCE, ENABLE_STREAMING_SECURITY, RETURN_SECURITY_ERROR, CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT, PREFER_WSMEX_OVER_STS_CLIENT_CONFIG, DELEGATED_CREDENTIAL ->>>>>>> 6e6c139... Adding support for WS-Security kerberos credential delegation + a system test })); ALL_PROPERTIES = Collections.unmodifiableSet(s); } http://git-wip-us.apache.org/repos/asf/cxf/blob/24c140d8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java index cc54a10..207c55b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java @@ -33,18 +33,12 @@ import org.apache.cxf.message.Message; import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.tokenstore.SecurityToken; -<<<<<<< HEAD + import org.apache.ws.security.WSSConfig; import org.apache.ws.security.message.token.KerberosSecurity; import org.apache.ws.security.util.Base64; import org.apache.ws.security.util.WSSecurityUtil; -======= -import org.apache.wss4j.dom.WSSConfig; -import org.apache.wss4j.dom.message.token.KerberosSecurity; -import org.apache.wss4j.dom.util.WSSecurityUtil; -import org.apache.xml.security.utils.Base64; import org.ietf.jgss.GSSCredential; ->>>>>>> 6e6c139... Adding support for WS-Security kerberos credential delegation + a system test /** * A class that obtains a ticket from a KDC and wraps it in a SecurityToken object. http://git-wip-us.apache.org/repos/asf/cxf/blob/24c140d8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java index 9d7cf6e..fb22431 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java @@ -554,18 +554,11 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor { if (!utWithCallbacks) { WSS4JTokenConverter.convertToken(msg, p); } -<<<<<<< HEAD Object receivedAssertion = null; -======= - Object receivedAssertion = o.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); - if (receivedAssertion == null) { - receivedAssertion = o.get(WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN); - } if (o.get(WSSecurityEngineResult.TAG_DELEGATION_CREDENTIAL) != null) { msg.put(SecurityConstants.DELEGATED_CREDENTIAL, o.get(WSSecurityEngineResult.TAG_DELEGATION_CREDENTIAL)); } ->>>>>>> 6e6c139... Adding support for WS-Security kerberos credential delegation + a system test List<String> roles = null; if (o.get(WSSecurityEngineResult.TAG_SAML_ASSERTION) != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/24c140d8/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java index 17c33a0..e4c2ff5 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosDelegationTokenTest.java @@ -98,8 +98,6 @@ public class KerberosDelegationTokenTest extends AbstractBusClientServerTestBase service.getPort(portQName, DoubleItPortType.class); updateAddressPort(transportSaml2Port, INTERMEDIARY_PORT); - TokenTestUtils.updateSTSPort((BindingProvider)transportSaml2Port, STSPORT); - doubleIt(transportSaml2Port, 25); ((java.io.Closeable)transportSaml2Port).close(); http://git-wip-us.apache.org/repos/asf/cxf/blob/24c140d8/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java index e8a8498..662dacf 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/kerberos/KerberosTokenTest.java @@ -42,11 +42,7 @@ import org.junit.BeforeClass; * user principal "alice" (keytab in "/etc/alice.keytab"), and host service "b...@service.ws.apache.org" * (keytab in "/etc/bob.keytab"). */ -<<<<<<< HEAD -======= -@RunWith(value = org.junit.runners.Parameterized.class) @org.junit.Ignore ->>>>>>> 6e6c139... Adding support for WS-Security kerberos credential delegation + a system test public class KerberosTokenTest extends AbstractBusClientServerTestBase { static final String STSPORT = allocatePort(STSServer.class); http://git-wip-us.apache.org/repos/asf/cxf/blob/24c140d8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml index 0398a7e..fbfc7b8 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml @@ -25,7 +25,7 @@ </cxf:features> </cxf:bus> - <bean id="kerberosValidator" class="org.apache.wss4j.dom.validate.KerberosTokenValidator"> + <bean id="kerberosValidator" class="org.apache.ws.security.validate.KerberosTokenValidator"> <property name="contextName" value="bob"/> <property name="serviceName" value="b...@service.ws.apache.org"/> </bean> http://git-wip-us.apache.org/repos/asf/cxf/blob/24c140d8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml index 717f772..952a921 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml @@ -44,44 +44,7 @@ <cxf:logging/> </cxf:features> </cxf:bus> -<<<<<<< HEAD - - <jaxws:endpoint id="doubleittransportsaml2" - implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" - endpointName="s:DoubleItTransportSAML2Port" - serviceName="s:DoubleItService" - depends-on="ClientAuthHttpsSettings" - address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2"; - wsdlLocation="org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl" - xmlns:s="http://www.example.org/contract/DoubleIt";> - - <jaxws:properties> - <entry key="ws-security.callback-handler" - value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> - </jaxws:properties> - </jaxws:endpoint> - - <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> - <httpj:engine port="${testutil.ports.Server}"> - <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> - <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/> - </sec:keyManagers> - <sec:cipherSuitesFilter> - <sec:include>.*_EXPORT_.*</sec:include> - <sec:include>.*_EXPORT1024_.*</sec:include> - <sec:include>.*_WITH_DES_.*</sec:include> - <sec:include>.*_WITH_AES_.*</sec:include> - <sec:include>.*_WITH_NULL_.*</sec:include> - <sec:exclude>.*_DH_anon_.*</sec:exclude> - </sec:cipherSuitesFilter> - <sec:clientAuthentication want="false" required="false"/> - </httpj:tlsServerParameters> - </httpj:engine> - </httpj:engine-factory> - -======= + <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.kerberos.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2"; wsdlLocation="org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> @@ -106,6 +69,5 @@ </httpj:tlsServerParameters> </httpj:engine> </httpj:engine-factory> ->>>>>>> 6e6c139... Adding support for WS-Security kerberos credential delegation + a system test </beans>
