[CXF-6398] - AlgorithmSuitePolicyValidator rejects enveloped-signature Transform
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1f7316fe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1f7316fe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1f7316fe Branch: refs/heads/3.0.x-fixes Commit: 1f7316fecd392173b7a50be4c4d6b6ccd9b1e277 Parents: 67d846c Author: Colm O hEigeartaigh <[email protected]> Authored: Tue May 12 12:38:34 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue May 12 16:32:23 2015 +0100 ---------------------------------------------------------------------- .../wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1f7316fe/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java index c405233..21351ab 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java @@ -43,6 +43,7 @@ import org.apache.wss4j.dom.transform.STRTransform; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AlgorithmSuite; import org.apache.wss4j.policy.model.AlgorithmSuite.AlgorithmSuiteType; +import org.apache.xml.security.transforms.Transforms; /** * Validate results corresponding to the processing of a Signature, EncryptedKey or @@ -178,6 +179,7 @@ public class AlgorithmSuitePolicyValidator extends AbstractTokenPolicyValidator if (!(algorithmPolicy.getC14n().getValue().equals(transformAlgorithm) || WSConstants.C14N_EXCL_OMIT_COMMENTS.equals(transformAlgorithm) || STRTransform.TRANSFORM_URI.equals(transformAlgorithm) + || Transforms.TRANSFORM_ENVELOPED_SIGNATURE.equals(transformAlgorithm) || WSConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(transformAlgorithm) || WSConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(transformAlgorithm))) { ai.setNotAsserted("The transform algorithms do not match the requirement");
