http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java ---------------------------------------------------------------------- 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 df86a11..06d6d82 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 @@ -66,6 +66,7 @@ import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.OutboundSecurityContext; import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.ext.SecurePart.Modifier; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.impl.util.IDGenerator; import org.apache.xml.security.stax.securityEvent.AbstractSecuredElementSecurityEvent; import org.apache.xml.security.stax.securityEvent.SecurityEvent; @@ -235,7 +236,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { //Check for signature protection if (sbinding.isEncryptSignature()) { SecurePart part = - new SecurePart(new QName(WSSConstants.NS_DSIG, "Signature"), Modifier.Element); + new SecurePart(new QName(XMLSecurityConstants.NS_DSIG, "Signature"), Modifier.Element); encrParts.add(part); if (signatureConfirmationAdded) { part = new SecurePart(WSSConstants.TAG_WSSE11_SIG_CONF, Modifier.Element); @@ -373,7 +374,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { //Check for signature protection if (sbinding.isEncryptSignature()) { SecurePart part = - new SecurePart(new QName(WSSConstants.NS_DSIG, "Signature"), Modifier.Element); + new SecurePart(new QName(XMLSecurityConstants.NS_DSIG, "Signature"), Modifier.Element); enc.add(part); if (signatureConfirmationAdded) { part = new SecurePart(WSSConstants.TAG_WSSE11_SIG_CONF, Modifier.Element); @@ -406,7 +407,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { // Action WSSSecurityProperties properties = getProperties(); - WSSConstants.Action actionToPerform = WSSConstants.ENCRYPT; + WSSConstants.Action actionToPerform = XMLSecurityConstants.ENCRYPT; if (recToken.getToken().getDerivedKeys() == DerivedKeys.RequireDerivedKeys) { actionToPerform = WSSConstants.ENCRYPT_WITH_DERIVED_KEY; if (MessageUtils.isRequestor(message) && recToken.getToken() instanceof X509Token) { @@ -506,7 +507,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { // Action WSSSecurityProperties properties = getProperties(); - WSSConstants.Action actionToPerform = WSSConstants.SIGNATURE; + WSSConstants.Action actionToPerform = XMLSecurityConstants.SIGNATURE; if (wrapper.getToken().getDerivedKeys() == DerivedKeys.RequireDerivedKeys) { actionToPerform = WSSConstants.SIGNATURE_WITH_DERIVED_KEY; if (MessageUtils.isRequestor(message) && policyToken instanceof X509Token) { @@ -545,7 +546,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { AbstractToken sigToken = wrapper.getToken(); if (sbinding.isProtectTokens() && sigToken instanceof X509Token && isRequestor()) { SecurePart securePart = - new SecurePart(new QName(WSSConstants.NS_XMLENC, "EncryptedKey"), Modifier.Element); + new SecurePart(new QName(XMLSecurityConstants.NS_XMLENC, "EncryptedKey"), Modifier.Element); properties.addSignaturePart(securePart); }
http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java ---------------------------------------------------------------------- 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 ff71d2f..5ea70ad 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 @@ -64,6 +64,7 @@ import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.xml.security.stax.ext.OutboundSecurityContext; import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.ext.SecurePart.Modifier; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; /** * @@ -355,7 +356,7 @@ public class StaxTransportBindingHandler extends AbstractStaxBindingHandler { throw new Exception("Endorsing UsernameTokens are not supported in the streaming code"); } else if (token instanceof KerberosToken) { WSSSecurityProperties properties = getProperties(); - properties.addAction(WSSConstants.SIGNATURE); + properties.addAction(XMLSecurityConstants.SIGNATURE); configureSignature(token, false); addKerberosToken((KerberosToken)token, false, true, false); @@ -377,7 +378,7 @@ public class StaxTransportBindingHandler extends AbstractStaxBindingHandler { // Action WSSSecurityProperties properties = getProperties(); - WSSConstants.Action actionToPerform = WSSConstants.SIGNATURE; + WSSConstants.Action actionToPerform = XMLSecurityConstants.SIGNATURE; if (token.getDerivedKeys() == DerivedKeys.RequireDerivedKeys) { actionToPerform = WSSConstants.SIGNATURE_WITH_DERIVED_KEY; } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java ---------------------------------------------------------------------- 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 cfdd3f6..1f12598 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 @@ -46,6 +46,7 @@ import org.apache.cxf.ws.security.wss4j.AttachmentCallbackHandler; import org.apache.cxf.ws.security.wss4j.StaxSerializer; import org.apache.cxf.ws.security.wss4j.WSS4JUtils; import org.apache.wss4j.common.WSEncryptionPart; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.derivedKey.ConversationConstants; @@ -428,14 +429,14 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { SecurityTokenReference tokenRef = new SecurityTokenReference(saaj.getSOAPPart()); String tokenType = encrTok.getTokenType(); if (encrToken instanceof KerberosToken) { - tokenRef.setKeyIdentifier(WSConstants.WSS_KRB_KI_VALUE_TYPE, encrTok.getSHA1(), true); + tokenRef.setKeyIdentifier(WSS4JConstants.WSS_KRB_KI_VALUE_TYPE, encrTok.getSHA1(), true); if (tokenType == null) { - tokenType = WSConstants.WSS_GSS_KRB_V5_AP_REQ; + tokenType = WSS4JConstants.WSS_GSS_KRB_V5_AP_REQ; } } else { tokenRef.setKeyIdentifierEncKeySHA1(encrTok.getSHA1()); if (tokenType == null) { - tokenType = WSConstants.WSS_ENC_KEY_VALUE_TYPE; + tokenType = WSS4JConstants.WSS_ENC_KEY_VALUE_TYPE; } } tokenRef.addTokenType(tokenType); @@ -464,21 +465,21 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { if (encrTok.getSHA1() != null) { String tokenType = encrTok.getTokenType(); if (tokenType == null) { - tokenType = WSConstants.WSS_ENC_KEY_VALUE_TYPE; + tokenType = WSS4JConstants.WSS_ENC_KEY_VALUE_TYPE; } dkEncr.setCustomValueType(tokenType); } else { String tokenType = encrTok.getTokenType(); - if (WSConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) - || WSConstants.SAML_NS.equals(tokenType)) { + if (WSS4JConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) + || WSS4JConstants.SAML_NS.equals(tokenType)) { dkEncr.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); - dkEncr.setCustomValueType(WSConstants.WSS_SAML_KI_VALUE_TYPE); - } else if (WSConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) - || WSConstants.SAML2_NS.equals(tokenType)) { + dkEncr.setCustomValueType(WSS4JConstants.WSS_SAML_KI_VALUE_TYPE); + } else if (WSS4JConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) + || WSS4JConstants.SAML2_NS.equals(tokenType)) { dkEncr.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); - dkEncr.setCustomValueType(WSConstants.WSS_SAML2_KI_VALUE_TYPE); + dkEncr.setCustomValueType(WSS4JConstants.WSS_SAML2_KI_VALUE_TYPE); } else if (encrToken instanceof UsernameToken) { - dkEncr.setCustomValueType(WSConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); + dkEncr.setCustomValueType(WSS4JConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); } else { dkEncr.setCustomValueType(tokenType); } @@ -575,22 +576,22 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { SecurityTokenReference secRef = new SecurityTokenReference(cloneElement(ref), new BSPEnforcer()); encr.setSecurityTokenReference(secRef); - } else if (WSConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) - || WSConstants.SAML_NS.equals(tokenType)) { - encr.setCustomReferenceValue(WSConstants.WSS_SAML_KI_VALUE_TYPE); + } else if (WSS4JConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) + || WSS4JConstants.SAML_NS.equals(tokenType)) { + encr.setCustomReferenceValue(WSS4JConstants.WSS_SAML_KI_VALUE_TYPE); encr.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); - } else if (WSConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) - || WSConstants.SAML2_NS.equals(tokenType)) { - encr.setCustomReferenceValue(WSConstants.WSS_SAML2_KI_VALUE_TYPE); + } else if (WSS4JConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) + || WSS4JConstants.SAML2_NS.equals(tokenType)) { + encr.setCustomReferenceValue(WSS4JConstants.WSS_SAML2_KI_VALUE_TYPE); encr.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); } else { encr.setCustomReferenceValue(tokenType); encr.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); } } else if (encrToken instanceof UsernameToken) { - encr.setCustomReferenceValue(WSConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); + encr.setCustomReferenceValue(WSS4JConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); } else if (encrToken instanceof KerberosToken && !isRequestor()) { - encr.setCustomReferenceValue(WSConstants.WSS_KRB_KI_VALUE_TYPE); + encr.setCustomReferenceValue(WSS4JConstants.WSS_KRB_KI_VALUE_TYPE); encr.setEncKeyId(encrTok.getSHA1()); } else if (!isRequestor() && encrTok.getSHA1() != null) { encr.setCustomReferenceValue(encrTok.getSHA1()); @@ -680,14 +681,14 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { if (tok.getSHA1() != null) { String tokenType = tok.getTokenType(); if (policyToken instanceof KerberosToken) { - tokenRef.setKeyIdentifier(WSConstants.WSS_KRB_KI_VALUE_TYPE, tok.getSHA1(), true); + tokenRef.setKeyIdentifier(WSS4JConstants.WSS_KRB_KI_VALUE_TYPE, tok.getSHA1(), true); if (tokenType == null) { - tokenType = WSConstants.WSS_GSS_KRB_V5_AP_REQ; + tokenType = WSS4JConstants.WSS_GSS_KRB_V5_AP_REQ; } } else { tokenRef.setKeyIdentifierEncKeySHA1(tok.getSHA1()); if (tokenType == null) { - tokenType = WSConstants.WSS_ENC_KEY_VALUE_TYPE; + tokenType = WSS4JConstants.WSS_ENC_KEY_VALUE_TYPE; } } tokenRef.addTokenType(tokenType); @@ -718,21 +719,21 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { //Set the value type of the reference String tokenType = tok.getTokenType(); if (tokenType == null) { - tokenType = WSConstants.WSS_ENC_KEY_VALUE_TYPE; + tokenType = WSS4JConstants.WSS_ENC_KEY_VALUE_TYPE; } dkSign.setCustomValueType(tokenType); } else { String tokenType = tok.getTokenType(); - if (WSConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) - || WSConstants.SAML_NS.equals(tokenType)) { + if (WSS4JConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) + || WSS4JConstants.SAML_NS.equals(tokenType)) { dkSign.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); - dkSign.setCustomValueType(WSConstants.WSS_SAML_KI_VALUE_TYPE); - } else if (WSConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) - || WSConstants.SAML2_NS.equals(tokenType)) { + dkSign.setCustomValueType(WSS4JConstants.WSS_SAML_KI_VALUE_TYPE); + } else if (WSS4JConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) + || WSS4JConstants.SAML2_NS.equals(tokenType)) { dkSign.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); - dkSign.setCustomValueType(WSConstants.WSS_SAML2_KI_VALUE_TYPE); + dkSign.setCustomValueType(WSS4JConstants.WSS_SAML2_KI_VALUE_TYPE); } else if (policyToken instanceof UsernameToken) { - dkSign.setCustomValueType(WSConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); + dkSign.setCustomValueType(WSS4JConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); } else { dkSign.setCustomValueType(tokenType); } @@ -801,7 +802,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { if (policyToken instanceof X509Token) { if (isRequestor()) { sig.setCustomTokenValueType( - WSConstants.SOAPMESSAGE_NS11 + "#" + WSConstants.ENC_KEY_VALUE_TYPE + WSS4JConstants.SOAPMESSAGE_NS11 + "#" + WSS4JConstants.ENC_KEY_VALUE_TYPE ); sig.setKeyIdentifierType(type); } else { @@ -810,14 +811,14 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { sig.setKeyIdentifierType(WSConstants.ENCRYPTED_KEY_SHA1_IDENTIFIER); } } else if (policyToken instanceof UsernameToken) { - sig.setCustomTokenValueType(WSConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); + sig.setCustomTokenValueType(WSS4JConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); sig.setKeyIdentifierType(type); } else if (policyToken instanceof KerberosToken) { if (isRequestor()) { sig.setCustomTokenValueType(tok.getTokenType()); sig.setKeyIdentifierType(type); } else { - sig.setCustomTokenValueType(WSConstants.WSS_KRB_KI_VALUE_TYPE); + sig.setCustomTokenValueType(WSS4JConstants.WSS_KRB_KI_VALUE_TYPE); sig.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); sigTokId = tok.getSHA1(); } @@ -837,13 +838,13 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { sig.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); } else { String tokenType = tok.getTokenType(); - if (WSConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) - || WSConstants.SAML_NS.equals(tokenType)) { - sig.setCustomTokenValueType(WSConstants.WSS_SAML_KI_VALUE_TYPE); + if (WSS4JConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) + || WSS4JConstants.SAML_NS.equals(tokenType)) { + sig.setCustomTokenValueType(WSS4JConstants.WSS_SAML_KI_VALUE_TYPE); sig.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); - } else if (WSConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) - || WSConstants.SAML2_NS.equals(tokenType)) { - sig.setCustomTokenValueType(WSConstants.WSS_SAML2_KI_VALUE_TYPE); + } else if (WSS4JConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) + || WSS4JConstants.SAML2_NS.equals(tokenType)) { + sig.setCustomTokenValueType(WSS4JConstants.WSS_SAML2_KI_VALUE_TYPE); sig.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); } else { sig.setCustomTokenValueType(tokenType); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java ---------------------------------------------------------------------- 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 937cb22..776c2ec 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 @@ -41,6 +41,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.wss4j.AttachmentCallbackHandler; import org.apache.cxf.ws.security.wss4j.WSS4JUtils; import org.apache.wss4j.common.WSEncryptionPart; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.derivedKey.ConversationConstants; @@ -481,7 +482,7 @@ public class TransportBindingHandler extends AbstractBindingBuilder { } if (token instanceof UsernameToken) { - dkSign.setCustomValueType(WSConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); + dkSign.setCustomValueType(WSS4JConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); } // Set the algo info @@ -534,12 +535,12 @@ public class TransportBindingHandler extends AbstractBindingBuilder { sig.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); } else if (token instanceof UsernameToken) { sig.setCustomTokenId(secTok.getId()); - sig.setCustomTokenValueType(WSConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); + sig.setCustomTokenValueType(WSS4JConstants.WSS_USERNAME_TOKEN_VALUE_TYPE); int type = tokenIncluded ? WSConstants.CUSTOM_SYMM_SIGNING : WSConstants.CUSTOM_SYMM_SIGNING_DIRECT; sig.setKeyIdentifierType(type); } else if (secTok.getTokenType() == null) { - sig.setCustomTokenValueType(WSConstants.WSS_SAML_KI_VALUE_TYPE); + sig.setCustomTokenValueType(WSS4JConstants.WSS_SAML_KI_VALUE_TYPE); sig.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); } else { String id = secTok.getWsuId(); @@ -551,13 +552,13 @@ public class TransportBindingHandler extends AbstractBindingBuilder { sig.setKeyIdentifierType(WSConstants.CUSTOM_SYMM_SIGNING); } String tokenType = secTok.getTokenType(); - if (WSConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) - || WSConstants.SAML_NS.equals(tokenType)) { - sig.setCustomTokenValueType(WSConstants.WSS_SAML_KI_VALUE_TYPE); + if (WSS4JConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) + || WSS4JConstants.SAML_NS.equals(tokenType)) { + sig.setCustomTokenValueType(WSS4JConstants.WSS_SAML_KI_VALUE_TYPE); sig.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); - } else if (WSConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) - || WSConstants.SAML2_NS.equals(tokenType)) { - sig.setCustomTokenValueType(WSConstants.WSS_SAML2_KI_VALUE_TYPE); + } else if (WSS4JConstants.WSS_SAML2_TOKEN_TYPE.equals(tokenType) + || WSS4JConstants.SAML2_NS.equals(tokenType)) { + sig.setCustomTokenValueType(WSS4JConstants.WSS_SAML2_KI_VALUE_TYPE); sig.setKeyIdentifierType(WSConstants.CUSTOM_KEY_IDENTIFIER); } else { sig.setCustomTokenValueType(tokenType); @@ -627,7 +628,7 @@ public class TransportBindingHandler extends AbstractBindingBuilder { // Add timestamp if (timestampEl != null) { WSEncryptionPart timestampPart = - new WSEncryptionPart("Timestamp", WSConstants.WSU_NS, "Element"); + new WSEncryptionPart("Timestamp", WSS4JConstants.WSU_NS, "Element"); String id = addWsuIdToElement(timestampEl.getElement()); timestampPart.setId(id); timestampPart.setElement(timestampEl.getElement()); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java index 3c2a78f..0b5887a 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java @@ -47,6 +47,7 @@ import org.apache.cxf.message.Message; import org.apache.cxf.security.transport.TLSSessionInfo; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.policy.AssertionInfoMap; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.token.BinarySecurity; @@ -797,7 +798,7 @@ public abstract class AbstractSupportingTokenPolicyValidator extends AbstractSec List<WSSecurityEngineResult> encryptedResults) { if (signedRef.getProtectedElement() != null && "EncryptedData".equals(signedRef.getProtectedElement().getLocalName()) - && WSConstants.ENC_NS.equals(signedRef.getProtectedElement().getNamespaceURI())) { + && WSS4JConstants.ENC_NS.equals(signedRef.getProtectedElement().getNamespaceURI())) { String encryptedDataId = signedRef.getProtectedElement().getAttributeNS(null, "Id"); for (WSSecurityEngineResult result : encryptedResults) { http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/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 2046657..7fa098f 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 @@ -32,6 +32,7 @@ import javax.xml.namespace.QName; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.security.policy.PolicyUtils; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.principal.WSDerivedKeyTokenPrincipal; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSDataRef; @@ -167,11 +168,11 @@ public class AlgorithmSuitePolicyValidator extends AbstractSecurityPolicyValidat } for (String transformAlgorithm : transformAlgorithms) { if (!(algorithmPolicy.getC14n().getValue().equals(transformAlgorithm) - || WSConstants.C14N_EXCL_OMIT_COMMENTS.equals(transformAlgorithm) + || WSS4JConstants.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))) { + || WSS4JConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(transformAlgorithm) + || WSS4JConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(transformAlgorithm))) { ai.setNotAsserted("The transform algorithms do not match the requirement"); return false; } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java index d7d3f2f..b217cd8 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java @@ -35,6 +35,7 @@ import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.policy.PolicyUtils; import org.apache.cxf.ws.security.tokenstore.SecurityToken; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.token.BinarySecurity; @@ -207,10 +208,10 @@ public class IssuedTokenPolicyValidator extends AbstractSamlPolicyValidator { while (child != null) { if ("TokenType".equals(child.getLocalName())) { String content = child.getTextContent(); - if (WSConstants.WSS_SAML_TOKEN_TYPE.equals(content) + if (WSS4JConstants.WSS_SAML_TOKEN_TYPE.equals(content) && assertionWrapper.getSamlVersion() != SAMLVersion.VERSION_11) { return false; - } else if (WSConstants.WSS_SAML2_TOKEN_TYPE.equals(content) + } else if (WSS4JConstants.WSS_SAML2_TOKEN_TYPE.equals(content) && assertionWrapper.getSamlVersion() != SAMLVersion.VERSION_20) { return false; } @@ -275,9 +276,9 @@ public class IssuedTokenPolicyValidator extends AbstractSamlPolicyValidator { } } if (assertionWrapper.getSaml1() != null) { - token.setTokenType(WSConstants.WSS_SAML_TOKEN_TYPE); + token.setTokenType(WSS4JConstants.WSS_SAML_TOKEN_TYPE); } else if (assertionWrapper.getSaml2() != null) { - token.setTokenType(WSConstants.WSS_SAML2_TOKEN_TYPE); + token.setTokenType(WSS4JConstants.WSS_SAML2_TOKEN_TYPE); } token.setToken(assertionWrapper.getElement()); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java index d3e970a..cf9eb5f 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java @@ -33,6 +33,7 @@ import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.policy.PolicyUtils; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.token.BinarySecurity; @@ -198,16 +199,16 @@ public class X509TokenPolicyValidator extends AbstractSecurityPolicyValidator { if (signatureElement != null) { Element keyInfoElement = XMLUtils.getDirectChildElement( - signatureElement, "KeyInfo", WSConstants.SIG_NS + signatureElement, "KeyInfo", WSS4JConstants.SIG_NS ); if (keyInfoElement != null) { Element strElement = XMLUtils.getDirectChildElement( - keyInfoElement, "SecurityTokenReference", WSConstants.WSSE_NS + keyInfoElement, "SecurityTokenReference", WSS4JConstants.WSSE_NS ); if (strElement != null) { return XMLUtils.getDirectChildElement( - strElement, "KeyIdentifier", WSConstants.WSSE_NS + strElement, "KeyIdentifier", WSS4JConstants.WSSE_NS ); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java index 8b1a702..b886f9c 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java @@ -50,21 +50,21 @@ import org.apache.cxf.message.MessageImpl; import org.apache.cxf.phase.PhaseInterceptor; import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.test.AbstractCXFTest; -import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.common.WSS4JConstants; public abstract class AbstractSecurityTest extends AbstractCXFTest { public AbstractSecurityTest() { super(); - addNamespace("wsse", WSConstants.WSSE_NS); - addNamespace("wsse11", WSConstants.WSSE11_NS); - addNamespace("ds", WSConstants.SIG_NS); + addNamespace("wsse", WSS4JConstants.WSSE_NS); + addNamespace("wsse11", WSS4JConstants.WSSE11_NS); + addNamespace("ds", WSS4JConstants.SIG_NS); addNamespace("s", Soap11.getInstance().getNamespace()); - addNamespace("xenc", WSConstants.ENC_NS); - addNamespace("wsu", WSConstants.WSU_NS); - addNamespace("saml1", WSConstants.SAML_NS); - addNamespace("saml2", WSConstants.SAML2_NS); + addNamespace("xenc", WSS4JConstants.ENC_NS); + addNamespace("wsu", WSS4JConstants.WSU_NS); + addNamespace("saml1", WSS4JConstants.SAML_NS); + addNamespace("saml2", WSS4JConstants.SAML2_NS); } /** http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java index 2828c63..ef5d5fe 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java @@ -35,10 +35,12 @@ import org.apache.cxf.service.Service; import org.apache.cxf.transport.local.LocalTransportFactory; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.wss4j.common.ConfigurationConstants; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.CryptoFactory; -import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; + import org.junit.Test; @@ -67,7 +69,7 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest { Map<String, Object> properties = new HashMap<>(); properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN); - properties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT); + properties.put(ConfigurationConstants.PASSWORD_TYPE, WSS4JConstants.PW_TEXT); properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); properties.put(ConfigurationConstants.USER, "username"); @@ -115,7 +117,7 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest { Map<String, Object> properties = new HashMap<>(); properties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN); - properties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST); + properties.put(ConfigurationConstants.PASSWORD_TYPE, WSS4JConstants.PW_DIGEST); properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); properties.put(ConfigurationConstants.USER, "username"); @@ -199,8 +201,8 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest { properties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); properties.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties"); properties.put(ConfigurationConstants.USER, "myalias"); - properties.put(ConfigurationConstants.ENC_KEY_TRANSPORT, WSConstants.KEYTRANSPORT_RSA15); - properties.put(ConfigurationConstants.ENC_SYM_ALGO, WSConstants.TRIPLE_DES); + properties.put(ConfigurationConstants.ENC_KEY_TRANSPORT, WSS4JConstants.KEYTRANSPORT_RSA15); + properties.put(ConfigurationConstants.ENC_SYM_ALGO, WSS4JConstants.TRIPLE_DES); WSS4JOutInterceptor ohandler = new WSS4JOutInterceptor(properties); client.getOutInterceptors().add(ohandler); @@ -519,7 +521,7 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties outProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); actions.add(WSSConstants.SIGNATURE_CONFIRMATION); outProperties.setActions(actions); outProperties.setSignatureUser("myalias"); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java index 39c4015..ceb223b 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java @@ -37,6 +37,8 @@ import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.xml.security.stax.ext.SecurePart; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; + import org.junit.Test; @@ -70,10 +72,10 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.setEncryptionUser("myalias"); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties outCryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -167,14 +169,14 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.USERNAMETOKEN); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.addEncryptionPart( new SecurePart(new QName(WSSConstants.NS_WSSE10, "UsernameToken"), SecurePart.Modifier.Element) ); properties.setEncryptionUser("myalias"); properties.setTokenUser("username"); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties outCryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -222,7 +224,7 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.USERNAMETOKEN); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureUser("myalias"); @@ -282,7 +284,7 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureUser("myalias"); @@ -369,7 +371,7 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.TIMESTAMP); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.addSignaturePart( new SecurePart(new QName(WSSConstants.NS_WSU10, "Timestamp"), SecurePart.Modifier.Element) @@ -415,12 +417,12 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.ENCRYPT); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setSignatureUser("myalias"); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties outCryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java index 8a3617f..8eb454d 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java @@ -41,6 +41,8 @@ import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.xml.security.stax.ext.SecurePart; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; + import org.junit.Test; /** @@ -86,7 +88,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.USERNAMETOKEN); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); inProperties.setActions(actions); try { @@ -158,7 +160,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { WSSSecurityProperties inProperties = new WSSSecurityProperties(); inProperties.setCallbackHandler(new TestPwdCallback()); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); inProperties.setActions(actions); Properties cryptoProperties = CryptoFactory.getProperties("insecurity.properties", this.getClass().getClassLoader()); @@ -176,10 +178,10 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.setEncryptionUser("myalias"); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties outCryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -191,8 +193,8 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { assertEquals("test", echo.echo("test")); actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.ENCRYPT); + actions.add(XMLSecurityConstants.SIGNATURE); inProperties.setActions(actions); try { @@ -229,7 +231,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { outConfig.put(ConfigurationConstants.ENCRYPTION_USER, "myalias"); outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); outConfig.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties"); - outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, WSSConstants.NS_XENC_AES128); + outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, XMLSecurityConstants.NS_XENC_AES128); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig); client.getOutInterceptors().add(ohandler); @@ -260,7 +262,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { WSSSecurityProperties inProperties = new WSSSecurityProperties(); inProperties.setCallbackHandler(new TestPwdCallback()); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); actions.add(WSSConstants.USERNAMETOKEN); inProperties.setActions(actions); Properties cryptoProperties = @@ -280,14 +282,14 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.USERNAMETOKEN); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.addEncryptionPart( new SecurePart(new QName(WSSConstants.NS_WSSE10, "UsernameToken"), SecurePart.Modifier.Element) ); properties.setEncryptionUser("myalias"); properties.setTokenUser("username"); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties outCryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -335,7 +337,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { outConfig.put(ConfigurationConstants.ENCRYPTION_USER, "myalias"); outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); outConfig.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties"); - outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, WSSConstants.NS_XENC_AES128); + outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, XMLSecurityConstants.NS_XENC_AES128); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig); client.getOutInterceptors().add(ohandler); @@ -352,7 +354,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { Properties cryptoProperties = CryptoFactory.getProperties("insecurity.properties", this.getClass().getClassLoader()); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); inProperties.setActions(actions); inProperties.setSignatureVerificationCryptoProperties(cryptoProperties); WSS4JStaxInInterceptor inhandler = new WSS4JStaxInInterceptor(inProperties); @@ -371,7 +373,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureUser("myalias"); @@ -385,8 +387,8 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { assertEquals("test", echo.echo("test")); actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.SIGNATURE); + actions.add(XMLSecurityConstants.ENCRYPT); inProperties.setActions(actions); try { @@ -515,7 +517,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { inProperties.setCallbackHandler(new TestPwdCallback()); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.TIMESTAMP); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); inProperties.setActions(actions); Properties cryptoProperties = CryptoFactory.getProperties("insecurity.properties", this.getClass().getClassLoader()); @@ -534,7 +536,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.TIMESTAMP); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.addSignaturePart( new SecurePart(new QName(WSSConstants.NS_WSU10, "Timestamp"), SecurePart.Modifier.Element) @@ -604,8 +606,8 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { WSSSecurityProperties inProperties = new WSSSecurityProperties(); inProperties.setCallbackHandler(new TestPwdCallback()); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.ENCRYPT); + actions.add(XMLSecurityConstants.SIGNATURE); inProperties.setActions(actions); Properties cryptoProperties = CryptoFactory.getProperties("insecurity.properties", this.getClass().getClassLoader()); @@ -624,12 +626,12 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.ENCRYPT); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setSignatureUser("myalias"); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties outCryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -676,7 +678,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest { outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); outConfig.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties"); outConfig.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties"); - outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, WSSConstants.NS_XENC_AES128); + outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, XMLSecurityConstants.NS_XENC_AES128); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig); client.getOutInterceptors().add(ohandler); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java index 43ecb83..e9a49b9 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java @@ -47,6 +47,8 @@ import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.ext.SecurePart; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; + import org.junit.Test; @@ -438,9 +440,9 @@ public class StaxRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); properties.setEncryptionUser("myalias"); Properties outCryptoProperties = @@ -474,7 +476,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest { Map<String, Object> outConfig = new HashMap<>(); outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT); outConfig.put(ConfigurationConstants.ENCRYPTION_USER, "myalias"); - outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, WSSConstants.NS_XENC_AES128); + outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, XMLSecurityConstants.NS_XENC_AES128); outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); outConfig.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties"); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig); @@ -507,14 +509,14 @@ public class StaxRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.USERNAMETOKEN); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.addEncryptionPart( new SecurePart(new QName(WSSConstants.NS_WSSE10, "UsernameToken"), SecurePart.Modifier.Element) ); properties.setEncryptionUser("myalias"); properties.setTokenUser("username"); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties outCryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -557,7 +559,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest { outConfig.put(ConfigurationConstants.ENCRYPTION_USER, "myalias"); outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); outConfig.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties"); - outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, WSSConstants.NS_XENC_AES128); + outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, XMLSecurityConstants.NS_XENC_AES128); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig); client.getOutInterceptors().add(ohandler); @@ -590,7 +592,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureUser("myalias"); @@ -664,7 +666,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.USERNAMETOKEN); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureUser("myalias"); @@ -803,7 +805,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.TIMESTAMP); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.addSignaturePart( new SecurePart(new QName(WSSConstants.NS_WSU10, "Timestamp"), SecurePart.Modifier.Element) @@ -886,7 +888,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureUser("alice"); @@ -963,12 +965,12 @@ public class StaxRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.ENCRYPT); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setSignatureUser("myalias"); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties outCryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -1010,7 +1012,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest { outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); outConfig.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties"); outConfig.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties"); - outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, WSSConstants.NS_XENC_AES128); + outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, XMLSecurityConstants.NS_XENC_AES128); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig); client.getOutInterceptors().add(ohandler); @@ -1033,7 +1035,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties outProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); actions.add(WSSConstants.SIGNATURE_CONFIRMATION); outProperties.setActions(actions); outProperties.setSignatureUser("myalias"); @@ -1054,7 +1056,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureUser("myalias"); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java index dc5b125..0c592e9 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java @@ -38,6 +38,8 @@ import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; + import org.junit.Test; @@ -68,13 +70,13 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setEncryptionKeyIdentifier( WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE ); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties cryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -107,13 +109,13 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setEncryptionKeyIdentifier( WSSecurityTokenConstants.KeyIdentifier_IssuerSerial ); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties cryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -146,13 +148,13 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setEncryptionKeyIdentifier( WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER ); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties cryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -186,13 +188,13 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setEncryptionKeyIdentifier( WSSecurityTokenConstants.KeyIdentifier_X509KeyIdentifier ); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties cryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -225,13 +227,13 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setEncryptionKeyIdentifier( WSSecurityTokenConstants.KEYIDENTIFIER_ENCRYPTED_KEY_SHA1_IDENTIFIER ); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties cryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java index aa10704..e9491d1 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java @@ -37,12 +37,14 @@ import org.apache.cxf.service.Service; import org.apache.cxf.transport.local.LocalTransportFactory; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.wss4j.common.ConfigurationConstants; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.CryptoFactory; -import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.ext.SecurePart; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; + import org.junit.Test; @@ -58,7 +60,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { Map<String, Object> inProperties = new HashMap<>(); inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN); - inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT); + inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSS4JConstants.PW_TEXT); inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties); service.getInInterceptors().add(inInterceptor); @@ -84,7 +86,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { // Negative test for wrong password type service.getInInterceptors().remove(inInterceptor); - inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST); + inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSS4JConstants.PW_DIGEST); inInterceptor = new WSS4JInInterceptor(inProperties); service.getInInterceptors().add(inInterceptor); @@ -108,7 +110,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { Map<String, Object> inProperties = new HashMap<>(); inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN); - inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT); + inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSS4JConstants.PW_TEXT); inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties); service.getInInterceptors().add(inInterceptor); @@ -133,7 +135,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { // Negative test for wrong password type service.getInInterceptors().remove(inInterceptor); - inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST); + inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSS4JConstants.PW_DIGEST); inInterceptor = new WSS4JInInterceptor(inProperties); service.getInInterceptors().add(inInterceptor); @@ -156,7 +158,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { Map<String, Object> inProperties = new HashMap<>(); inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN); - inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST); + inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSS4JConstants.PW_DIGEST); inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties); service.getInInterceptors().add(inInterceptor); @@ -182,7 +184,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { // Negative test for wrong password type service.getInInterceptors().remove(inInterceptor); - inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT); + inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSS4JConstants.PW_TEXT); inInterceptor = new WSS4JInInterceptor(inProperties); service.getInInterceptors().add(inInterceptor); @@ -205,7 +207,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { Map<String, Object> inProperties = new HashMap<>(); inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN); - inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST); + inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSS4JConstants.PW_DIGEST); inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties); service.getInInterceptors().add(inInterceptor); @@ -230,7 +232,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { // Negative test for wrong password type service.getInInterceptors().remove(inInterceptor); - inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT); + inProperties.put(ConfigurationConstants.PASSWORD_TYPE, WSS4JConstants.PW_TEXT); inInterceptor = new WSS4JInInterceptor(inProperties); service.getInInterceptors().add(inInterceptor); @@ -267,10 +269,10 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.setEncryptionUser("myalias"); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties cryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -306,7 +308,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { outConfig.put(ConfigurationConstants.ENCRYPTION_USER, "myalias"); outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); outConfig.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties"); - outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, WSSConstants.NS_XENC_AES128); + outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, XMLSecurityConstants.NS_XENC_AES128); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig); client.getOutInterceptors().add(ohandler); @@ -335,7 +337,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.setEncryptionUser("myalias"); @@ -390,7 +392,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { ConfigurationConstants.ENC_SYM_ALGO, "http://www.w3.org/2001/04/xmlenc#tripledes-cbc"; ); - outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, WSSConstants.NS_XENC_AES128); + outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, XMLSecurityConstants.NS_XENC_AES128); outConfig.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties"); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig); @@ -432,14 +434,14 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.USERNAMETOKEN); - actions.add(WSSConstants.ENCRYPT); + actions.add(XMLSecurityConstants.ENCRYPT); properties.setActions(actions); properties.addEncryptionPart( new SecurePart(new QName(WSSConstants.NS_WSSE10, "UsernameToken"), SecurePart.Modifier.Element) ); properties.setEncryptionUser("myalias"); properties.setTokenUser("username"); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties cryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -486,7 +488,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { outConfig.put(ConfigurationConstants.ENCRYPTION_USER, "myalias"); outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); outConfig.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties"); - outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, WSSConstants.NS_XENC_AES128); + outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, XMLSecurityConstants.NS_XENC_AES128); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig); client.getOutInterceptors().add(ohandler); @@ -515,7 +517,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureUser("myalias"); @@ -585,7 +587,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.USERNAMETOKEN); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureUser("myalias"); @@ -763,7 +765,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); actions.add(WSSConstants.TIMESTAMP); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.addSignaturePart( new SecurePart(new QName(WSSConstants.NS_WSU10, "Timestamp"), SecurePart.Modifier.Element) @@ -849,7 +851,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); actions.add(WSSConstants.TIMESTAMP); properties.setActions(actions); properties.addSignaturePart( @@ -896,7 +898,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureUser("alice"); @@ -973,12 +975,12 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.ENCRYPT); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.ENCRYPT); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setSignatureUser("myalias"); - properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); + properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128); Properties cryptoProperties = CryptoFactory.getProperties("outsecurity.properties", this.getClass().getClassLoader()); @@ -1024,7 +1026,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback()); outConfig.put(ConfigurationConstants.SIG_PROP_FILE, "outsecurity.properties"); outConfig.put(ConfigurationConstants.ENC_PROP_FILE, "outsecurity.properties"); - outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, WSSConstants.NS_XENC_AES128); + outConfig.put(ConfigurationConstants.ENC_SYM_ALGO, XMLSecurityConstants.NS_XENC_AES128); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig); client.getOutInterceptors().add(ohandler); @@ -1063,7 +1065,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureUser("myalias"); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java index f2d987b..e0827d2 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java @@ -38,6 +38,8 @@ import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; + import org.junit.Test; @@ -68,7 +70,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureKeyIdentifier( WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE @@ -106,7 +108,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureKeyIdentifier( WSSecurityTokenConstants.KeyIdentifier_IssuerSerial @@ -144,7 +146,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureKeyIdentifier( WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER @@ -183,7 +185,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureKeyIdentifier( WSSecurityTokenConstants.KeyIdentifier_X509KeyIdentifier @@ -222,7 +224,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest { WSSSecurityProperties properties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>(); - actions.add(WSSConstants.SIGNATURE); + actions.add(XMLSecurityConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureKeyIdentifier( WSSecurityTokenConstants.KeyIdentifier_KeyValue http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java index a0242fd..6db3d82 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java @@ -36,8 +36,7 @@ import org.apache.cxf.service.Service; import org.apache.cxf.transport.local.LocalConduit; import org.apache.cxf.transport.local.LocalTransportFactory; import org.apache.wss4j.common.ConfigurationConstants; -import org.apache.wss4j.dom.WSConstants; - +import org.apache.wss4j.common.WSS4JConstants; import org.junit.Test; public class UserNameTokenAuthorizationTest extends AbstractSecurityTest { @@ -81,14 +80,14 @@ public class UserNameTokenAuthorizationTest extends AbstractSecurityTest { if (digest) { wsOut.setProperty("password", "myAliasPassword"); } else { - wsOut.setProperty(ConfigurationConstants.PASSWORD_TYPE, WSConstants.PW_TEXT); + wsOut.setProperty(ConfigurationConstants.PASSWORD_TYPE, WSS4JConstants.PW_TEXT); } if (encryptUsernameTokenOnly) { wsOut.setProperty(ConfigurationConstants.ENCRYPTION_USER, "myalias"); wsOut.setProperty( ConfigurationConstants.ENCRYPTION_PARTS, - "{Content}{" + WSConstants.WSSE_NS + "}UsernameToken" + "{Content}{" + WSS4JConstants.WSSE_NS + "}UsernameToken" ); } wsOut.setProperty(ConfigurationConstants.PW_CALLBACK_CLASS, TestPwdCallback.class.getName());
