Repository: cxf Updated Branches: refs/heads/master 8c22c4cee -> 529dd5b52
[CXF-6473] - Double signatures while using AsymmetricBindingHandle Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/529dd5b5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/529dd5b5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/529dd5b5 Branch: refs/heads/master Commit: 529dd5b520b97c2a6c75c57f03adb6497db5160f Parents: 8c22c4c Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Jun 24 16:53:12 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Jun 24 16:53:28 2015 +0100 ---------------------------------------------------------------------- .../security/wss4j/policyhandlers/AsymmetricBindingHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/529dd5b5/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java index 6406974..c54dfc1 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java @@ -172,6 +172,8 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder { } addSupportingTokens(sigs); + sigs.addAll(this.getSignedParts(null)); + if (isRequestor() && initiatorWrapper != null) { doSignature(initiatorWrapper, sigs, attached); doEndorse(); @@ -326,7 +328,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder { List<WSEncryptionPart> encrParts = null; try { encrParts = getEncryptedParts(); - //Signed parts are determined before encryption because encrypted signed headers + //Signed parts are determined before encryption because encrypted signed headers //will not be included otherwise sigParts.addAll(this.getSignedParts(null)); } catch (SOAPException ex) { @@ -605,7 +607,6 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder { } AbstractToken sigToken = wrapper.getToken(); - sigParts.addAll(this.getSignedParts(null)); if (sigParts.isEmpty()) { // Add the BST to the security header if required if (!attached && isTokenRequired(sigToken.getIncludeTokenType())) {
