Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D39E31832C for ; Mon, 14 Mar 2016 17:06:24 +0000 (UTC) Received: (qmail 76170 invoked by uid 500); 14 Mar 2016 17:06:24 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 76094 invoked by uid 500); 14 Mar 2016 17:06:24 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 75965 invoked by uid 99); 14 Mar 2016 17:06:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Mar 2016 17:06:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5ACF4DFF70; Mon, 14 Mar 2016 17:06:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Mon, 14 Mar 2016 17:06:27 -0000 Message-Id: <71af60f5ca3f43debceff7651cee8456@git.apache.org> In-Reply-To: <97de0390f7ff4f61bef8d10f403f4e37@git.apache.org> References: <97de0390f7ff4f61bef8d10f403f4e37@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] cxf git commit: Revert "WSS4J updates" Revert "WSS4J updates" This reverts commit becfc95256ba16f7cd4b521cdcc7bbe7314525ab. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/df145f63 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/df145f63 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/df145f63 Branch: refs/heads/3.0.x-fixes Commit: df145f63e8f894539fe776f80d26355e484a8c90 Parents: a962f4a Author: Colm O hEigeartaigh Authored: Mon Mar 14 17:06:04 2016 +0000 Committer: Colm O hEigeartaigh Committed: Mon Mar 14 17:06:04 2016 +0000 ---------------------------------------------------------------------- .../HttpsTokenInterceptorProvider.java | 12 +++---- .../security/trust/STSStaxTokenValidator.java | 10 +++--- .../PolicyBasedWSS4JStaxInInterceptor.java | 2 +- .../cxf/ws/security/wss4j/WSS4JUtils.java | 10 +++--- .../AbstractStaxBindingHandler.java | 16 ++++----- .../StaxAsymmetricBindingHandler.java | 4 +-- .../StaxSymmetricBindingHandler.java | 36 ++++++++++---------- .../ws/security/wss4j/StaxRoundTripTest.java | 2 +- .../StaxToDOMEncryptionIdentifierTest.java | 6 ++-- .../security/wss4j/StaxToDOMRoundTripTest.java | 2 +- .../wss4j/StaxToDOMSignatureIdentifierTest.java | 4 +-- .../security/wss4j/saml/StaxToDOMSamlTest.java | 8 ++--- 12 files changed, 56 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java index c97afca..55bca22 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/HttpsTokenInterceptorProvider.java @@ -285,7 +285,7 @@ public class HttpsTokenInterceptorProvider extends AbstractPolicyInterceptorProv ); HttpsSecurityTokenImpl httpsSecurityToken = new HttpsSecurityTokenImpl(true, policy.getUserName()); - httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TOKENUSAGE_MAIN_SIGNATURE); + httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature); httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken); NegotiationUtils.assertPolicy(aim, SPConstants.HTTP_BASIC_AUTHENTICATION); } @@ -301,7 +301,7 @@ public class HttpsTokenInterceptorProvider extends AbstractPolicyInterceptorProv ); HttpsSecurityTokenImpl httpsSecurityToken = new HttpsSecurityTokenImpl(false, policy.getUserName()); - httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TOKENUSAGE_MAIN_SIGNATURE); + httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature); httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken); NegotiationUtils.assertPolicy(aim, SPConstants.HTTP_DIGEST_AUTHENTICATION); } @@ -325,14 +325,14 @@ public class HttpsTokenInterceptorProvider extends AbstractPolicyInterceptorProv ); HttpsSecurityTokenImpl httpsSecurityToken = new HttpsSecurityTokenImpl((X509Certificate)tlsInfo.getPeerCertificates()[0]); - httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TOKENUSAGE_MAIN_SIGNATURE); + httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature); httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken); } else if (httpsTokenSecurityEvent.getAuthenticationType() == null) { httpsTokenSecurityEvent.setAuthenticationType( HttpsTokenSecurityEvent.AuthenticationType.HttpsNoAuthentication ); HttpsSecurityTokenImpl httpsSecurityToken = new HttpsSecurityTokenImpl(); - httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TOKENUSAGE_MAIN_SIGNATURE); + httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature); httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken); } } else { @@ -358,14 +358,14 @@ public class HttpsTokenInterceptorProvider extends AbstractPolicyInterceptorProv ); HttpsSecurityTokenImpl httpsSecurityToken = new HttpsSecurityTokenImpl((X509Certificate)tlsInfo.getPeerCertificates()[0]); - httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TOKENUSAGE_MAIN_SIGNATURE); + httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature); httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken); } else if (httpsTokenSecurityEvent.getAuthenticationType() == null) { httpsTokenSecurityEvent.setAuthenticationType( HttpsTokenSecurityEvent.AuthenticationType.HttpsNoAuthentication ); HttpsSecurityTokenImpl httpsSecurityToken = new HttpsSecurityTokenImpl(); - httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TOKENUSAGE_MAIN_SIGNATURE); + httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature); httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken); } List securityEvents = getSecurityEventList(message); http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/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 a9bb1c0..8cf0778 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 @@ -290,7 +290,7 @@ public class STSStaxTokenValidator usernameTokenPasswordType, username.getValue(), password, created, nonceVal, salt, iteration, tokenContext.getWsSecurityContext(), usernameTokenType.getId(), - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE); + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference); usernameSecurityToken.setElementPath(tokenContext.getElementPath()); usernameSecurityToken.setXMLSecEvent(tokenContext.getFirstXMLSecEvent()); @@ -463,7 +463,7 @@ public class STSStaxTokenValidator x509V3SecurityToken.setElementPath(tokenContext.getElementPath()); x509V3SecurityToken.setXMLSecEvent(tokenContext.getFirstXMLSecEvent()); return x509V3SecurityToken; - } else if (WSSConstants.NS_X509_PKIPATH_V1.equals(binarySecurityTokenType.getValueType())) { + } else if (WSSConstants.NS_X509PKIPathv1.equals(binarySecurityTokenType.getValueType())) { Crypto crypto = getCrypto(tokenContext.getWssSecurityProperties()); X509PKIPathv1SecurityTokenImpl x509PKIPathv1SecurityToken = new X509PKIPathv1SecurityTokenImpl( @@ -471,7 +471,7 @@ public class STSStaxTokenValidator crypto, tokenContext.getWssSecurityProperties().getCallbackHandler(), securityTokenData, binarySecurityTokenType.getId(), - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE, + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference, tokenContext.getWssSecurityProperties() ) { @Override @@ -499,7 +499,7 @@ public class STSStaxTokenValidator tokenContext.getWssSecurityProperties().getCallbackHandler(), securityTokenData, binarySecurityTokenType.getValueType(), binarySecurityTokenType.getId(), - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference ) { @Override public void verify() throws XMLSecurityException { @@ -538,7 +538,7 @@ public class STSStaxTokenValidator BinarySecurity binarySecurity = null; if (WSSConstants.NS_X509_V3_TYPE.equals(binarySecurityTokenType.getValueType())) { binarySecurity = new X509Security(doc); - } else if (WSSConstants.NS_X509_PKIPATH_V1.equals(binarySecurityTokenType.getValueType())) { + } else if (WSSConstants.NS_X509PKIPathv1.equals(binarySecurityTokenType.getValueType())) { binarySecurity = new PKIPathSecurity(doc); } else if (WSSConstants.NS_GSS_KERBEROS5_AP_REQ.equals(binarySecurityTokenType.getValueType())) { binarySecurity = new KerberosSecurity(doc); http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java index f3d85e9..1d00486 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JStaxInInterceptor.java @@ -136,7 +136,7 @@ public class PolicyBasedWSS4JStaxInInterceptor extends WSS4JStaxInInterceptor { ); HttpsSecurityTokenImpl httpsSecurityToken = new HttpsSecurityTokenImpl(); try { - httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TOKENUSAGE_MAIN_SIGNATURE); + httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature); } catch (XMLSecurityException e) { LOG.fine(e.getMessage()); } http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java index c29670d..abc263c 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java @@ -213,14 +213,14 @@ public final class WSS4JUtils { if (securityToken.getTokenType() != null) { if (securityToken.getTokenType() == WSSecurityTokenConstants.EncryptedKeyToken) { cachedTok.setTokenType(WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE); - } else if (securityToken.getTokenType() == WSSecurityTokenConstants.KERBEROS_TOKEN) { + } else if (securityToken.getTokenType() == WSSecurityTokenConstants.KerberosToken) { cachedTok.setTokenType(WSSConstants.NS_GSS_KERBEROS5_AP_REQ); - } else if (securityToken.getTokenType() == WSSecurityTokenConstants.SAML_11_TOKEN) { + } else if (securityToken.getTokenType() == WSSecurityTokenConstants.Saml11Token) { cachedTok.setTokenType(WSSConstants.NS_SAML11_TOKEN_PROFILE_TYPE); - } else if (securityToken.getTokenType() == WSSecurityTokenConstants.SAML_20_TOKEN) { + } else if (securityToken.getTokenType() == WSSecurityTokenConstants.Saml20Token) { cachedTok.setTokenType(WSSConstants.NS_SAML20_TOKEN_PROFILE_TYPE); - } else if (securityToken.getTokenType() == WSSecurityTokenConstants.SECURE_CONVERSATION_TOKEN - || securityToken.getTokenType() == WSSecurityTokenConstants.SECURITY_CONTEXT_TOKEN) { + } else if (securityToken.getTokenType() == WSSecurityTokenConstants.SecureConversationToken + || securityToken.getTokenType() == WSSecurityTokenConstants.SecurityContextToken) { cachedTok.setTokenType(WSSConstants.NS_WSC_05_02); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java index 9b62c09..22dfa6a 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java @@ -386,13 +386,13 @@ public abstract class AbstractStaxBindingHandler extends AbstractCommonBindingHa SecurityTokenConstants.TokenType tokenType = WSSecurityTokenConstants.EncryptedKeyToken; if (tok.getTokenType() != null) { if (tok.getTokenType().startsWith(WSSConstants.NS_KERBEROS11_TOKEN_PROFILE)) { - tokenType = WSSecurityTokenConstants.KERBEROS_TOKEN; + tokenType = WSSecurityTokenConstants.KerberosToken; } else if (tok.getTokenType().startsWith(WSSConstants.NS_SAML10_TOKEN_PROFILE) || tok.getTokenType().startsWith(WSSConstants.NS_SAML11_TOKEN_PROFILE)) { - tokenType = WSSecurityTokenConstants.SAML_11_TOKEN; + tokenType = WSSecurityTokenConstants.Saml11Token; } else if (tok.getTokenType().startsWith(WSSConstants.NS_WSC_05_02) || tok.getTokenType().startsWith(WSSConstants.NS_WSC_05_12)) { - tokenType = WSSecurityTokenConstants.SECURE_CONVERSATION_TOKEN; + tokenType = WSSecurityTokenConstants.SecureConversationToken; } } @@ -527,8 +527,8 @@ public abstract class AbstractStaxBindingHandler extends AbstractCommonBindingHa if (token instanceof X509Token && isTokenRequired(token.getIncludeTokenType()) && (WSSecurityTokenConstants.KeyIdentifier_IssuerSerial.equals(keyIdentifier) - || WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER.equals(keyIdentifier) - || WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE.equals( + || WSSecurityTokenConstants.KeyIdentifier_ThumbprintIdentifier.equals(keyIdentifier) + || WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference.equals( keyIdentifier))) { properties.setIncludeSignatureToken(true); } else { @@ -571,7 +571,7 @@ public abstract class AbstractStaxBindingHandler extends AbstractCommonBindingHa } else if (x509Token.isRequireKeyIdentifierReference()) { identifier = WSSecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier; } else if (x509Token.isRequireThumbprintReference()) { - identifier = WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER; + identifier = WSSecurityTokenConstants.KeyIdentifier_ThumbprintIdentifier; } } else if (token instanceof KeyValueToken) { identifier = WSSecurityTokenConstants.KeyIdentifier_KeyValue; @@ -589,7 +589,7 @@ public abstract class AbstractStaxBindingHandler extends AbstractCommonBindingHa identifier = WSSecurityTokenConstants.KeyIdentifier_IssuerSerial; } else if (wss instanceof Wss11 && ((Wss11) wss).isMustSupportRefThumbprint()) { - identifier = WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER; + identifier = WSSecurityTokenConstants.KeyIdentifier_ThumbprintIdentifier; } } else if (token.getIncludeTokenType() == IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT && !isRequestor() && token instanceof X509Token) { @@ -603,7 +603,7 @@ public abstract class AbstractStaxBindingHandler extends AbstractCommonBindingHa return identifier; } - return WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE; + return WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference; } protected Map handleSupportingTokens( http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java index 9fc0c14..bc93956 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java @@ -368,8 +368,8 @@ public class StaxAsymmetricBindingHandler extends AbstractStaxBindingHandler { if (encrToken instanceof X509Token && isTokenRequired(encrToken.getIncludeTokenType()) && (WSSecurityTokenConstants.KeyIdentifier_IssuerSerial.equals(keyIdentifier) - || WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER.equals(keyIdentifier) - || WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE.equals( + || WSSecurityTokenConstants.KeyIdentifier_ThumbprintIdentifier.equals(keyIdentifier) + || WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference.equals( keyIdentifier))) { properties.setIncludeEncryptionToken(true); } else { http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/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 63061b5..d60ef6c 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 @@ -430,29 +430,29 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { if (isRequestor()) { properties.setEncryptionKeyIdentifier(getKeyIdentifierType(encrToken)); properties.setDerivedKeyKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE); + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference); } else if (recToken.getToken() instanceof KerberosToken && !isRequestor()) { properties.setEncryptionKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_KERBEROS_SHA1_IDENTIFIER); + WSSecurityTokenConstants.KeyIdentifier_KerberosSha1Identifier); properties.setDerivedKeyKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_KERBEROS_SHA1_IDENTIFIER); + WSSecurityTokenConstants.KeyIdentifier_KerberosSha1Identifier); if (recToken.getToken().getDerivedKeys() == DerivedKeys.RequireDerivedKeys) { properties.setEncryptionKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE); + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference); } } else if ((recToken.getToken() instanceof IssuedToken || recToken.getToken() instanceof SecureConversationToken || recToken.getToken() instanceof SpnegoContextToken) && !isRequestor()) { properties.setEncryptionKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE); + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference); } else { properties.setEncryptionKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_ENCRYPTED_KEY_SHA1_IDENTIFIER); + WSSecurityTokenConstants.KeyIdentifier_EncryptedKeySha1Identifier); if (recToken.getToken().getDerivedKeys() == DerivedKeys.RequireDerivedKeys) { properties.setDerivedKeyKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_ENCRYPTED_KEY_SHA1_IDENTIFIER); + WSSecurityTokenConstants.KeyIdentifier_EncryptedKeySha1Identifier); properties.setEncryptionKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE); + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference); properties.setEncryptSymmetricEncryptionKey(false); } } @@ -462,8 +462,8 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { if (encrToken instanceof X509Token && isTokenRequired(encrToken.getIncludeTokenType()) && (WSSecurityTokenConstants.KeyIdentifier_IssuerSerial.equals(keyIdentifier) - || WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER.equals(keyIdentifier) - || WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE.equals( + || WSSecurityTokenConstants.KeyIdentifier_ThumbprintIdentifier.equals(keyIdentifier) + || WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference.equals( keyIdentifier))) { properties.setIncludeEncryptionToken(true); } else { @@ -552,28 +552,28 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { WSSecurityTokenConstants.KeyIdentifier_EncryptedKey); } else { properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_ENCRYPTED_KEY_SHA1_IDENTIFIER); + WSSecurityTokenConstants.KeyIdentifier_EncryptedKeySha1Identifier); if (wrapper.getToken().getDerivedKeys() == DerivedKeys.RequireDerivedKeys) { properties.setDerivedKeyKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_ENCRYPTED_KEY_SHA1_IDENTIFIER); + WSSecurityTokenConstants.KeyIdentifier_EncryptedKeySha1Identifier); properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE); + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference); } } } else if (policyToken instanceof KerberosToken) { if (isRequestor()) { properties.setDerivedKeyKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE); + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference); } else { if (wrapper.getToken().getDerivedKeys() == DerivedKeys.RequireDerivedKeys) { properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE); + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference); } else { properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_KERBEROS_SHA1_IDENTIFIER); + WSSecurityTokenConstants.KeyIdentifier_KerberosSha1Identifier); } properties.setDerivedKeyKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_KERBEROS_SHA1_IDENTIFIER); + WSSecurityTokenConstants.KeyIdentifier_KerberosSha1Identifier); } } else if (policyToken instanceof IssuedToken || policyToken instanceof SecurityContextToken || policyToken instanceof SecureConversationToken || policyToken instanceof SpnegoContextToken) { @@ -583,7 +583,7 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { properties.setIncludeSignatureToken(true); } properties.setDerivedKeyKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE); + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference); } if (sigToken.getDerivedKeys() == DerivedKeys.RequireDerivedKeys) { http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/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 729ee1f..3350ce5 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 @@ -896,7 +896,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest { properties.setCallbackHandler(new KeystorePasswordCallback()); properties.setUseSingleCert(true); properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference ); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(properties); http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/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 71205f7..1eb5e4c 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 @@ -72,7 +72,7 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest { properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setEncryptionKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference ); properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); @@ -150,7 +150,7 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest { properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setEncryptionKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER + WSSecurityTokenConstants.KeyIdentifier_ThumbprintIdentifier ); properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); @@ -229,7 +229,7 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest { properties.setActions(actions); properties.setEncryptionUser("myalias"); properties.setEncryptionKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_ENCRYPTED_KEY_SHA1_IDENTIFIER + WSSecurityTokenConstants.KeyIdentifier_EncryptedKeySha1Identifier ); properties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128); http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/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 926718a..686f380 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 @@ -907,7 +907,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest { properties.setCallbackHandler(new KeystorePasswordCallback()); properties.setUseSingleCert(true); properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference ); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(properties); http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/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 a81eab0..c8479fd 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 @@ -71,7 +71,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest { actions.add(WSSConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference ); properties.setSignatureUser("myalias"); @@ -147,7 +147,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest { actions.add(WSSConstants.SIGNATURE); properties.setActions(actions); properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER + WSSecurityTokenConstants.KeyIdentifier_ThumbprintIdentifier ); properties.setSignatureUser("myalias"); http://git-wip-us.apache.org/repos/asf/cxf/blob/df145f63/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java index 1c9f923..a6a5406 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java @@ -165,7 +165,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest { properties.setCallbackHandler(new PasswordCallbackHandler()); properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference ); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(properties); @@ -323,7 +323,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest { properties.setCallbackHandler(new PasswordCallbackHandler()); properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference ); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(properties); @@ -414,7 +414,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest { CryptoFactory.getProperties("alice.properties", this.getClass().getClassLoader()); properties.setSignatureCryptoProperties(cryptoProperties); properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference ); properties.setCallbackHandler(new PasswordCallbackHandler()); @@ -528,7 +528,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest { CryptoFactory.getProperties("alice.properties", this.getClass().getClassLoader()); properties.setSignatureCryptoProperties(cryptoProperties); properties.setSignatureKeyIdentifier( - WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE + WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference ); WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(properties);