Repository: cxf Updated Branches: refs/heads/master e03c1d9c2 -> a8e21dff6
Add some more STS caching tests Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a8e21dff Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a8e21dff Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a8e21dff Branch: refs/heads/master Commit: a8e21dff62f609ab08ef34ec013e1dcdea2cdc62 Parents: e03c1d9 Author: Colm O hEigeartaigh <[email protected]> Authored: Thu May 22 16:04:32 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu May 22 16:04:50 2014 +0100 ---------------------------------------------------------------------- .../IntermediaryCachingPortTypeImpl.java | 2 +- .../IntermediaryTransformationCachingTest.java | 19 ++++++++++++++++++- .../IntermediaryTransformationTest.java | 3 ++- .../intermediary_transformation/cxf-client.xml | 1 - 4 files changed, 21 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a8e21dff/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java index d9a2a43..a0e36ef 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java @@ -87,7 +87,7 @@ public class IntermediaryCachingPortTypeImpl extends AbstractBusClientServerTest Assert.assertNotNull("Principal must not be null", pr); Assert.assertNotNull("Principal.getName() must not return null", pr.getName()); - Assert.assertTrue("Principal must be alice", pr.getName().contains("alice")); + // Assert.assertTrue("Principal must be alice", pr.getName().contains("alice")); // Disable the STSClient after the first invocation if (i > 0) { http://git-wip-us.apache.org/repos/asf/cxf/blob/a8e21dff/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java index f0c29f1..eb1f8dc 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java @@ -23,6 +23,7 @@ import java.net.URL; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPFaultException; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBusFactory; @@ -30,6 +31,7 @@ import org.apache.cxf.systest.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TokenTestUtils; import org.apache.cxf.systest.sts.deployment.STSServer; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import org.apache.cxf.ws.security.SecurityConstants; import org.example.contract.doubleit.DoubleItPortType; import org.junit.BeforeClass; @@ -100,13 +102,28 @@ public class IntermediaryTransformationCachingTest extends AbstractBusClientServ TokenTestUtils.updateSTSPort((BindingProvider)transportPort, STSPORT); - // Make initial successful invocation + ((BindingProvider)transportPort).getRequestContext().put(SecurityConstants.USERNAME, "alice"); + + // Make initial successful invocation (for "alice") doubleIt(transportPort, 25); // Make another invocation - this should work as the intermediary caches the token // even though its STSClient is disabled after the first invocation doubleIt(transportPort, 30); + transportPort = service.getPort(portQName, DoubleItPortType.class); + updateAddressPort(transportPort, PORT); + TokenTestUtils.updateSTSPort((BindingProvider)transportPort, STSPORT); + + ((BindingProvider)transportPort).getRequestContext().put(SecurityConstants.USERNAME, "bob"); + + // Make invocation for "bob"...this should fail as the intermediary's STS client is disabled + try { + doubleIt(transportPort, 35); + } catch (SOAPFaultException ex) { + // expected + } + ((java.io.Closeable)transportPort).close(); bus.shutdown(true); } http://git-wip-us.apache.org/repos/asf/cxf/blob/a8e21dff/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java index d648381..9102d64 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java @@ -30,7 +30,7 @@ import org.apache.cxf.systest.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TokenTestUtils; import org.apache.cxf.systest.sts.deployment.STSServer; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; - +import org.apache.cxf.ws.security.SecurityConstants; import org.example.contract.doubleit.DoubleItPortType; import org.junit.BeforeClass; @@ -101,6 +101,7 @@ public class IntermediaryTransformationTest extends AbstractBusClientServerTestB TokenTestUtils.updateSTSPort((BindingProvider)transportPort, STSPORT); + ((BindingProvider)transportPort).getRequestContext().put(SecurityConstants.USERNAME, "alice"); doubleIt(transportPort, 25); ((java.io.Closeable)transportPort).close(); http://git-wip-us.apache.org/repos/asf/cxf/blob/a8e21dff/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml index 2c73d6f..8e93a35 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml @@ -36,7 +36,6 @@ <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/> <property name="properties"> <map> - <entry key="ws-security.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
