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/05/15 13:19:04 UTC
svn commit: r1482768 -
/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyStaxActionInInterceptor.java
Author: coheigea
Date: Wed May 15 11:19:04 2013
New Revision: 1482768
URL: http://svn.apache.org/r1482768
Log:
Properly assert SP13 Created + Nonce policies
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyStaxActionInInterceptor.java
Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyStaxActionInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyStaxActionInInterceptor.java?rev=1482768&r1=1482767&r2=1482768&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyStaxActionInInterceptor.java (original)
+++ cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyStaxActionInInterceptor.java Wed May 15 11:19:04 2013
@@ -32,6 +32,7 @@ import org.apache.cxf.ws.policy.Assertio
import org.apache.cxf.ws.policy.AssertionInfoMap;
import org.apache.wss4j.policy.SP11Constants;
import org.apache.wss4j.policy.SP12Constants;
+import org.apache.wss4j.policy.SP13Constants;
import org.apache.wss4j.policy.SPConstants;
import org.apache.wss4j.policy.model.AlgorithmSuite;
import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants;
@@ -114,8 +115,18 @@ public class PolicyStaxActionInIntercept
assertAllAssertionsByLocalname(aim, SPConstants.USERNAME_TOKEN11);
assertAllAssertionsByLocalname(aim, SPConstants.HASH_PASSWORD);
assertAllAssertionsByLocalname(aim, SPConstants.NO_PASSWORD);
- assertAllAssertionsByLocalname(aim, SPConstants.NONCE);
- assertAllAssertionsByLocalname(aim, SPConstants.CREATED);
+ Collection<AssertionInfo> sp13Ais = aim.get(SP13Constants.NONCE);
+ if (sp13Ais != null) {
+ for (AssertionInfo ai : sp13Ais) {
+ ai.setAsserted(true);
+ }
+ }
+ sp13Ais = aim.get(SP13Constants.CREATED);
+ if (sp13Ais != null) {
+ for (AssertionInfo ai : sp13Ais) {
+ ai.setAsserted(true);
+ }
+ }
} else if (WSSecurityEventConstants.X509Token == event.getSecurityEventType()) {
assertAllAssertionsByLocalname(aim, SPConstants.X509_TOKEN);
assertAllAssertionsByLocalname(aim, SPConstants.WSS_X509_PKCS7_TOKEN10);