Switching SAML CallbackHandler
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5d387616 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5d387616 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5d387616 Branch: refs/heads/master Commit: 5d387616bc1787f3ae50dbe2a185c6abb0e9955b Parents: ee64acf Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Apr 17 10:36:19 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Apr 17 10:36:19 2015 +0100 ---------------------------------------------------------------------- .../sts/sendervouches/DoubleItPortTypeImpl.java | 2 +- .../jaxrs/security/oauth2/JAXRSOAuth2Test.java | 2 +- .../saml/JAXRSSamlAuthorizationTest.java | 2 +- .../jaxrs/security/saml/JAXRSSamlTest.java | 2 +- .../cxf/systest/wssec/examples/saml/client.xml | 18 +++--- .../cxf/systest/ws/saml/SamlTokenTest.java | 60 ++++++++++---------- .../saml/subjectconf/SamlSubjectConfTest.java | 18 +++--- 7 files changed, 52 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5d387616/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java index a4dc025..6e37b53 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java @@ -63,7 +63,7 @@ public class DoubleItPortTypeImpl extends AbstractBusClientServerTestBase implem // Saml2CallbackHandler callbackHandler = new Saml2CallbackHandler(wsc.getUserPrincipal()); ((BindingProvider)transportSAML2SupportingPort).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); return transportSAML2SupportingPort.doubleIt(numberToDouble); http://git-wip-us.apache.org/repos/asf/cxf/blob/5d387616/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java index faa787f..2068880 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java @@ -158,7 +158,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { Map<String, Object> properties = new HashMap<String, Object>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); - properties.put("ws-security.saml-callback-handler", + properties.put("security.saml-callback-handler", "org.apache.cxf.systest.jaxrs.security.oauth2.SamlCallbackHandler2"); properties.put("security.signature.username", "alice"); properties.put("ws-security.signature.properties", CRYPTO_RESOURCE_PROPERTIES); http://git-wip-us.apache.org/repos/asf/cxf/blob/5d387616/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java index 1558d58..0ce5f11 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java @@ -154,7 +154,7 @@ public class JAXRSSamlAuthorizationTest extends AbstractBusClientServerTestBase bean.setBus(springBus); Map<String, Object> properties = new HashMap<String, Object>(); - properties.put("ws-security.saml-callback-handler", + properties.put("security.saml-callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.SamlCallbackHandler"); if (extraProperties != null) { properties.putAll(extraProperties); http://git-wip-us.apache.org/repos/asf/cxf/blob/5d387616/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java index 6f88564..c68d552 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java @@ -218,7 +218,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { Map<String, Object> properties = new HashMap<String, Object>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); - properties.put("ws-security.saml-callback-handler", + properties.put("security.saml-callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.SamlCallbackHandler"); properties.put("security.signature.username", "alice"); properties.put("ws-security.signature.properties", http://git-wip-us.apache.org/repos/asf/cxf/blob/5d387616/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml index 1cd6d95..afdc1c9 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml @@ -26,17 +26,17 @@ </cxf:bus> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItBearerPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.saml-callback-handler" value="org.apache.cxf.systest.wssec.examples.saml.SamlCallbackHandler"/> + <entry key="security.saml-callback-handler" value="org.apache.cxf.systest.wssec.examples.saml.SamlCallbackHandler"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTLSSenderVouchesPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.saml-callback-handler" value-ref="saml1SenderVouchesHandler"/> + <entry key="security.saml-callback-handler" value-ref="saml1SenderVouchesHandler"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTLSHOKSignedEndorsingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.saml-callback-handler" value-ref="saml1HOKHandler"/> + <entry key="security.saml-callback-handler" value-ref="saml1HOKHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> @@ -44,7 +44,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSignedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.saml-callback-handler" value-ref="saml1SenderVouchesHandler"/> + <entry key="security.saml-callback-handler" value-ref="saml1SenderVouchesHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> @@ -54,7 +54,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricInitiatorPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.saml-callback-handler" value-ref="saml1HOKHandler"/> + <entry key="security.saml-callback-handler" value-ref="saml1HOKHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> @@ -64,7 +64,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSaml2BearerPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.saml-callback-handler" value-ref="saml2BearerHandler"/> + <entry key="security.saml-callback-handler" value-ref="saml2BearerHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> @@ -74,12 +74,12 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTLSSenderVouchesSaml2Port"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.saml-callback-handler" value-ref="saml2SenderVouchesHandler"/> + <entry key="security.saml-callback-handler" value-ref="saml2SenderVouchesHandler"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTLSHOKSignedEndorsingSaml2Port"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.saml-callback-handler" value-ref="saml2HOKHandler"/> + <entry key="security.saml-callback-handler" value-ref="saml2HOKHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> @@ -87,7 +87,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSVPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.saml-callback-handler" value-ref="saml1SenderVouchesHandler"/> + <entry key="security.saml-callback-handler" value-ref="saml1SenderVouchesHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/5d387616/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java index d5b553f..36bc341 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java @@ -137,7 +137,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { } ((BindingProvider)saml1Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler() + "security.saml-callback-handler", new SamlCallbackHandler() ); try { saml1Port.doubleIt(25); @@ -148,7 +148,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { } ((BindingProvider)saml1Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler(false) + "security.saml-callback-handler", new SamlCallbackHandler(false) ); int result = saml1Port.doubleIt(25); assertTrue(result == 50); @@ -159,7 +159,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { updateAddressPort(saml1Port, PORT2); ((BindingProvider)saml1Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler(false) + "security.saml-callback-handler", new SamlCallbackHandler(false) ); try { @@ -202,7 +202,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { SamlCallbackHandler samlCallbackHandler = new SamlCallbackHandler(false, true); samlCallbackHandler.setConfirmationMethod(SAML1Constants.CONF_BEARER); ((BindingProvider)saml1Port).getRequestContext().put( - "ws-security.saml-callback-handler", samlCallbackHandler + "security.saml-callback-handler", samlCallbackHandler ); int result = saml1Port.doubleIt(25); @@ -241,7 +241,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { SamlCallbackHandler callbackHandler = new SamlCallbackHandler(false, true); callbackHandler.setConfirmationMethod(SAML1Constants.CONF_BEARER); ((BindingProvider)saml1Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); ((BindingProvider)saml1Port).getRequestContext().put( @@ -295,7 +295,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { } ((BindingProvider)saml1Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlElementCallbackHandler(false) + "security.saml-callback-handler", new SamlElementCallbackHandler(false) ); int result = saml1Port.doubleIt(25); assertTrue(result == 50); @@ -333,7 +333,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { } ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler(false) + "security.saml-callback-handler", new SamlCallbackHandler(false) ); try { saml2Port.doubleIt(25); @@ -346,7 +346,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { SamlCallbackHandler samlCallbackHandler = new SamlCallbackHandler(); samlCallbackHandler.setSignAssertion(true); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", samlCallbackHandler + "security.saml-callback-handler", samlCallbackHandler ); int result = saml2Port.doubleIt(25); assertTrue(result == 50); @@ -380,7 +380,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { } ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler() + "security.saml-callback-handler", new SamlCallbackHandler() ); try { @@ -424,7 +424,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { } ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler(false) + "security.saml-callback-handler", new SamlCallbackHandler(false) ); try { saml2Port.doubleIt(25); @@ -435,7 +435,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { } ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler() + "security.saml-callback-handler", new SamlCallbackHandler() ); int result = saml2Port.doubleIt(25); assertTrue(result == 50); @@ -446,7 +446,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { updateAddressPort(saml2Port, PORT); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler() + "security.saml-callback-handler", new SamlCallbackHandler() ); try { @@ -487,7 +487,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { } ((BindingProvider)saml1Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler(false, true) + "security.saml-callback-handler", new SamlCallbackHandler(false, true) ); int result = saml1Port.doubleIt(25); assertTrue(result == 50); @@ -522,7 +522,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { } ((BindingProvider)saml1Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler(false, true) + "security.saml-callback-handler", new SamlCallbackHandler(false, true) ); int result = saml1Port.doubleIt(25); assertTrue(result == 50); @@ -555,7 +555,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, true); callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); int result = saml2Port.doubleIt(25); assertTrue(result == 50); @@ -589,7 +589,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { if (!test.isStreaming() && PORT.equals(test.getPort())) { SamlCallbackHandler samlCallbackHandler = new SamlCallbackHandler(); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", samlCallbackHandler + "security.saml-callback-handler", samlCallbackHandler ); int result = saml2Port.doubleIt(25); assertTrue(result == 50); @@ -627,7 +627,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, true); callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); int result = saml2Port.doubleIt(25); @@ -666,7 +666,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY); callbackHandler.setKeyInfoIdentifier(CERT_IDENTIFIER.KEY_VALUE); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); int result = saml2Port.doubleIt(25); @@ -704,7 +704,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, true); callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); int result = saml2Port.doubleIt(25); @@ -736,7 +736,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { } ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler() + "security.saml-callback-handler", new SamlCallbackHandler() ); int result = saml2Port.doubleIt(25); assertTrue(result == 50); @@ -770,7 +770,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { // TODO Only working for DOM client + server atm if (!test.isStreaming() && PORT.equals(test.getPort())) { ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler() + "security.saml-callback-handler", new SamlCallbackHandler() ); int result = saml2Port.doubleIt(25); assertTrue(result == 50); @@ -804,7 +804,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, true); callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); int result = saml2Port.doubleIt(25); assertTrue(result == 50); @@ -841,7 +841,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, true); callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); int result = saml2Port.doubleIt(25); @@ -920,7 +920,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { roleCallbackHandler.setSignAssertion(true); roleCallbackHandler.setRoleName("manager"); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", roleCallbackHandler + "security.saml-callback-handler", roleCallbackHandler ); int result = saml2Port.doubleIt(25); @@ -962,7 +962,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { // Create a SAML Token with no "OneTimeUse" Condition ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", new SamlCallbackHandler() + "security.saml-callback-handler", new SamlCallbackHandler() ); Client cxfClient = ClientProxy.getClient(saml2Port); @@ -983,7 +983,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { callbackHandler.setConditions(conditions); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); cxfClient.getOutInterceptors().remove(cacheInterceptor); @@ -1037,7 +1037,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { SamlCallbackHandler callbackHandler = new SamlCallbackHandler(); callbackHandler.setConditions(conditions); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); saml2Port.doubleIt(25); @@ -1092,7 +1092,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { SamlCallbackHandler callbackHandler = new SamlCallbackHandler(); callbackHandler.setConditions(conditions); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); saml2Port.doubleIt(25); @@ -1131,7 +1131,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { SamlCallbackHandler callbackHandler = new SamlCallbackHandler(); callbackHandler.setConditions(conditions); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); // It should fail with validation enabled @@ -1148,7 +1148,7 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { updateAddressPort(saml2Port, portNumber); ((BindingProvider)saml2Port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); saml2Port.doubleIt(25); } http://git-wip-us.apache.org/repos/asf/cxf/blob/5d387616/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java index 591345d..fbdfbff 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java @@ -117,7 +117,7 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { callbackHandler.setCryptoPropertiesFile("morpit.properties"); ((BindingProvider)port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); int result = port.doubleIt(25); assertTrue(result == 50); @@ -131,7 +131,7 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { callbackHandler.setCryptoPropertiesFile("morpit.properties"); ((BindingProvider)port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); try { port.doubleIt(25); @@ -165,7 +165,7 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { SamlCallbackHandler callbackHandler = new SamlCallbackHandler(true, true); callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY); ((BindingProvider)port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); try { @@ -205,7 +205,7 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { callbackHandler.setCryptoPropertiesFile("morpit.properties"); ((BindingProvider)port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); try { port.doubleIt(25); @@ -244,7 +244,7 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { callbackHandler.setConfirmationMethod(SAML2Constants.CONF_SENDER_VOUCHES); ((BindingProvider)port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); int result = port.doubleIt(25); assertTrue(result == 50); @@ -275,7 +275,7 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { callbackHandler.setConfirmationMethod(SAML2Constants.CONF_SENDER_VOUCHES); ((BindingProvider)port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); try { port.doubleIt(25); @@ -318,7 +318,7 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { callbackHandler.setCryptoPropertiesFile("morpit.properties"); ((BindingProvider)port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); int result = port.doubleIt(25); assertTrue(result == 50); @@ -349,7 +349,7 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER); ((BindingProvider)port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); try { @@ -385,7 +385,7 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { callbackHandler.setConfirmationMethod("urn:oasis:names:tc:SAML:2.0:cm:custom"); ((BindingProvider)port).getRequestContext().put( - "ws-security.saml-callback-handler", callbackHandler + "security.saml-callback-handler", callbackHandler ); try {
