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 A022B7FDE for ; Mon, 29 Aug 2011 13:59:19 +0000 (UTC) Received: (qmail 20962 invoked by uid 500); 29 Aug 2011 13:59:19 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 20883 invoked by uid 500); 29 Aug 2011 13:59:18 -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 20876 invoked by uid 99); 29 Aug 2011 13:59:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2011 13:59:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2011 13:59:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B032A23889E3 for ; Mon, 29 Aug 2011 13:58:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1162810 - in /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security: SecurityConstants.java trust/STSTokenValidator.java wss4j/WSS4JInInterceptor.java Date: Mon, 29 Aug 2011 13:58:56 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110829135856.B032A23889E3@eris.apache.org> Author: coheigea Date: Mon Aug 29 13:58:56 2011 New Revision: 1162810 URL: http://svn.apache.org/viewvc?rev=1162810&view=rev Log: Add the ability to have a custom Validator implementation for a SecurityContextToken Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java?rev=1162810&r1=1162809&r2=1162810&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java Mon Aug 29 13:58:56 2011 @@ -37,6 +37,7 @@ public final class SecurityConstants { public static final String TIMESTAMP_TOKEN_VALIDATOR = "ws-security.timestamp.validator"; public static final String SIGNATURE_TOKEN_VALIDATOR = "ws-security.signature.validator"; public static final String BST_TOKEN_VALIDATOR = "ws-security.bst.validator"; + public static final String SCT_TOKEN_VALIDATOR = "ws-security.sct.validator"; public static final String CALLBACK_HANDLER = "ws-security.callback-handler"; public static final String SAML_CALLBACK_HANDLER = "ws-security.saml-callback-handler"; @@ -124,7 +125,7 @@ public final class SecurityConstants { SAML1_TOKEN_VALIDATOR, SAML2_TOKEN_VALIDATOR, TIMESTAMP_TOKEN_VALIDATOR, SIGNATURE_TOKEN_VALIDATOR, IS_BSP_COMPLIANT, TIMESTAMP_FUTURE_TTL, BST_TOKEN_VALIDATOR, SAML_CALLBACK_HANDLER, STS_TOKEN_ON_BEHALF_OF, - KERBEROS_CLIENT + KERBEROS_CLIENT, SCT_TOKEN_VALIDATOR })); ALL_PROPERTIES = Collections.unmodifiableSet(s); } Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java?rev=1162810&r1=1162809&r2=1162810&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java Mon Aug 29 13:58:56 2011 @@ -81,6 +81,9 @@ public class STSTokenValidator implement } else if (credential.getBinarySecurityToken() != null) { tokenElement = credential.getBinarySecurityToken().getElement(); hash = credential.getBinarySecurityToken().hashCode(); + } else if (credential.getSecurityContextToken() != null) { + tokenElement = credential.getSecurityContextToken().getElement(); + hash = credential.getSecurityContextToken().hashCode(); } token.setToken(tokenElement); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1162810&r1=1162809&r2=1162810&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Mon Aug 29 13:58:56 2011 @@ -666,6 +666,9 @@ public class WSS4JInInterceptor extends key = SecurityConstants.TIMESTAMP_TOKEN_VALIDATOR; } else if (WSSecurityEngine.BINARY_TOKEN.equals(qName)) { key = SecurityConstants.BST_TOKEN_VALIDATOR; + } else if (WSSecurityEngine.SECURITY_CONTEXT_TOKEN_05_02.equals(qName) + || WSSecurityEngine.SECURITY_CONTEXT_TOKEN_05_12.equals(qName)) { + key = SecurityConstants.SCT_TOKEN_VALIDATOR; } if (key != null) { Object o = ((SoapMessage)this.getMsgContext()).getContextualProperty(key);