Repository: cxf Updated Branches: refs/heads/master ce7692af6 -> 4b1396b45
Fixing some JAX-RS XML Security tests Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4b1396b4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4b1396b4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4b1396b4 Branch: refs/heads/master Commit: 4b1396b452992a714628bbeada7bd1f9782b1266 Parents: ce7692a Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Apr 22 15:17:48 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Apr 22 15:18:41 2014 +0100 ---------------------------------------------------------------------- .../rs/security/xml/XmlSecInInterceptor.java | 2 +- .../jaxrs/security/xml/JAXRSXmlSecTest.java | 4 +++- .../systest/jaxrs/security/xml/stax-server.xml | 22 ++++++++++++++------ 3 files changed, 20 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4b1396b4/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java index b383a82..00221c1 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java @@ -364,7 +364,7 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor<Message> { private final boolean encryptionRequired; public StaxActionInInterceptor(boolean signatureRequired, boolean encryptionRequired) { - super(Phase.PRE_PROTOCOL); + super(Phase.PRE_LOGICAL); this.signatureRequired = signatureRequired; this.encryptionRequired = encryptionRequired; } http://git-wip-us.apache.org/repos/asf/cxf/blob/4b1396b4/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java index 5e7b2bd..2af2c51 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java @@ -166,7 +166,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { @Test public void testPostBookWithEnvelopingSig() throws Exception { if (test.streaming || STAX_PORT.equals(test.port)) { - // Enveloping not supported for streaming code + // Enveloping not supported for streaming code return; } String address = "https://localhost:"; + test.port + "/xmlsig/bookstore/books"; @@ -210,6 +210,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { bean.getOutInterceptors().add(sigOutInterceptor); XmlSecInInterceptor sigInInterceptor = new XmlSecInInterceptor(); + sigInInterceptor.setRequireSignature(true); if (!useKeyInfo) { sigInInterceptor.setSignatureVerificationAlias("alice"); } @@ -438,6 +439,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { bean.getOutInterceptors().add(encInterceptor); XmlSecInInterceptor encInInterceptor = new XmlSecInInterceptor(); + encInInterceptor.setRequireEncryption(true); bean.getInInterceptors().add(encInInterceptor); } else { if (sign) { http://git-wip-us.apache.org/repos/asf/cxf/blob/4b1396b4/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml index ce4f66b..59e9b89 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml @@ -56,17 +56,21 @@ under the License. <property name="encryptionKeyTransportAlgo" value="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/> <property name="encryptionSymmetricKeyAlgo" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/> </bean> - <bean id="xmlSecInHandler" class="org.apache.cxf.rs.security.xml.XmlSecInInterceptor"> - <property name="decryptionAlias" value="bob" /> + <bean id="xmlSigInHandler" class="org.apache.cxf.rs.security.xml.XmlSecInInterceptor"> + <property name="requireSignature" value="true"/> <property name="signatureVerificationAlias" value="alice" /> </bean> + <bean id="xmlEncInHandler" class="org.apache.cxf.rs.security.xml.XmlSecInInterceptor"> + <property name="decryptionAlias" value="bob" /> + <property name="requireEncryption" value="true"/> + </bean> <bean id="xmlSecInHandlerWithProps" class="org.apache.cxf.rs.security.xml.XmlSecInInterceptor"> <property name="signatureProperties" ref="sigProps"/> <property name="encryptionProperties" ref="encProps"/> <property name="decryptionAlias" value="bob" /> <property name="signatureVerificationAlias" value="alice" /> - <property name="requireSignature" value="true"/> <property name="requireEncryption" value="true"/> + <property name="requireSignature" value="true"/> </bean> <bean id="xmlSigOutHandler" class="org.apache.cxf.rs.security.xml.XmlSecOutInterceptor"> <property name="signRequest" value="true"/> @@ -80,6 +84,12 @@ under the License. <bean id="xmlSigOutHandlerNoKeyInfo" class="org.apache.cxf.rs.security.xml.XmlSecOutInterceptor"> <property name="signRequest" value="true"/> </bean> + <bean id="xmlSecInHandler" class="org.apache.cxf.rs.security.xml.XmlSecInInterceptor"> + <property name="requireSignature" value="true"/> + <property name="signatureVerificationAlias" value="alice" /> + <property name="decryptionAlias" value="bob" /> + <property name="requireEncryption" value="true"/> + </bean> <bean id="xmlSecOutHandler" class="org.apache.cxf.rs.security.xml.XmlSecOutInterceptor"> <property name="signRequest" value="true"/> <property name="encryptRequest" value="true"/> @@ -94,7 +104,7 @@ under the License. <ref bean="serviceBean"/> </jaxrs:serviceBeans> <jaxrs:inInterceptors> - <ref bean="xmlSecInHandler"/> + <ref bean="xmlSigInHandler"/> </jaxrs:inInterceptors> <jaxrs:outInterceptors> <ref bean="xmlSigOutHandler"/> @@ -110,7 +120,7 @@ under the License. <ref bean="serviceBean"/> </jaxrs:serviceBeans> <jaxrs:inInterceptors> - <ref bean="xmlSecInHandler"/> + <ref bean="xmlSigInHandler"/> </jaxrs:inInterceptors> <jaxrs:outInterceptors> <ref bean="xmlSigOutHandlerNoKeyInfo"/> @@ -126,7 +136,7 @@ under the License. <ref bean="serviceBean"/> </jaxrs:serviceBeans> <jaxrs:inInterceptors> - <ref bean="xmlSecInHandler"/> + <ref bean="xmlEncInHandler"/> </jaxrs:inInterceptors> <jaxrs:outInterceptors> <ref bean="xmlEncOutHandler"/>
