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 00DDD1004E for ; Fri, 13 Sep 2013 15:59:42 +0000 (UTC) Received: (qmail 62398 invoked by uid 500); 13 Sep 2013 10:04:49 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 62299 invoked by uid 500); 13 Sep 2013 10:04:48 -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 62202 invoked by uid 99); 13 Sep 2013 10:04:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Sep 2013 10:04:47 +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; Fri, 13 Sep 2013 10:04:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 157632388831; Fri, 13 Sep 2013 10:04:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1522841 - in /cxf/trunk/services/sts: sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml Date: Fri, 13 Sep 2013 10:04:24 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130913100425.157632388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Fri Sep 13 10:04:24 2013 New Revision: 1522841 URL: http://svn.apache.org/r1522841 Log: Set the audience restriction check in the STS to "false" by default Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java?rev=1522841&r1=1522840&r2=1522841&view=diff ============================================================================== --- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java (original) +++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/delegation/SAMLDelegationHandler.java Fri Sep 13 10:04:24 2013 @@ -37,14 +37,15 @@ import org.opensaml.saml1.core.AudienceR /** * The SAML TokenDelegationHandler implementation. It disallows ActAs or OnBehalfOf for * all cases apart from the case of a Bearer SAML Token. In addition, the AppliesTo - * address (if supplied) must match an AudienceRestriction address (if in token) + * address (if supplied) must match an AudienceRestriction address (if in token), if the + * "checkAudienceRestriction" property is set to "true". */ public class SAMLDelegationHandler implements TokenDelegationHandler { private static final Logger LOG = LogUtils.getL7dLogger(SAMLDelegationHandler.class); - private boolean checkAudienceRestriction = true; + private boolean checkAudienceRestriction; public boolean canHandleToken(ReceivedToken delegateTarget) { Object token = delegateTarget.getToken(); @@ -137,7 +138,7 @@ public class SAMLDelegationHandler imple /** * Set whether to perform a check that the received AppliesTo address is contained in the - * token as one of the AudienceRestriction URIs. The default is true. + * token as one of the AudienceRestriction URIs. The default is false. * @param checkAudienceRestriction whether to perform an audience restriction check or not */ public void setCheckAudienceRestriction(boolean checkAudienceRestriction) { Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml?rev=1522841&r1=1522840&r2=1522841&view=diff ============================================================================== --- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml (original) +++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml Fri Sep 13 10:04:24 2013 @@ -48,9 +48,7 @@ - - + class="org.apache.cxf.sts.token.delegation.HOKDelegationHandler" />