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 617099686 for ; Wed, 14 Dec 2011 15:56:16 +0000 (UTC) Received: (qmail 35990 invoked by uid 500); 14 Dec 2011 15:56:16 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35944 invoked by uid 500); 14 Dec 2011 15:56:16 -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 35937 invoked by uid 99); 14 Dec 2011 15:56:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2011 15:56:16 +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; Wed, 14 Dec 2011 15:56:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5CE0B2388993 for ; Wed, 14 Dec 2011 15:55:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1214310 - in /cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators: SignedEndorsingEncryptedTokenPolicyValidator.java SignedEndorsingTokenPolicyValidator.java Date: Wed, 14 Dec 2011 15:55:54 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111214155554.5CE0B2388993@eris.apache.org> Author: coheigea Date: Wed Dec 14 15:55:53 2011 New Revision: 1214310 URL: http://svn.apache.org/viewvc?rev=1214310&view=rev Log: Adding policy validation for certain types of SAML tokens Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java?rev=1214310&r1=1214309&r2=1214310&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java Wed Dec 14 15:55:53 2011 @@ -29,6 +29,7 @@ import org.apache.cxf.ws.security.policy import org.apache.cxf.ws.security.policy.SPConstants; import org.apache.cxf.ws.security.policy.model.IssuedToken; import org.apache.cxf.ws.security.policy.model.KerberosToken; +import org.apache.cxf.ws.security.policy.model.SamlToken; import org.apache.cxf.ws.security.policy.model.SecurityContextToken; import org.apache.cxf.ws.security.policy.model.SupportingToken; import org.apache.cxf.ws.security.policy.model.Token; @@ -84,6 +85,10 @@ public class SignedEndorsingEncryptedTok if (!processKerberosTokens()) { processingFailed = true; } + } else if (token instanceof SamlToken) { + if (!processSAMLTokens()) { + processingFailed = true; + } } else if (token instanceof X509Token) { if (!processX509Tokens()) { processingFailed = true; Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java?rev=1214310&r1=1214309&r2=1214310&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java Wed Dec 14 15:55:53 2011 @@ -29,6 +29,7 @@ import org.apache.cxf.ws.security.policy import org.apache.cxf.ws.security.policy.SPConstants; import org.apache.cxf.ws.security.policy.model.IssuedToken; import org.apache.cxf.ws.security.policy.model.KerberosToken; +import org.apache.cxf.ws.security.policy.model.SamlToken; import org.apache.cxf.ws.security.policy.model.SecurityContextToken; import org.apache.cxf.ws.security.policy.model.SupportingToken; import org.apache.cxf.ws.security.policy.model.Token; @@ -82,6 +83,10 @@ public class SignedEndorsingTokenPolicyV if (!processKerberosTokens()) { processingFailed = true; } + } else if (token instanceof SamlToken) { + if (!processSAMLTokens()) { + processingFailed = true; + } } else if (token instanceof X509Token) { if (!processX509Tokens()) { processingFailed = true;