You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/02/17 23:34:36 UTC
svn commit: r745280 -
/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
Author: dkulp
Date: Tue Feb 17 22:34:36 2009
New Revision: 745280
URL: http://svn.apache.org/viewvc?rev=745280&view=rev
Log:
Assert other policies when transport binding used
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java?rev=745280&r1=745279&r2=745280&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java Tue Feb 17 22:34:36 2009
@@ -329,6 +329,11 @@
}
return action;
}
+ void assertTransportBinding(AssertionInfoMap aim, SoapMessage message) {
+ assertPolicy(aim, SP12Constants.TRANSPORT_BINDING);
+ assertPolicy(aim, SP12Constants.TRANSPORT_TOKEN);
+ policyAsserted(aim, SP12Constants.ENCRYPTED_PARTS);
+ }
void assertWSS11(AssertionInfoMap aim, SoapMessage message) {
if (isRequestor(message)) {
message.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "false");
@@ -377,10 +382,9 @@
action = addToAction(action, WSHandlerConstants.TIMESTAMP, true);
}
assertPolicy(aim, SP12Constants.LAYOUT);
- assertPolicy(aim, SP12Constants.TRANSPORT_BINDING);
- assertPolicy(aim, SP12Constants.TRANSPORT_TOKEN);
action = assertAsymetricBinding(aim, action, message);
action = assertSymetricBinding(aim, action, message);
+ assertTransportBinding(aim, message);
action = assertSupportingTokens(aim, message,
action, SP12Constants.SIGNED_SUPPORTING_TOKENS);