You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/07/10 12:38:55 UTC
svn commit: r1501714 - in /cxf/trunk:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
Author: coheigea
Date: Wed Jul 10 10:38:55 2013
New Revision: 1501714
URL: http://svn.apache.org/r1501714
Log:
Enabling a Symmetric ProtectTokens streaming test following fix for WSS-457
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java?rev=1501714&r1=1501713&r2=1501714&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java Wed Jul 10 10:38:55 2013
@@ -434,7 +434,7 @@ public class StaxSymmetricBindingHandler
}
AbstractToken sigToken = wrapper.getToken();
- if (sbinding.isProtectTokens() && (sigToken instanceof X509Token)) {
+ if (sbinding.isProtectTokens() && (sigToken instanceof X509Token) && isRequestor()) {
parts += "{Element}{" + WSSConstants.NS_XMLENC + "}EncryptedKey;";
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java?rev=1501714&r1=1501713&r2=1501714&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java Wed Jul 10 10:38:55 2013
@@ -352,9 +352,7 @@ public class StaxX509TokenTest extends A
bus.shutdown(true);
}
- // TODO - See WSS-457
@org.junit.Test
- @org.junit.Ignore
public void testSymmetricProtectTokens() throws Exception {
SpringBusFactory bf = new SpringBusFactory();