Author: coheigea
Date: Mon Dec 2 16:41:50 2013
New Revision: 1547098
URL: http://svn.apache.org/r1547098
Log:
Assert WS-SecurityPolicy Transport tokens.
Modified:
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
Modified:
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java?rev=1547098&r1=1547097&r2=1547098&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
Mon Dec 2 16:41:50 2013
@@ -139,14 +139,13 @@ public class TransportBindingHandler ext
if (secToken == null) {
policyNotAsserted(transportToken, "No transport
token id");
return;
- } else {
- policyAsserted(transportToken);
}
if (includeToken(transportToken.getInclusion())) {
Element el = secToken.getToken();
addEncryptedKeyElement(cloneElement(el));
}
}
+ policyAsserted(transportToken);
}
handleNonEndorsingSupportingTokens();
@@ -154,6 +153,9 @@ public class TransportBindingHandler ext
handleEndorsingSupportingTokens();
}
} else {
+ if (tbinding != null && tbinding.getTransportToken() != null) {
+ policyAsserted(tbinding.getTransportToken().getToken());
+ }
addSignatureConfirmation(null);
}
} catch (Exception e) {
