Repository: cxf Updated Branches: refs/heads/master 6994a35ea -> 6d637dcb2
Update after latest WSS4J master changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6d637dcb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6d637dcb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6d637dcb Branch: refs/heads/master Commit: 6d637dcb21bb4a17b9c581748e85bf5a82f6c9f8 Parents: 6994a35 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Mar 24 15:33:06 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Mar 24 15:33:20 2015 +0000 ---------------------------------------------------------------------- .../cxf/ws/security/kerberos/KerberosClient.java | 4 ++-- .../KerberosTokenInterceptorProvider.java | 4 ++-- .../ws/security/policy/interceptors/STSInvoker.java | 6 +++--- .../interceptors/SpnegoContextTokenInInterceptor.java | 3 +-- .../cxf/ws/security/tokenstore/SecurityToken.java | 2 +- .../cxf/ws/security/trust/AbstractSTSClient.java | 5 ++--- .../cxf/ws/security/trust/STSStaxTokenValidator.java | 6 +++--- .../delegation/ReceivedTokenCallbackHandler.java | 3 +-- .../ws/security/wss4j/TokenStoreCallbackHandler.java | 4 ++-- .../ws/security/wss4j/UsernameTokenInterceptor.java | 4 ++-- .../wss4j/policyhandlers/AbstractBindingBuilder.java | 14 +++++++------- .../wss4j/policyhandlers/SymmetricBindingHandler.java | 8 ++++---- .../wss4j/policyhandlers/TransportBindingHandler.java | 7 ++++--- .../AbstractBindingPolicyValidator.java | 7 ++++--- .../AbstractSupportingTokenPolicyValidator.java | 7 ++++--- .../policyvalidators/IssuedTokenPolicyValidator.java | 3 ++- .../KerberosTokenPolicyValidator.java | 6 +++--- .../wss4j/policyvalidators/LayoutPolicyValidator.java | 7 ++++--- .../policyvalidators/X509TokenPolicyValidator.java | 7 ++++--- .../sts/token/validator/UsernameTokenValidator.java | 2 +- .../cxf/sts/token/validator/X509TokenValidator.java | 4 ++-- .../apache/cxf/sts/operation/DummyTokenProvider.java | 3 +-- .../cxf/systest/sts/batch/SimpleBatchSTSClient.java | 5 ++--- .../sts/deployment/CustomBSTTokenProvider.java | 2 +- .../systest/ws/tokens/BinarySecurityTokenTest.java | 2 +- .../apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java | 2 +- 26 files changed, 64 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java index 9317940..ea5f62e 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/kerberos/KerberosClient.java @@ -33,9 +33,9 @@ import org.apache.cxf.message.Message; import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.tokenstore.SecurityToken; +import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.dom.WSSConfig; import org.apache.wss4j.dom.message.token.KerberosSecurity; -import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.xml.security.utils.Base64; import org.ietf.jgss.GSSCredential; @@ -163,7 +163,7 @@ public class KerberosClient implements Configurable { token.setKey(secretKey); token.setSecret(secretKey.getEncoded()); } - String sha1 = Base64.encode(WSSecurityUtil.generateDigest(bst.getToken())); + String sha1 = Base64.encode(KeyUtils.generateDigest(bst.getToken())); token.setSHA1(sha1); token.setTokenType(bst.getValueType()); http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java index de9d1c6..03fe704 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/KerberosTokenInterceptorProvider.java @@ -55,9 +55,9 @@ import org.apache.cxf.ws.security.wss4j.policyvalidators.KerberosTokenPolicyVali import org.apache.cxf.ws.security.wss4j.policyvalidators.PolicyValidatorParameters; import org.apache.cxf.ws.security.wss4j.policyvalidators.SecurityPolicyValidator; import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; @@ -262,7 +262,7 @@ public class KerberosTokenInterceptorProvider extends AbstractPolicyInterceptorP byte[] ticket = kerberosToken.getBinaryContent(); try { - token.setSHA1(Base64.encode(WSSecurityUtil.generateDigest(ticket))); + token.setSHA1(Base64.encode(KeyUtils.generateDigest(ticket))); } catch (WSSecurityException e) { // Just consume this for now as it isn't critical... } http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java index a4ecd86..4aa5a73 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java @@ -44,13 +44,13 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.tokenstore.TokenStore; import org.apache.cxf.ws.security.trust.STSUtils; +import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.derivedKey.P_SHA1; import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.token.Reference; +import org.apache.wss4j.common.token.SecurityTokenReference; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.bsp.BSPEnforcer; -import org.apache.wss4j.dom.message.token.Reference; import org.apache.wss4j.dom.message.token.SecurityContextToken; -import org.apache.wss4j.dom.message.token.SecurityTokenReference; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.dom.util.XmlSchemaDateFormat; import org.apache.xml.security.utils.Base64; http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java index aeafc8f..d7346a6 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SpnegoContextTokenInInterceptor.java @@ -58,7 +58,6 @@ import org.apache.neethi.Policy; import org.apache.wss4j.common.spnego.SpnegoTokenContext; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSConfig; -import org.apache.wss4j.dom.message.token.BinarySecurity; import org.apache.wss4j.dom.message.token.SecurityContextToken; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.policy.SPConstants; @@ -279,7 +278,7 @@ class SpnegoContextTokenInInterceptor extends AbstractPhaseInterceptor<SoapMessa throw new Exception("No BinaryExchange element received"); } String encoding = binaryExchange.getAttributeNS(null, "EncodingType"); - if (!BinarySecurity.BASE64_ENCODING.equals(encoding)) { + if (!WSConstants.BASE64_ENCODING.equals(encoding)) { throw new Exception("Unknown encoding type: " + encoding); } http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java index fd67795..b778bcd 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java @@ -34,9 +34,9 @@ import org.apache.cxf.security.SecurityContext; import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.staxutils.W3CDOMStreamWriter; import org.apache.wss4j.common.crypto.Crypto; +import org.apache.wss4j.common.token.Reference; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.message.token.Reference; import org.apache.wss4j.dom.util.XmlSchemaDateFormat; http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java index 9884c94..3603a46 100755 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java @@ -115,14 +115,13 @@ import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; import org.apache.wss4j.common.derivedKey.P_SHA1; import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.token.Reference; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSDocInfo; import org.apache.wss4j.dom.WSSConfig; import org.apache.wss4j.dom.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.message.token.BinarySecurity; -import org.apache.wss4j.dom.message.token.Reference; import org.apache.wss4j.dom.processor.EncryptedKeyProcessor; import org.apache.wss4j.dom.processor.X509Util; import org.apache.wss4j.dom.util.WSSecurityUtil; @@ -951,7 +950,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv W3CDOMStreamWriter writer ) throws XMLStreamException { writer.writeStartElement("wst", "BinaryExchange", namespace); - writer.writeAttribute("EncodingType", BinarySecurity.BASE64_ENCODING); + writer.writeAttribute("EncodingType", WSConstants.BASE64_ENCODING); writer.writeAttribute("ValueType", namespace + "/spnego"); writer.writeCharacters(binaryExchange); writer.writeEndElement(); http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java index f144182..0e1f8eb 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java @@ -34,11 +34,11 @@ import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; -import org.apache.wss4j.dom.message.token.BinarySecurity; +import org.apache.wss4j.common.token.BinarySecurity; +import org.apache.wss4j.common.token.PKIPathSecurity; +import org.apache.wss4j.common.token.X509Security; import org.apache.wss4j.dom.message.token.KerberosSecurity; -import org.apache.wss4j.dom.message.token.PKIPathSecurity; import org.apache.wss4j.dom.message.token.UsernameToken; -import org.apache.wss4j.dom.message.token.X509Security; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSUtils; import org.apache.wss4j.stax.impl.securityToken.KerberosServiceSecurityTokenImpl; http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java index 17907ef..c5e1fb8 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/ReceivedTokenCallbackHandler.java @@ -28,17 +28,16 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; import org.w3c.dom.Element; - import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.message.Message; import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.wss4j.common.saml.SamlAssertionWrapper; +import org.apache.wss4j.common.token.BinarySecurity; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.dom.message.token.BinarySecurity; import org.apache.wss4j.dom.message.token.UsernameToken; /** http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/TokenStoreCallbackHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/TokenStoreCallbackHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/TokenStoreCallbackHandler.java index 361b728..0d7495a 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/TokenStoreCallbackHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/TokenStoreCallbackHandler.java @@ -29,7 +29,7 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.tokenstore.TokenStore; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.dom.util.WSSecurityUtil; +import org.apache.wss4j.common.util.KeyUtils; import org.apache.xml.security.utils.Base64; public class TokenStoreCallbackHandler implements CallbackHandler { @@ -67,7 +67,7 @@ public class TokenStoreCallbackHandler implements CallbackHandler { private static String getSHA1(byte[] input) { try { - byte[] digestBytes = WSSecurityUtil.generateDigest(input); + byte[] digestBytes = KeyUtils.generateDigest(input); return Base64.encode(digestBytes); } catch (WSSecurityException e) { //REVISIT http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java index 6ff5b9b..4bec8ae 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java @@ -47,6 +47,7 @@ import org.apache.cxf.ws.policy.AssertionInfo; 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.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.cache.ReplayCache; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; @@ -58,7 +59,6 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSDocInfo; import org.apache.wss4j.dom.WSSConfig; import org.apache.wss4j.dom.WSSecurityEngineResult; -import org.apache.wss4j.dom.bsp.BSPEnforcer; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; @@ -225,7 +225,7 @@ public class UsernameTokenInterceptor extends AbstractTokenInterceptor { protected UsernameTokenPrincipal parseTokenAndCreatePrincipal(Element tokenElement, boolean bspCompliant) throws WSSecurityException, Base64DecodingException { - BSPEnforcer bspEnforcer = new BSPEnforcer(!bspCompliant); + BSPEnforcer bspEnforcer = new org.apache.wss4j.common.bsp.BSPEnforcer(!bspCompliant); org.apache.wss4j.dom.message.token.UsernameToken ut = new org.apache.wss4j.dom.message.token.UsernameToken(tokenElement, false, bspEnforcer); http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java ---------------------------------------------------------------------- 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 5b96a07..8b902a0 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 @@ -77,6 +77,7 @@ import org.apache.cxf.ws.security.wss4j.WSS4JUtils; import org.apache.cxf.wsdl.WSDLConstants; import org.apache.neethi.Assertion; import org.apache.wss4j.common.WSEncryptionPart; +import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; @@ -90,12 +91,14 @@ import org.apache.wss4j.common.saml.SAMLCallback; import org.apache.wss4j.common.saml.SAMLUtil; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.bean.Version; +import org.apache.wss4j.common.token.BinarySecurity; +import org.apache.wss4j.common.token.SecurityTokenReference; +import org.apache.wss4j.common.token.X509Security; import org.apache.wss4j.common.util.Loader; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSConfig; import org.apache.wss4j.dom.WSSecurityEngineResult; -import org.apache.wss4j.dom.bsp.BSPEnforcer; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.message.CallbackLookup; @@ -107,9 +110,6 @@ import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.dom.message.WSSecSignatureConfirmation; import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.dom.message.WSSecUsernameToken; -import org.apache.wss4j.dom.message.token.BinarySecurity; -import org.apache.wss4j.dom.message.token.SecurityTokenReference; -import org.apache.wss4j.dom.message.token.X509Security; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.SPConstants.IncludeTokenType; @@ -687,8 +687,8 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle secRefSaml.setID(secRefID); if (useDirectReferenceToAssertion) { - org.apache.wss4j.dom.message.token.Reference ref = - new org.apache.wss4j.dom.message.token.Reference(doc); + org.apache.wss4j.common.token.Reference ref = + new org.apache.wss4j.common.token.Reference(doc); ref.setURI("#" + id); if (saml1) { ref.setValueType(WSConstants.WSS_SAML_KI_VALUE_TYPE); @@ -1371,7 +1371,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle if (alsoIncludeToken) { X509Certificate encCert = getEncryptCert(crypto, encrUser); BinarySecurity bstToken = new X509Security(saaj.getSOAPPart()); - ((X509Security) bstToken).setX509Certificate(encCert); + ((X509Security)bstToken).setX509Certificate(encCert); bstToken.addWSUNamespace(); bstToken.setID(wssConfig.getIdAllocator().createSecureId("X509-", encCert)); WSSecurityUtil.prependChildElement( http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/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 ca64d18..65d4a2f 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 @@ -42,13 +42,15 @@ import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.tokenstore.TokenStore; import org.apache.cxf.ws.security.wss4j.AttachmentCallbackHandler; import org.apache.wss4j.common.WSEncryptionPart; +import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.derivedKey.ConversationConstants; import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.token.SecurityTokenReference; +import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSConfig; import org.apache.wss4j.dom.WSSecurityEngineResult; -import org.apache.wss4j.dom.bsp.BSPEnforcer; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; import org.apache.wss4j.dom.message.WSSecBase; @@ -60,8 +62,6 @@ import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.dom.message.WSSecUsernameToken; -import org.apache.wss4j.dom.message.token.SecurityTokenReference; -import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding; import org.apache.wss4j.policy.model.AbstractToken; @@ -897,7 +897,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { private static String getSHA1(byte[] input) { try { - byte[] digestBytes = WSSecurityUtil.generateDigest(input); + byte[] digestBytes = KeyUtils.generateDigest(input); return Base64.encode(digestBytes); } catch (WSSecurityException e) { //REVISIT http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/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 a3b65aa..e86ca83 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 @@ -31,6 +31,7 @@ import javax.xml.soap.SOAPMessage; import org.w3c.dom.Document; import org.w3c.dom.Element; + import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.ws.policy.AssertionInfo; @@ -38,21 +39,21 @@ import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.wss4j.common.WSEncryptionPart; +import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.derivedKey.ConversationConstants; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SamlAssertionWrapper; +import org.apache.wss4j.common.token.SecurityTokenReference; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSConfig; -import org.apache.wss4j.dom.bsp.BSPEnforcer; import org.apache.wss4j.dom.message.WSSecDKSign; import org.apache.wss4j.dom.message.WSSecEncryptedKey; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.dom.message.WSSecTimestamp; import org.apache.wss4j.dom.message.WSSecUsernameToken; -import org.apache.wss4j.dom.message.token.SecurityTokenReference; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; @@ -74,7 +75,7 @@ import org.apache.wss4j.policy.model.SupportingTokens; import org.apache.wss4j.policy.model.TransportBinding; import org.apache.wss4j.policy.model.TransportToken; import org.apache.wss4j.policy.model.UsernameToken; -import org.apache.wss4j.policy.model.X509Token;; +import org.apache.wss4j.policy.model.X509Token; /** * http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java index 6ca27a1..5dda038 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java @@ -26,6 +26,7 @@ import java.util.List; import javax.xml.namespace.QName; import org.w3c.dom.Element; + import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.message.Message; @@ -34,13 +35,13 @@ import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.policy.PolicyUtils; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; +import org.apache.wss4j.common.token.BinarySecurity; +import org.apache.wss4j.common.token.PKIPathSecurity; +import org.apache.wss4j.common.token.X509Security; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSDataRef; import org.apache.wss4j.dom.WSSecurityEngineResult; -import org.apache.wss4j.dom.message.token.BinarySecurity; -import org.apache.wss4j.dom.message.token.PKIPathSecurity; import org.apache.wss4j.dom.message.token.Timestamp; -import org.apache.wss4j.dom.message.token.X509Security; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding; http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/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 93d60c2..709998d 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 @@ -39,6 +39,7 @@ import javax.xml.xpath.XPathFactory; import org.w3c.dom.Element; import org.w3c.dom.NodeList; + import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.DOMUtils; @@ -49,14 +50,14 @@ import org.apache.cxf.ws.policy.AssertionInfo; import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; +import org.apache.wss4j.common.token.BinarySecurity; +import org.apache.wss4j.common.token.PKIPathSecurity; +import org.apache.wss4j.common.token.X509Security; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSDataRef; import org.apache.wss4j.dom.WSSecurityEngine; import org.apache.wss4j.dom.WSSecurityEngineResult; -import org.apache.wss4j.dom.message.token.BinarySecurity; import org.apache.wss4j.dom.message.token.KerberosSecurity; -import org.apache.wss4j.dom.message.token.PKIPathSecurity; -import org.apache.wss4j.dom.message.token.X509Security; import org.apache.wss4j.policy.SPConstants; import org.apache.wss4j.policy.model.AbstractSecurityAssertion; import org.apache.wss4j.policy.model.EncryptedElements; http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/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 c41c679..3335d88 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 @@ -28,6 +28,7 @@ import java.util.List; import javax.xml.namespace.QName; import org.w3c.dom.Element; + import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.security.transport.TLSSessionInfo; import org.apache.cxf.ws.policy.AssertionInfo; @@ -37,9 +38,9 @@ import org.apache.cxf.ws.security.policy.PolicyUtils; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; +import org.apache.wss4j.common.token.BinarySecurity; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSecurityEngineResult; -import org.apache.wss4j.dom.message.token.BinarySecurity; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java index 0cc5a64..f7710fb 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java @@ -32,11 +32,11 @@ import org.apache.cxf.ws.security.policy.PolicyUtils; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.tokenstore.TokenStoreUtils; import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.token.BinarySecurity; +import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSecurityEngineResult; -import org.apache.wss4j.dom.message.token.BinarySecurity; import org.apache.wss4j.dom.message.token.KerberosSecurity; -import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.SPConstants; @@ -166,7 +166,7 @@ public class KerberosTokenPolicyValidator extends AbstractSecurityPolicyValidato token.setTokenType(binarySecurityToken.getValueType()); byte[] tokenBytes = binarySecurityToken.getToken(); try { - token.setSHA1(Base64.encode(WSSecurityUtil.generateDigest(tokenBytes))); + token.setSHA1(Base64.encode(KeyUtils.generateDigest(tokenBytes))); } catch (WSSecurityException e) { // Just consume this for now as it isn't critical... } http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java index c4322ff..a0b1b4b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java @@ -27,6 +27,7 @@ import java.util.List; import javax.xml.namespace.QName; import org.w3c.dom.Element; + import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.ws.policy.AssertionInfo; @@ -34,13 +35,13 @@ import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.policy.PolicyUtils; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; +import org.apache.wss4j.common.token.BinarySecurity; +import org.apache.wss4j.common.token.PKIPathSecurity; +import org.apache.wss4j.common.token.X509Security; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSDataRef; import org.apache.wss4j.dom.WSSecurityEngine; import org.apache.wss4j.dom.WSSecurityEngineResult; -import org.apache.wss4j.dom.message.token.BinarySecurity; -import org.apache.wss4j.dom.message.token.PKIPathSecurity; -import org.apache.wss4j.dom.message.token.X509Security; import org.apache.wss4j.policy.SP11Constants; import org.apache.wss4j.policy.SP12Constants; import org.apache.wss4j.policy.model.Layout; http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/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 123cad8..f3d9195 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 @@ -28,17 +28,18 @@ import java.util.logging.Logger; import javax.xml.namespace.QName; import org.w3c.dom.Element; + 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.bsp.BSPEnforcer; import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.token.BinarySecurity; +import org.apache.wss4j.common.token.X509Security; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSecurityEngineResult; -import org.apache.wss4j.dom.bsp.BSPEnforcer; -import org.apache.wss4j.dom.message.token.BinarySecurity; -import org.apache.wss4j.dom.message.token.X509Security; import org.apache.wss4j.dom.str.STRParser; import org.apache.wss4j.dom.util.WSSecurityUtil; import org.apache.wss4j.policy.SP11Constants; http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java index a321ade..7b51669 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java @@ -46,13 +46,13 @@ import org.apache.cxf.sts.token.realm.UsernameTokenRealmCodec; import org.apache.cxf.ws.security.sts.provider.model.ObjectFactory; import org.apache.cxf.ws.security.sts.provider.model.secext.UsernameTokenType; import org.apache.cxf.ws.security.tokenstore.SecurityToken; +import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.principal.WSUsernameTokenPrincipalImpl; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSConfig; -import org.apache.wss4j.dom.bsp.BSPEnforcer; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.message.token.UsernameToken; import org.apache.wss4j.dom.validate.Credential; http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java index 823bd6e..d07b109 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java @@ -38,11 +38,11 @@ import org.apache.cxf.sts.token.realm.CertConstraintsParser; import org.apache.cxf.ws.security.sts.provider.model.secext.BinarySecurityTokenType; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.token.BinarySecurity; +import org.apache.wss4j.common.token.X509Security; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSConfig; import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.message.token.BinarySecurity; -import org.apache.wss4j.dom.message.token.X509Security; import org.apache.wss4j.dom.validate.Credential; import org.apache.wss4j.dom.validate.SignatureTrustValidator; import org.apache.wss4j.dom.validate.Validator; http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java index 0ff209e..14b98e8 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/DummyTokenProvider.java @@ -20,14 +20,13 @@ package org.apache.cxf.sts.operation; import org.w3c.dom.Document; - import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.sts.token.provider.TokenProvider; import org.apache.cxf.sts.token.provider.TokenProviderParameters; import org.apache.cxf.sts.token.provider.TokenProviderResponse; import org.apache.cxf.ws.security.sts.provider.STSException; +import org.apache.wss4j.common.token.BinarySecurity; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.message.token.BinarySecurity; /** * A Dummy TokenProvider for use in the unit tests. It mocks up a dummy BinarySecurityToken. http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java index 5814bf7..802a393 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java @@ -94,14 +94,13 @@ import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; import org.apache.wss4j.common.derivedKey.P_SHA1; import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.token.Reference; import org.apache.wss4j.common.util.XMLUtils; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSDocInfo; import org.apache.wss4j.dom.WSSConfig; import org.apache.wss4j.dom.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.RequestData; -import org.apache.wss4j.dom.message.token.BinarySecurity; -import org.apache.wss4j.dom.message.token.Reference; import org.apache.wss4j.dom.processor.EncryptedKeyProcessor; import org.apache.wss4j.dom.processor.X509Util; import org.apache.wss4j.dom.util.WSSecurityUtil; @@ -716,7 +715,7 @@ public class SimpleBatchSTSClient implements Configurable, InterceptorProvider { W3CDOMStreamWriter writer ) throws XMLStreamException { writer.writeStartElement("wst", "BinaryExchange", namespace); - writer.writeAttribute("EncodingType", BinarySecurity.BASE64_ENCODING); + writer.writeAttribute("EncodingType", WSConstants.BASE64_ENCODING); writer.writeAttribute("ValueType", namespace + "/spnego"); writer.writeCharacters(binaryExchange); writer.writeEndElement(); http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomBSTTokenProvider.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomBSTTokenProvider.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomBSTTokenProvider.java index a0ad8f8..ab1f39a 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomBSTTokenProvider.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/CustomBSTTokenProvider.java @@ -26,8 +26,8 @@ import org.apache.cxf.sts.token.provider.TokenProvider; import org.apache.cxf.sts.token.provider.TokenProviderParameters; import org.apache.cxf.sts.token.provider.TokenProviderResponse; import org.apache.cxf.ws.security.sts.provider.STSException; +import org.apache.wss4j.common.token.BinarySecurity; import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.message.token.BinarySecurity; /** * A TokenProvider implementation that creates a (custom) BinarySecurityToken. http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java index 640b317..6948b19 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java @@ -34,7 +34,7 @@ import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.tokenstore.SecurityToken; -import org.apache.wss4j.dom.message.token.BinarySecurity; +import org.apache.wss4j.common.token.BinarySecurity; import org.example.contract.doubleit.DoubleItPortType; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/cxf/blob/6d637dcb/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java index 09fd847..5a57a3f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/DoubleItBSTImpl.java @@ -27,10 +27,10 @@ import javax.xml.ws.WebServiceContext; import org.apache.cxf.feature.Features; import org.apache.cxf.helpers.CastUtils; +import org.apache.wss4j.common.token.BinarySecurity; import org.apache.wss4j.dom.WSSecurityEngineResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.dom.message.token.BinarySecurity; import org.example.contract.doubleit.DoubleItFault; import org.example.contract.doubleit.DoubleItPortType; import org.junit.Assert;
