Repository: cxf Updated Branches: refs/heads/master 234331c85 -> c7d1969c1
CXF-7345 Use the new properties to control generation of the resulting XML document Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/27c37bff Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/27c37bff Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/27c37bff Branch: refs/heads/master Commit: 27c37bffde998b284f5fa635c49b608cc72e7b43 Parents: b4b2da7 Author: Hugo Trippaers <htrippa...@schubergphilis.com> Authored: Mon Oct 31 09:00:32 2016 +0100 Committer: Hugo Trippaers <htrippa...@schubergphilis.com> Committed: Fri Apr 21 15:10:44 2017 +0200 ---------------------------------------------------------------------- .../cxf/rs/security/xml/SignatureProperties.java | 18 ++++++++++++++++++ .../cxf/rs/security/xml/XmlSecOutInterceptor.java | 8 ++++++++ 2 files changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/27c37bff/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java index 28fae88..da5b222 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/SignatureProperties.java @@ -29,6 +29,8 @@ public class SignatureProperties { private String signatureKeyName; private Map<String, String> keyNameAliasMap; private Integer signatureLocation; + private Boolean signatureGenerateIdAttributes; + private Boolean signatureOmitC14nTransform; public void setSignatureAlgo(String signatureAlgo) { this.signatureAlgo = signatureAlgo; @@ -87,4 +89,20 @@ public class SignatureProperties { public void setSignatureLocation(Integer signatureLocation) { this.signatureLocation = signatureLocation; } + + public Boolean getSignatureGenerateIdAttributes() { + return signatureGenerateIdAttributes; + } + + public void setSignatureGenerateIdAttributes(Boolean signatureGenerateIdAttributes) { + this.signatureGenerateIdAttributes = signatureGenerateIdAttributes; + } + + public Boolean getSignatureOmitC14nTransform() { + return signatureOmitC14nTransform; + } + + public void setSignatureOmitC14nTransform(Boolean signatureOmitC14nTransform) { + this.signatureOmitC14nTransform = signatureOmitC14nTransform; + } } http://git-wip-us.apache.org/repos/asf/cxf/blob/27c37bff/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java index 309dc57..77be577 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java @@ -336,6 +336,14 @@ public class XmlSecOutInterceptor extends AbstractPhaseInterceptor<Message> { if (sigProps.getSignatureLocation() != null) { properties.setSignaturePosition(sigProps.getSignatureLocation()); } + + if (sigProps.getSignatureGenerateIdAttributes() != null) { + properties.setSignatureGenerateIds(sigProps.getSignatureGenerateIdAttributes()); + } + + if (Boolean.TRUE.equals(sigProps.getSignatureOmitC14nTransform())) { + properties.setSignatureIncludeDigestTransform(false); + } if (elementsToSign == null || elementsToSign.isEmpty()) { LOG.fine("No Elements to sign are specified, so the entire request is signed");
