This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch wss4j_2.3.0 in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 64e7d0e84b9e739ca707a624fedf5fc8a183bfbd Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Thu May 23 11:56:51 2019 +0100 Fixing up latest policy change in WSS4J --- .../ws/security/wss4j/AlgorithmSuiteTranslater.java | 4 ++-- .../security/wss4j/PolicyBasedWSS4JInInterceptor.java | 4 ++-- .../security/wss4j/PolicyBasedWSS4JOutInterceptor.java | 4 ++-- .../wss4j/PolicyBasedWSS4JStaxInInterceptor.java | 4 ++-- .../wss4j/policyhandlers/AbstractBindingBuilder.java | 8 ++++---- .../policyhandlers/AbstractStaxBindingHandler.java | 4 ++-- .../wss4j/policyhandlers/AsymmetricBindingHandler.java | 2 +- .../policyhandlers/StaxAsymmetricBindingHandler.java | 6 +++--- .../policyhandlers/StaxSymmetricBindingHandler.java | 6 +++--- .../policyhandlers/StaxTransportBindingHandler.java | 18 ++++++++++-------- .../wss4j/policyhandlers/SymmetricBindingHandler.java | 4 ++-- .../wss4j/policyhandlers/TransportBindingHandler.java | 8 ++++---- .../AlgorithmSuitePolicyValidator.java | 4 ++-- .../ws/security/wss4j/CustomPolicyAlgorithmsTest.java | 4 ++-- .../apache/cxf/systest/ws/x509/SHA512PolicyLoader.java | 2 +- 15 files changed, 42 insertions(+), 40 deletions(-) diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java index 595d419..ef73d10 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AlgorithmSuiteTranslater.java @@ -126,8 +126,8 @@ public final class AlgorithmSuiteTranslater { algorithmSuite.addDigestAlgorithm(algorithmSuiteType.getDigest()); } - algorithmSuite.addSignatureMethod(cxfAlgorithmSuite.getAsymmetricSignature()); - algorithmSuite.addSignatureMethod(cxfAlgorithmSuite.getSymmetricSignature()); + algorithmSuite.addSignatureMethod(algorithmSuiteType.getAsymmetricSignature()); + algorithmSuite.addSignatureMethod(algorithmSuiteType.getSymmetricSignature()); algorithmSuite.addC14nAlgorithm(cxfAlgorithmSuite.getC14n().getValue()); algorithmSuite.addTransformAlgorithm(cxfAlgorithmSuite.getC14n().getValue()); diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java index 767be4c..640165e 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java @@ -486,10 +486,10 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor { for (AssertionInfo algorithmSuite : algorithmSuites) { AlgorithmSuite algSuite = (AlgorithmSuite)algorithmSuite.getAssertion(); if (asymSignatureAlgorithm != null) { - algSuite.setAsymmetricSignature(asymSignatureAlgorithm); + algSuite.getAlgorithmSuiteType().setAsymmetricSignature(asymSignatureAlgorithm); } if (symSignatureAlgorithm != null) { - algSuite.setSymmetricSignature(symSignatureAlgorithm); + algSuite.getAlgorithmSuiteType().setSymmetricSignature(symSignatureAlgorithm); } } } diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java index 1a68fe0..9cb373e 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java @@ -164,13 +164,13 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa String asymSignatureAlgorithm = (String)message.getContextualProperty(SecurityConstants.ASYMMETRIC_SIGNATURE_ALGORITHM); if (asymSignatureAlgorithm != null && binding.getAlgorithmSuite() != null) { - binding.getAlgorithmSuite().setAsymmetricSignature(asymSignatureAlgorithm); + binding.getAlgorithmSuite().getAlgorithmSuiteType().setAsymmetricSignature(asymSignatureAlgorithm); } String symSignatureAlgorithm = (String)message.getContextualProperty(SecurityConstants.SYMMETRIC_SIGNATURE_ALGORITHM); if (symSignatureAlgorithm != null && binding.getAlgorithmSuite() != null) { - binding.getAlgorithmSuite().setSymmetricSignature(symSignatureAlgorithm); + binding.getAlgorithmSuite().getAlgorithmSuiteType().setSymmetricSignature(symSignatureAlgorithm); } try { diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java index 02b5081..b321e5b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java @@ -272,10 +272,10 @@ public class PolicyBasedWSS4JStaxInInterceptor extends WSS4JStaxInInterceptor { for (AssertionInfo algorithmSuite : algorithmSuites) { AlgorithmSuite algSuite = (AlgorithmSuite)algorithmSuite.getAssertion(); if (asymSignatureAlgorithm != null) { - algSuite.setAsymmetricSignature(asymSignatureAlgorithm); + algSuite.getAlgorithmSuiteType().setAsymmetricSignature(asymSignatureAlgorithm); } if (symSignatureAlgorithm != null) { - algSuite.setSymmetricSignature(symSignatureAlgorithm); + algSuite.getAlgorithmSuiteType().setSymmetricSignature(symSignatureAlgorithm); } } } diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java index d6529d8..7818ac8 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java @@ -580,7 +580,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle } else { sig.setCustomTokenValueType(WSS4JConstants.WSS_SAML_KI_VALUE_TYPE); } - sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getAsymmetricSignature()); + sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getAlgorithmSuiteType().getAsymmetricSignature()); sig.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue()); Crypto crypto = secToken.getCrypto(); @@ -1900,7 +1900,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle password = getPassword(user, token, WSPasswordCallback.SIGNATURE); } sig.setUserInfo(user, password); - sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getAsymmetricSignature()); + sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getAlgorithmSuiteType().getAsymmetricSignature()); AlgorithmSuiteType algType = binding.getAlgorithmSuite().getAlgorithmSuiteType(); sig.setDigestAlgo(algType.getDigest()); sig.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue()); @@ -2061,7 +2061,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle } //Set the algo info - dkSign.setSignatureAlgorithm(binding.getAlgorithmSuite().getSymmetricSignature()); + dkSign.setSignatureAlgorithm(binding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); dkSign.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue()); AlgorithmSuiteType algType = binding.getAlgorithmSuite().getAlgorithmSuiteType(); dkSign.setDerivedKeyLength(algType.getSignatureDerivedKeyLength() / 8); @@ -2153,7 +2153,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle sigTokId = XMLUtils.getIDFromReference(sigTokId); sig.setCustomTokenId(sigTokId); sig.setSecretKey(tok.getSecret()); - sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getSymmetricSignature()); + sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); AlgorithmSuiteType algType = binding.getAlgorithmSuite().getAlgorithmSuiteType(); sig.setDigestAlgo(algType.getDigest()); sig.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue()); diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java index c674c99..b5a2d6b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java @@ -540,10 +540,10 @@ public abstract class AbstractStaxBindingHandler extends AbstractCommonBindingHa if (binding instanceof SymmetricBinding) { userNameKey = SecurityConstants.ENCRYPT_USERNAME; properties.setSignatureAlgorithm( - binding.getAlgorithmSuite().getSymmetricSignature()); + binding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); } else { properties.setSignatureAlgorithm( - binding.getAlgorithmSuite().getAsymmetricSignature()); + binding.getAlgorithmSuite().getAlgorithmSuiteType().getAsymmetricSignature()); } properties.setSignatureCanonicalizationAlgorithm( binding.getAlgorithmSuite().getC14n().getValue()); 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 3896fa5..ff716f1 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 @@ -689,7 +689,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder { dkSign.setTokenIdentifier(this.encryptedKeyId); // Set the algo info - dkSign.setSignatureAlgorithm(abinding.getAlgorithmSuite().getSymmetricSignature()); + dkSign.setSignatureAlgorithm(abinding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); dkSign.setSigCanonicalization(abinding.getAlgorithmSuite().getC14n().getValue()); AlgorithmSuiteType algType = abinding.getAlgorithmSuite().getAlgorithmSuiteType(); dkSign.setDigestAlgorithm(algType.getDigest()); diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java index bc96d32..19d8af1 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java @@ -89,12 +89,12 @@ public class StaxAsymmetricBindingHandler extends AbstractStaxBindingHandler { String asymSignatureAlgorithm = (String)getMessage().getContextualProperty(SecurityConstants.ASYMMETRIC_SIGNATURE_ALGORITHM); if (asymSignatureAlgorithm != null && abinding.getAlgorithmSuite() != null) { - abinding.getAlgorithmSuite().setAsymmetricSignature(asymSignatureAlgorithm); + abinding.getAlgorithmSuite().getAlgorithmSuiteType().setAsymmetricSignature(asymSignatureAlgorithm); } String symSignatureAlgorithm = (String)getMessage().getContextualProperty(SecurityConstants.SYMMETRIC_SIGNATURE_ALGORITHM); if (symSignatureAlgorithm != null && abinding.getAlgorithmSuite() != null) { - abinding.getAlgorithmSuite().setSymmetricSignature(symSignatureAlgorithm); + abinding.getAlgorithmSuite().getAlgorithmSuiteType().setSymmetricSignature(symSignatureAlgorithm); } if (abinding.getProtectionOrder() @@ -451,7 +451,7 @@ public class StaxAsymmetricBindingHandler extends AbstractStaxBindingHandler { if (sigToken.getDerivedKeys() == DerivedKeys.RequireDerivedKeys) { properties.setSignatureAlgorithm( - abinding.getAlgorithmSuite().getSymmetricSignature()); + abinding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); } } diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java index 3d0866a..ab85195 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java @@ -112,12 +112,12 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { String asymSignatureAlgorithm = (String)getMessage().getContextualProperty(SecurityConstants.ASYMMETRIC_SIGNATURE_ALGORITHM); if (asymSignatureAlgorithm != null && sbinding.getAlgorithmSuite() != null) { - sbinding.getAlgorithmSuite().setAsymmetricSignature(asymSignatureAlgorithm); + sbinding.getAlgorithmSuite().getAlgorithmSuiteType().setAsymmetricSignature(asymSignatureAlgorithm); } String symSignatureAlgorithm = (String)getMessage().getContextualProperty(SecurityConstants.SYMMETRIC_SIGNATURE_ALGORITHM); if (symSignatureAlgorithm != null && sbinding.getAlgorithmSuite() != null) { - sbinding.getAlgorithmSuite().setSymmetricSignature(symSignatureAlgorithm); + sbinding.getAlgorithmSuite().getAlgorithmSuiteType().setSymmetricSignature(symSignatureAlgorithm); } // Set up CallbackHandler which wraps the configured Handler @@ -593,7 +593,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { if (sigToken.getDerivedKeys() == DerivedKeys.RequireDerivedKeys) { properties.setSignatureAlgorithm( - sbinding.getAlgorithmSuite().getSymmetricSignature()); + sbinding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); } } diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java index 3f9dcf5..b64e186 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java @@ -94,12 +94,12 @@ public class StaxTransportBindingHandler extends AbstractStaxBindingHandler { String asymSignatureAlgorithm = (String)getMessage().getContextualProperty(SecurityConstants.ASYMMETRIC_SIGNATURE_ALGORITHM); if (asymSignatureAlgorithm != null && tbinding.getAlgorithmSuite() != null) { - tbinding.getAlgorithmSuite().setAsymmetricSignature(asymSignatureAlgorithm); + tbinding.getAlgorithmSuite().getAlgorithmSuiteType().setAsymmetricSignature(asymSignatureAlgorithm); } String symSignatureAlgorithm = (String)getMessage().getContextualProperty(SecurityConstants.SYMMETRIC_SIGNATURE_ALGORITHM); if (symSignatureAlgorithm != null && tbinding.getAlgorithmSuite() != null) { - tbinding.getAlgorithmSuite().setSymmetricSignature(symSignatureAlgorithm); + tbinding.getAlgorithmSuite().getAlgorithmSuiteType().setSymmetricSignature(symSignatureAlgorithm); } TransportToken token = tbinding.getTransportToken(); @@ -315,9 +315,11 @@ public class StaxTransportBindingHandler extends AbstractStaxBindingHandler { WSSSecurityProperties properties = getProperties(); if (securityToken != null && securityToken.getSecret() != null) { - properties.setSignatureAlgorithm(tbinding.getAlgorithmSuite().getSymmetricSignature()); + properties.setSignatureAlgorithm( + tbinding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); } else { - properties.setSignatureAlgorithm(tbinding.getAlgorithmSuite().getAsymmetricSignature()); + properties.setSignatureAlgorithm( + tbinding.getAlgorithmSuite().getAlgorithmSuiteType().getAsymmetricSignature()); } properties.setSignatureCanonicalizationAlgorithm(tbinding.getAlgorithmSuite().getC14n().getValue()); AlgorithmSuiteType algType = tbinding.getAlgorithmSuite().getAlgorithmSuiteType(); @@ -344,7 +346,7 @@ public class StaxTransportBindingHandler extends AbstractStaxBindingHandler { properties.setIncludeSignatureToken(true); properties.setSignatureAlgorithm( - tbinding.getAlgorithmSuite().getSymmetricSignature()); + tbinding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); properties.setSignatureCanonicalizationAlgorithm( tbinding.getAlgorithmSuite().getC14n().getValue()); AlgorithmSuiteType algType = tbinding.getAlgorithmSuite().getAlgorithmSuiteType(); @@ -357,7 +359,7 @@ public class StaxTransportBindingHandler extends AbstractStaxBindingHandler { WSSSecurityProperties properties = getProperties(); properties.setSignatureAlgorithm( - tbinding.getAlgorithmSuite().getAsymmetricSignature()); + tbinding.getAlgorithmSuite().getAlgorithmSuiteType().getAsymmetricSignature()); properties.setSignatureCanonicalizationAlgorithm( tbinding.getAlgorithmSuite().getC14n().getValue()); AlgorithmSuiteType algType = tbinding.getAlgorithmSuite().getAlgorithmSuiteType(); @@ -373,7 +375,7 @@ public class StaxTransportBindingHandler extends AbstractStaxBindingHandler { signPartsAndElements(wrapper.getSignedParts(), wrapper.getSignedElements()); properties.setSignatureAlgorithm( - tbinding.getAlgorithmSuite().getSymmetricSignature()); + tbinding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); properties.setSignatureCanonicalizationAlgorithm( tbinding.getAlgorithmSuite().getC14n().getValue()); AlgorithmSuiteType algType = tbinding.getAlgorithmSuite().getAlgorithmSuiteType(); @@ -397,7 +399,7 @@ public class StaxTransportBindingHandler extends AbstractStaxBindingHandler { configureSignature(token, false); if (token.getDerivedKeys() == DerivedKeys.RequireDerivedKeys) { properties.setSignatureAlgorithm( - tbinding.getAlgorithmSuite().getSymmetricSignature()); + tbinding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); } } diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java index 0567126..263982d 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java @@ -736,7 +736,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { } //Set the algo info - dkSign.setSignatureAlgorithm(sbinding.getAlgorithmSuite().getSymmetricSignature()); + dkSign.setSignatureAlgorithm(sbinding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); dkSign.setSigCanonicalization(sbinding.getAlgorithmSuite().getC14n().getValue()); AlgorithmSuiteType algType = sbinding.getAlgorithmSuite().getAlgorithmSuiteType(); dkSign.setDigestAlgorithm(algType.getDigest()); @@ -912,7 +912,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { sig.setCustomTokenId(sigTokId); sig.setSecretKey(tok.getSecret()); - sig.setSignatureAlgorithm(sbinding.getAlgorithmSuite().getSymmetricSignature()); + sig.setSignatureAlgorithm(sbinding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); boolean includePrefixes = MessageUtils.getContextualBoolean( diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java index 4be39d2..f0fc873 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java @@ -385,7 +385,7 @@ public class TransportBindingHandler extends AbstractBindingBuilder { } dkSig.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue()); - dkSig.setSignatureAlgorithm(binding.getAlgorithmSuite().getSymmetricSignature()); + dkSig.setSignatureAlgorithm(binding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); dkSig.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message)); dkSig.setStoreBytesInAttachment(storeBytesInAttachment); dkSig.setExpandXopInclude(isExpandXopInclude()); @@ -499,7 +499,7 @@ public class TransportBindingHandler extends AbstractBindingBuilder { } // Set the algo info - dkSign.setSignatureAlgorithm(algorithmSuite.getSymmetricSignature()); + dkSign.setSignatureAlgorithm(algorithmSuite.getAlgorithmSuiteType().getSymmetricSignature()); AlgorithmSuiteType algType = binding.getAlgorithmSuite().getAlgorithmSuiteType(); dkSign.setDerivedKeyLength(algType.getSignatureDerivedKeyLength() / 8); if (token.getVersion() == SPConstants.SPVersion.SP11) { @@ -606,11 +606,11 @@ public class TransportBindingHandler extends AbstractBindingBuilder { } sig.setUserInfo(uname, password); - sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getAsymmetricSignature()); + sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getAlgorithmSuiteType().getAsymmetricSignature()); } else { crypto = getSignatureCrypto(); sig.setSecretKey(secTok.getSecret()); - sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getSymmetricSignature()); + sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getAlgorithmSuiteType().getSymmetricSignature()); } sig.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue()); AlgorithmSuiteType algType = binding.getAlgorithmSuite().getAlgorithmSuiteType(); 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 0042681..b66bf1e 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 @@ -117,8 +117,8 @@ public class AlgorithmSuitePolicyValidator extends AbstractSecurityPolicyValidat ) { String signatureMethod = (String)result.get(WSSecurityEngineResult.TAG_SIGNATURE_METHOD); - if (!algorithmPolicy.getAsymmetricSignature().equals(signatureMethod) - && !algorithmPolicy.getSymmetricSignature().equals(signatureMethod)) { + if (!algorithmPolicy.getAlgorithmSuiteType().getAsymmetricSignature().equals(signatureMethod) + && !algorithmPolicy.getAlgorithmSuiteType().getSymmetricSignature().equals(signatureMethod)) { ai.setNotAsserted( "The signature method does not match the requirement" ); diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java index 4f4f0bb..989b3d2 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomPolicyAlgorithmsTest.java @@ -44,9 +44,9 @@ public class CustomPolicyAlgorithmsTest extends AbstractPolicySecurityTest { AsymmetricBinding binding = (AsymmetricBinding) assertInfo.getAssertion(); // set Signature Algorithm to RSA SHA-256 - binding.getAlgorithmSuite().setAsymmetricSignature(rsaSha2SigMethod); + binding.getAlgorithmSuite().getAlgorithmSuiteType().setAsymmetricSignature(rsaSha2SigMethod); - String sigMethod = binding.getAlgorithmSuite().getAsymmetricSignature(); + String sigMethod = binding.getAlgorithmSuite().getAlgorithmSuiteType().getAsymmetricSignature(); assertNotNull(sigMethod); assertEquals(rsaSha2SigMethod, sigMethod); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java index 3c1910b..c99c9f8 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java @@ -91,7 +91,7 @@ public class SHA512PolicyLoader implements AlgorithmSuiteLoader { SHA512AlgorithmSuite(SPConstants.SPVersion version, Policy nestedPolicy) { super(version, nestedPolicy); - setAsymmetricSignature("http://www.w3.org/2001/04/xmldsig-more#rsa-sha512";); + getAlgorithmSuiteType().setAsymmetricSignature("http://www.w3.org/2001/04/xmldsig-more#rsa-sha512";); } @Override
