Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 84310 invoked from network); 21 Feb 2005 18:45:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 21 Feb 2005 18:45:16 -0000 Received: (qmail 57835 invoked by uid 500); 21 Feb 2005 18:45:14 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 57800 invoked by uid 500); 21 Feb 2005 18:45:14 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: directory-dev@incubator.apache.org Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 57787 invoked by uid 99); 21 Feb 2005 18:45:13 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 21 Feb 2005 10:45:13 -0800 Received: (qmail 83909 invoked by uid 65534); 21 Feb 2005 18:45:11 -0000 Message-ID: <20050221184511.83896.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Mon, 21 Feb 2005 18:45:11 -0000 Subject: svn commit: r154703 - in incubator/directory/authx/trunk: api/src/java/org/apache/authx/authorization/ example/src/webapp/ impl/src/java/org/apache/authx/authorization/ impl/src/test/org/apache/authx/authorization/ script/src/test/org/apache/authx/script/xml/ To: directory-cvs@incubator.apache.org From: vtence@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: vtence Date: Mon Feb 21 10:45:08 2005 New Revision: 154703 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D154703 Log: AuthorizationRequest no longer exposed through Authorizer Added: incubator/directory/authx/trunk/impl/src/java/org/apache/authx/authoriz= ation/SimpleAuthorizationRequest.java (with props) Removed: incubator/directory/authx/trunk/impl/src/java/org/apache/authx/authoriz= ation/DefaultAuthorizationRequest.java Modified: incubator/directory/authx/trunk/api/src/java/org/apache/authx/authoriza= tion/AuthorizationRequest.java incubator/directory/authx/trunk/api/src/java/org/apache/authx/authoriza= tion/Authorizer.java incubator/directory/authx/trunk/example/src/webapp/shop.groovy incubator/directory/authx/trunk/impl/src/java/org/apache/authx/authoriz= ation/DefaultAuthorizer.java incubator/directory/authx/trunk/impl/src/java/org/apache/authx/authoriz= ation/DefaultRule.java incubator/directory/authx/trunk/impl/src/test/org/apache/authx/authoriz= ation/DefaultAuthorizerTest.java incubator/directory/authx/trunk/impl/src/test/org/apache/authx/authoriz= ation/DefaultRuleTest.java incubator/directory/authx/trunk/impl/src/test/org/apache/authx/authoriz= ation/PolicyTest.java incubator/directory/authx/trunk/script/src/test/org/apache/authx/script= /xml/Dom4JRuleSetBuilderTest.java Modified: incubator/directory/authx/trunk/api/src/java/org/apache/authx/aut= horization/AuthorizationRequest.java URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/api/src/= java/org/apache/authx/authorization/AuthorizationRequest.java?view=3Ddiff&r= 1=3D154702&r2=3D154703 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/authx/trunk/api/src/java/org/apache/authx/authoriza= tion/AuthorizationRequest.java (original) +++ incubator/directory/authx/trunk/api/src/java/org/apache/authx/authoriza= tion/AuthorizationRequest.java Mon Feb 21 10:45:08 2005 @@ -5,7 +5,7 @@ =20 public interface AuthorizationRequest { - boolean affectsSubject( Predicate subjectPredicate ); + boolean affectsSubjectMatching( Predicate predicate ); =20 - boolean targetsPermission( Predicate permissionPredicate ); + boolean targetsPermissionMatching( Predicate predicate ); } Modified: incubator/directory/authx/trunk/api/src/java/org/apache/authx/aut= horization/Authorizer.java URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/api/src/= java/org/apache/authx/authorization/Authorizer.java?view=3Ddiff&r1=3D154702= &r2=3D154703 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/authx/trunk/api/src/java/org/apache/authx/authoriza= tion/Authorizer.java (original) +++ incubator/directory/authx/trunk/api/src/java/org/apache/authx/authoriza= tion/Authorizer.java Mon Feb 21 10:45:08 2005 @@ -16,6 +16,7 @@ */ package org.apache.authx.authorization; =20 +import javax.security.auth.Subject; =20 =20 /** @@ -37,9 +38,10 @@ * Renders an authorization decision in response * to the given authorization request. * - * @param request The authorization request to evaluate + * @param s The subject requesting a permission + * @param p The targeted permission * @return true if case of a positive decision, * false otherwise */ - boolean renderDecision( AuthorizationRequest request ); + boolean renderDecision( Subject s, Permission p ); } Modified: incubator/directory/authx/trunk/example/src/webapp/shop.groovy URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/example/= src/webapp/shop.groovy?view=3Ddiff&r1=3D154702&r2=3D154703 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/authx/trunk/example/src/webapp/shop.groovy (origina= l) +++ incubator/directory/authx/trunk/example/src/webapp/shop.groovy Mon Feb = 21 10:45:08 2005 @@ -34,7 +34,7 @@ purchase =3D new PurchasePermission( item.getPrice() ) me =3D context.getSubject() username =3D context.getUsername() - if ( !authorizer.authorize( me, purchase ) ) return "denied" + if ( !authorizer.renderDecision( me, purchase ) ) return "denied" =20 return "receipt" } Modified: incubator/directory/authx/trunk/impl/src/java/org/apache/authx/au= thorization/DefaultAuthorizer.java URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/impl/src= /java/org/apache/authx/authorization/DefaultAuthorizer.java?view=3Ddiff&r1= =3D154702&r2=3D154703 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/authx/trunk/impl/src/java/org/apache/authx/authoriz= ation/DefaultAuthorizer.java (original) +++ incubator/directory/authx/trunk/impl/src/java/org/apache/authx/authoriz= ation/DefaultAuthorizer.java Mon Feb 21 10:45:08 2005 @@ -18,6 +18,7 @@ =20 import org.apache.authx.authorization.effect.Effects; =20 +import javax.security.auth.Subject; import java.util.HashMap; import java.util.Map; =20 @@ -37,8 +38,9 @@ m_decisions.put( Effects.DENY, Boolean.FALSE ); } =20 - public boolean renderDecision( AuthorizationRequest request ) + public boolean renderDecision( Subject s, Permission p ) { + AuthorizationRequest request =3D new SimpleAuthorizationRequest( s= , p ); Effect effect =3D m_ruleSet.evaluate( request ).reduce(); Boolean decision =3D ( Boolean ) m_decisions.get( effect ); =20 Modified: incubator/directory/authx/trunk/impl/src/java/org/apache/authx/au= thorization/DefaultRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/impl/src= /java/org/apache/authx/authorization/DefaultRule.java?view=3Ddiff&r1=3D1547= 02&r2=3D154703 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/authx/trunk/impl/src/java/org/apache/authx/authoriz= ation/DefaultRule.java (original) +++ incubator/directory/authx/trunk/impl/src/java/org/apache/authx/authoriz= ation/DefaultRule.java Mon Feb 21 10:45:08 2005 @@ -70,7 +70,7 @@ =20 private boolean isApplicableTo( AuthorizationRequest request ) { - return request.affectsSubject( m_subjectPredicate ) && request.tar= getsPermission( m_permissionPredicate ); + return request.affectsSubjectMatching( m_subjectPredicate ) && req= uest.targetsPermissionMatching( m_permissionPredicate ); } =20 public Effect evaluate( AuthorizationRequest request ) Added: incubator/directory/authx/trunk/impl/src/java/org/apache/authx/autho= rization/SimpleAuthorizationRequest.java URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/impl/src= /java/org/apache/authx/authorization/SimpleAuthorizationRequest.java?view= =3Dauto&rev=3D154703 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/authx/trunk/impl/src/java/org/apache/authx/authoriz= ation/SimpleAuthorizationRequest.java (added) +++ incubator/directory/authx/trunk/impl/src/java/org/apache/authx/authoriz= ation/SimpleAuthorizationRequest.java Mon Feb 21 10:45:08 2005 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2005 Your Corporation. All Rights Reserved. + */ +package org.apache.authx.authorization; + +import javax.security.auth.Subject; + +public class SimpleAuthorizationRequest implements AuthorizationRequest +{ + private final Subject m_subject; + private final Permission m_permission; + + public SimpleAuthorizationRequest( Subject subject, Permission permiss= ion ) + { + m_subject =3D subject; + m_permission =3D permission; + } + + public boolean affectsSubjectMatching( Predicate subjectPredicate ) + { + return subjectPredicate.evaluate( m_subject ); + } + + public boolean targetsPermissionMatching( Predicate permissionPredicat= e ) + { + return permissionPredicate.evaluate( m_permission ); + } + + public boolean equals( Object value ) + { + if ( this =3D=3D value ) return true; + if ( !( value instanceof SimpleAuthorizationRequest ) ) return fal= se; + + final SimpleAuthorizationRequest simpleAuthorizationRequest =3D ( = SimpleAuthorizationRequest ) value; + + if ( !m_permission.equals( simpleAuthorizationRequest.m_permission= ) ) return false; + if ( !m_subject.equals( simpleAuthorizationRequest.m_subject ) ) r= eturn false; + + return true; + } + + public int hashCode() + { + int result; + result =3D m_subject.hashCode(); + result =3D 29 * result + m_permission.hashCode(); + return result; + } +} Propchange: incubator/directory/authx/trunk/impl/src/java/org/apache/authx/= authorization/SimpleAuthorizationRequest.java ---------------------------------------------------------------------------= --- svn:executable =3D * Modified: incubator/directory/authx/trunk/impl/src/test/org/apache/authx/au= thorization/DefaultAuthorizerTest.java URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/impl/src= /test/org/apache/authx/authorization/DefaultAuthorizerTest.java?view=3Ddiff= &r1=3D154702&r2=3D154703 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/authx/trunk/impl/src/test/org/apache/authx/authoriz= ation/DefaultAuthorizerTest.java (original) +++ incubator/directory/authx/trunk/impl/src/test/org/apache/authx/authoriz= ation/DefaultAuthorizerTest.java Mon Feb 21 10:45:08 2005 @@ -35,35 +35,35 @@ { m_authorizer =3D new DefaultAuthorizer( new Policy( Effects.GRANT = ) ); m_authorizer.denyIfUnsure(); - assertTrue( m_authorizer.renderDecision( new DefaultAuthorizationR= equest( new Subject(), new SomePermission() ) ) ); + assertTrue( m_authorizer.renderDecision( new Subject(), new SomePe= rmission() ) ); } =20 public void testTakesPositiveDecisionIfRuleIsNotApplicable() { m_authorizer =3D new DefaultAuthorizer( new Policy( Effects.NOT_AP= PLICABLE ) ); m_authorizer.denyIfUnsure(); - assertTrue( m_authorizer.renderDecision( new DefaultAuthorizationR= equest( new Subject(), new SomePermission() ) ) ); + assertTrue( m_authorizer.renderDecision( new Subject(), new SomePe= rmission() ) ); } =20 public void testTakesNegativeDecisionIfRuleSuggestDenial() { m_authorizer =3D new DefaultAuthorizer( new Policy( Effects.DENY )= ); m_authorizer.grantIfUnsure(); - assertFalse( m_authorizer.renderDecision( new DefaultAuthorization= Request( new Subject(), new SomePermission() ) ) ); + assertFalse( m_authorizer.renderDecision( new Subject(), new SomeP= ermission() ) ); } =20 public void testCanForceEffectToGrantDecision() { m_authorizer =3D new DefaultAuthorizer( new Policy( Effects.DENY )= ); m_authorizer.grantOn( Effects.DENY ); - assertTrue( m_authorizer.renderDecision( new DefaultAuthorizationR= equest( new Subject(), new SomePermission() ) ) ); + assertTrue( m_authorizer.renderDecision( new Subject(), new SomePe= rmission() ) ); } =20 public void testCanForceEffectToDenyDecision() { m_authorizer =3D new DefaultAuthorizer( new Policy( Effects.NOT_AP= PLICABLE ) ); m_authorizer.denyOn( Effects.NOT_APPLICABLE ); - assertFalse( m_authorizer.renderDecision( new DefaultAuthorization= Request( new Subject(), new SomePermission() ) ) ); + assertFalse( m_authorizer.renderDecision( new Subject(), new SomeP= ermission() ) ); } =20 public void testEffectsAreReducedBeforeTakingDecision() @@ -71,6 +71,6 @@ m_authorizer =3D new DefaultAuthorizer( new Policy( new PermitOver= ridesEffect() ) ); m_authorizer.grantIfUnsure(); m_authorizer.denyOn( Effects.NOT_APPLICABLE ); - assertFalse( m_authorizer.renderDecision( new DefaultAuthorization= Request( new Subject(), new SomePermission() ) ) ); + assertFalse( m_authorizer.renderDecision( new Subject(), new SomeP= ermission() ) ); } } Modified: incubator/directory/authx/trunk/impl/src/test/org/apache/authx/au= thorization/DefaultRuleTest.java URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/impl/src= /test/org/apache/authx/authorization/DefaultRuleTest.java?view=3Ddiff&r1=3D= 154702&r2=3D154703 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/authx/trunk/impl/src/test/org/apache/authx/authoriz= ation/DefaultRuleTest.java (original) +++ incubator/directory/authx/trunk/impl/src/test/org/apache/authx/authoriz= ation/DefaultRuleTest.java Mon Feb 21 10:45:08 2005 @@ -47,7 +47,7 @@ m_rule.setEffect( Effects.DENY ); m_rule.matchSubjects( new HasPrincipalPredicate( Usernames.john() = ) ); m_rule.matchPermissions( new ImpliedPermissionPredicate( new SomeP= ermission() ) ); - assertEquals( Effects.DENY, m_rule.evaluate( new DefaultAuthorizat= ionRequest( Subjects.john(), new SomePermission() ) )); + assertEquals( Effects.DENY, m_rule.evaluate( new SimpleAuthorizati= onRequest( Subjects.john(), new SomePermission() ) )); } =20 public void testSubjectConditionsAreCombinedIntoAnOrOperation() @@ -56,8 +56,8 @@ m_rule.matchSubjects( new HasPrincipalPredicate( Usernames.john() = ) ); m_rule.matchSubjects( new HasPrincipalPredicate( Usernames.joe() )= ); m_rule.matchPermissions( new ImpliedPermissionPredicate( new SomeP= ermission() ) ); - assertEquals( Effects.GRANT, m_rule.evaluate( new DefaultAuthoriza= tionRequest( Subjects.john(), new SomePermission() ) ) ); - assertEquals( Effects.GRANT, m_rule.evaluate( new DefaultAuthoriza= tionRequest( Subjects.joe(), new SomePermission() ) ) ); + assertEquals( Effects.GRANT, m_rule.evaluate( new SimpleAuthorizat= ionRequest( Subjects.john(), new SomePermission() ) ) ); + assertEquals( Effects.GRANT, m_rule.evaluate( new SimpleAuthorizat= ionRequest( Subjects.joe(), new SomePermission() ) ) ); } =20 public void testPermissionConditionsAreCombinedIntoAnOrOperation() @@ -66,21 +66,21 @@ m_rule.matchSubjects( new HasPrincipalPredicate( Usernames.john() = ) ); m_rule.matchPermissions( new ImpliedPermissionPredicate( new Basic= Permission( "foo" ) ) ); m_rule.matchPermissions( new ImpliedPermissionPredicate( new Basic= Permission( "bar" ) ) ); - assertEquals( Effects.GRANT, m_rule.evaluate( new DefaultAuthoriza= tionRequest( Subjects.john(), new BasicPermission( "foo" ) ) ) ); - assertEquals( Effects.GRANT, m_rule.evaluate( new DefaultAuthoriza= tionRequest( Subjects.john(), new BasicPermission( "bar" ) ) ) ); + assertEquals( Effects.GRANT, m_rule.evaluate( new SimpleAuthorizat= ionRequest( Subjects.john(), new BasicPermission( "foo" ) ) ) ); + assertEquals( Effects.GRANT, m_rule.evaluate( new SimpleAuthorizat= ionRequest( Subjects.john(), new BasicPermission( "bar" ) ) ) ); } =20 public void testIsNotApplicableIfSubjectConditionIsNotVerified() { m_rule.matchSubjects( new FalsePredicate() ); m_rule.matchPermissions( new TruePredicate() ); - assertEquals( Effects.NOT_APPLICABLE, m_rule.evaluate( new Default= AuthorizationRequest( Subjects.john(), new SomePermission() ) ) ); + assertEquals( Effects.NOT_APPLICABLE, m_rule.evaluate( new SimpleA= uthorizationRequest( Subjects.john(), new SomePermission() ) ) ); } =20 public void testIsNotApplicableIfPermissionConditionIsNotVerified() { m_rule.matchSubjects( new TruePredicate() ); m_rule.matchPermissions( new FalsePredicate() ); - assertEquals( Effects.NOT_APPLICABLE, m_rule.evaluate( new Default= AuthorizationRequest( Subjects.john(), new SomePermission() ) ) ); + assertEquals( Effects.NOT_APPLICABLE, m_rule.evaluate( new SimpleA= uthorizationRequest( Subjects.john(), new SomePermission() ) ) ); } } Modified: incubator/directory/authx/trunk/impl/src/test/org/apache/authx/au= thorization/PolicyTest.java URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/impl/src= /test/org/apache/authx/authorization/PolicyTest.java?view=3Ddiff&r1=3D15470= 2&r2=3D154703 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/authx/trunk/impl/src/test/org/apache/authx/authoriz= ation/PolicyTest.java (original) +++ incubator/directory/authx/trunk/impl/src/test/org/apache/authx/authoriz= ation/PolicyTest.java Mon Feb 21 10:45:08 2005 @@ -27,7 +27,7 @@ public void testRendersDefaultDecisionWhenEmpty() { Policy policy =3D new Policy( new PermitOverridesEffect() ); - assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new Default= AuthorizationRequest( new Subject(), new SomePermission() ) ).reduce() ); + assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new SimpleA= uthorizationRequest( new Subject(), new SomePermission() ) ).reduce() ); } =20 public void testCombinesResultOfContainedRulesEvaluation() @@ -36,6 +36,6 @@ policy.addRule( new PrimitiveRule( Effects.DENY ) ); policy.addRule( new PrimitiveRule( Effects.GRANT ) ); =20 - assertEquals( Effects.GRANT, policy.evaluate( new DefaultAuthoriza= tionRequest( new Subject(), new SomePermission() ) ).reduce() ); + assertEquals( Effects.GRANT, policy.evaluate( new SimpleAuthorizat= ionRequest( new Subject(), new SomePermission() ) ).reduce() ); } } Modified: incubator/directory/authx/trunk/script/src/test/org/apache/authx/= script/xml/Dom4JRuleSetBuilderTest.java URL: http://svn.apache.org/viewcvs/incubator/directory/authx/trunk/script/s= rc/test/org/apache/authx/script/xml/Dom4JRuleSetBuilderTest.java?view=3Ddif= f&r1=3D154702&r2=3D154703 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/directory/authx/trunk/script/src/test/org/apache/authx/script= /xml/Dom4JRuleSetBuilderTest.java (original) +++ incubator/directory/authx/trunk/script/src/test/org/apache/authx/script= /xml/Dom4JRuleSetBuilderTest.java Mon Feb 21 10:45:08 2005 @@ -18,7 +18,7 @@ =20 import junit.framework.TestCase; import org.apache.authx.authorization.Policy; -import org.apache.authx.authorization.DefaultAuthorizationRequest; +import org.apache.authx.authorization.SimpleAuthorizationRequest; import org.apache.authx.authorization.effect.DenyOverridesEffect; import org.apache.authx.authorization.effect.Effects; import org.apache.authx.authorization.effect.PermitOverridesEffect; @@ -59,7 +59,7 @@ Policy policy =3D new Policy( new DenyOverridesEffect() ); builder.buildRuleSet( policy ); =20 - assertEquals( Effects.DENY, policy.evaluate( new DefaultAuthorizat= ionRequest( Subjects.anybody(), Permissions.anything() ) ).reduce() ); + assertEquals( Effects.DENY, policy.evaluate( new SimpleAuthorizati= onRequest( Subjects.anybody(), Permissions.anything() ) ).reduce() ); } =20 public void testHasBuiltInSupportForRulingOnUsernames() throws Excepti= on @@ -80,7 +80,7 @@ Policy policy =3D new Policy( new PermitOverridesEffect() ); builder.buildRuleSet( policy ); =20 - assertEquals( Effects.GRANT, policy.evaluate( new DefaultAuthoriza= tionRequest( Subjects.joe(), Permissions.anything() ) ).reduce() ); + assertEquals( Effects.GRANT, policy.evaluate( new SimpleAuthorizat= ionRequest( Subjects.joe(), Permissions.anything() ) ).reduce() ); } =20 public void testHasBuiltInSupportForRulingOnGroups() throws Exception @@ -101,7 +101,7 @@ Policy policy =3D new Policy( new PermitOverridesEffect() ); builder.buildRuleSet( policy ); =20 - assertEquals( Effects.GRANT, policy.evaluate( new DefaultAuthoriza= tionRequest( Subjects.with( Groups.canadians() ), Permissions.anything() ) = )=2Ereduce() ); + assertEquals( Effects.GRANT, policy.evaluate( new SimpleAuthorizat= ionRequest( Subjects.with( Groups.canadians() ), Permissions.anything() ) )= .reduce() ); } =20 public void testHasBuiltInSupportForRulingOnRoles() throws Exception @@ -122,7 +122,7 @@ Policy policy =3D new Policy( new PermitOverridesEffect() ); builder.buildRuleSet( policy ); =20 - assertEquals( Effects.GRANT, policy.evaluate( new DefaultAuthoriza= tionRequest( Subjects.with( Roles.developer() ), Permissions.anything() )) = .reduce() ); + assertEquals( Effects.GRANT, policy.evaluate( new SimpleAuthorizat= ionRequest( Subjects.with( Roles.developer() ), Permissions.anything() )) .= reduce() ); } =20 public void testPredicatesCanBeRegisteredToExtendRuling() throws Excep= tion @@ -144,7 +144,7 @@ Policy policy =3D new Policy( new PermitOverridesEffect() ); builder.buildRuleSet( policy ); =20 - assertEquals( Effects.GRANT, policy.evaluate( new DefaultAuthoriza= tionRequest( Subjects.withGreenEyes(), Permissions.anything() ) ).reduce() = ); + assertEquals( Effects.GRANT, policy.evaluate( new SimpleAuthorizat= ionRequest( Subjects.withGreenEyes(), Permissions.anything() ) ).reduce() )= ; } =20 public void testLastRegisteredBuilderWins() throws Exception @@ -166,7 +166,7 @@ Policy policy =3D new Policy( new PermitOverridesEffect() ); builder.buildRuleSet( policy ); =20 - assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new Default= AuthorizationRequest( Subjects.anybody(), Permissions.anything() ) ).reduce= () ); + assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new SimpleA= uthorizationRequest( Subjects.anybody(), Permissions.anything() ) ).reduce(= ) ); } =20 public void testMultiplePredicatesAreCombinedWithAnOrOperation() throw= s Exception @@ -188,9 +188,9 @@ Policy policy =3D new Policy( new PermitOverridesEffect() ); builder.buildRuleSet( policy ); =20 - assertEquals( Effects.GRANT, policy.evaluate( new DefaultAuthoriza= tionRequest( Subjects.with( Usernames.joe() ), Permissions.anything() ) ).r= educe() ); - assertEquals( Effects.GRANT, policy.evaluate( new DefaultAuthoriza= tionRequest( Subjects.with( Groups.canadians() ), Permissions.anything() ) = )=2Ereduce() ); - assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new Default= AuthorizationRequest( Subjects.with( Roles.developer() ), Permissions.anyth= ing() ) ).reduce() ); + assertEquals( Effects.GRANT, policy.evaluate( new SimpleAuthorizat= ionRequest( Subjects.with( Usernames.joe() ), Permissions.anything() ) ).re= duce() ); + assertEquals( Effects.GRANT, policy.evaluate( new SimpleAuthorizat= ionRequest( Subjects.with( Groups.canadians() ), Permissions.anything() ) )= .reduce() ); + assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new SimpleA= uthorizationRequest( Subjects.with( Roles.developer() ), Permissions.anythi= ng() ) ).reduce() ); } =20 public void testHasBuiltInSupportForAndOperationOnPredicates() throws = Exception @@ -215,10 +215,10 @@ Policy policy =3D new Policy( new PermitOverridesEffect() ); builder.buildRuleSet( policy ); =20 - assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new Default= AuthorizationRequest( Subjects.with( Usernames.joe() ), Permissions.anythin= g() ) ).reduce() ); - assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new Default= AuthorizationRequest( Subjects.with( Groups.geeks() ), Permissions.anything= () ) ).reduce() ); - assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new Default= AuthorizationRequest( Subjects.with( Roles.developer() ), Permissions.anyth= ing() ) ).reduce() ); - assertEquals( Effects.GRANT, policy.evaluate( new DefaultAuthoriza= tionRequest( Subjects.with( Usernames.joe(), Groups.geeks(), Roles.develope= r() ), Permissions.anything() ) ).reduce() ); + assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new SimpleA= uthorizationRequest( Subjects.with( Usernames.joe() ), Permissions.anything= () ) ).reduce() ); + assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new SimpleA= uthorizationRequest( Subjects.with( Groups.geeks() ), Permissions.anything(= ) ) ).reduce() ); + assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new SimpleA= uthorizationRequest( Subjects.with( Roles.developer() ), Permissions.anythi= ng() ) ).reduce() ); + assertEquals( Effects.GRANT, policy.evaluate( new SimpleAuthorizat= ionRequest( Subjects.with( Usernames.joe(), Groups.geeks(), Roles.developer= () ), Permissions.anything() ) ).reduce() ); } =20 public void testHasBuiltInSupportForOrOperationOnPredicates() throws E= xception @@ -242,9 +242,9 @@ Policy policy =3D new Policy( new PermitOverridesEffect() ); builder.buildRuleSet( policy ); =20 - assertEquals( Effects.GRANT, policy.evaluate( new DefaultAuthoriza= tionRequest( Subjects.with( Usernames.joe() ), Permissions.anything() ) ).r= educe() ); - assertEquals( Effects.GRANT, policy.evaluate( new DefaultAuthoriza= tionRequest( Subjects.with( Groups.geeks() ), Permissions.anything() ) ).re= duce() ); - assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new Default= AuthorizationRequest( Subjects.with( Roles.developer() ), Permissions.anyth= ing() ) ).reduce() ); + assertEquals( Effects.GRANT, policy.evaluate( new SimpleAuthorizat= ionRequest( Subjects.with( Usernames.joe() ), Permissions.anything() ) ).re= duce() ); + assertEquals( Effects.GRANT, policy.evaluate( new SimpleAuthorizat= ionRequest( Subjects.with( Groups.geeks() ), Permissions.anything() ) ).red= uce() ); + assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new SimpleA= uthorizationRequest( Subjects.with( Roles.developer() ), Permissions.anythi= ng() ) ).reduce() ); } =20 public void testSubjectIsAnAliasForAndOperation() throws Exception @@ -268,8 +268,8 @@ Policy policy =3D new Policy( new PermitOverridesEffect() ); builder.buildRuleSet( policy ); =20 - assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new Default= AuthorizationRequest( Subjects.with( Usernames.joe() ), Permissions.anythin= g() ) ).reduce() ); - assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new Default= AuthorizationRequest( Subjects.with( Roles.developer() ), Permissions.anyth= ing() ) ).reduce() ); - assertEquals( Effects.GRANT, policy.evaluate( new DefaultAuthoriza= tionRequest( Subjects.with( Usernames.joe(), Roles.developer() ), Permissio= ns.anything() ) ).reduce() ); + assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new SimpleA= uthorizationRequest( Subjects.with( Usernames.joe() ), Permissions.anything= () ) ).reduce() ); + assertEquals( Effects.NOT_APPLICABLE, policy.evaluate( new SimpleA= uthorizationRequest( Subjects.with( Roles.developer() ), Permissions.anythi= ng() ) ).reduce() ); + assertEquals( Effects.GRANT, policy.evaluate( new SimpleAuthorizat= ionRequest( Subjects.with( Usernames.joe(), Roles.developer() ), Permission= s=2Eanything() ) ).reduce() ); } }