Author: sohil.shah(a)jboss.com Date: 2009-07-11 15:55:21 -0400 (Sat, 11 Jul 2009) New Revision: 13547 Modified: modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/LocalEnforcementPoint.java modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestParameterMatching.java modules/authorization/trunk/policy-server/src/main/resources/META-INF/jboss-beans.xml Log: testsuite refactoring Modified: modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/LocalEnforcementPoint.java =================================================================== --- modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/LocalEnforcementPoint.java 2009-07-11 18:17:51 UTC (rev 13546) +++ modules/authorization/trunk/agent/src/main/java/org/jboss/security/authz/agent/enforcement/LocalEnforcementPoint.java 2009-07-11 19:55:21 UTC (rev 13547) @@ -75,7 +75,7 @@ //------------------------------------------------------------------------------------------------------------------------------------------------------------------------ public EnforcementResponse checkAccess(EnforcementContext enforcementContext) throws EnforcementException { - /*if(enforcementContext == null) + if(enforcementContext == null) { throw new IllegalArgumentException("Enforcement Context is Null"); } @@ -94,11 +94,10 @@ { log.error(this, pe); throw new EnforcementException(pe); - }*/ - return null; + } } //----------------------------------------------------------------------------------------------------------------------------------------------------------------------- - /*private Request generateEnforcementRequest(EnforcementContext enforcementContext) + private Request generateEnforcementRequest(EnforcementContext enforcementContext) { Request request = new Request(); @@ -136,5 +135,5 @@ } return request; - }*/ + } } Modified: modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java =================================================================== --- modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java 2009-07-11 18:17:51 UTC (rev 13546) +++ modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java 2009-07-11 19:55:21 UTC (rev 13547) @@ -141,7 +141,7 @@ String ruleLogic = MessageFormat.format(Roles.allowRule, ruleReference, condition.substring(0, condition.length()-2).trim()); - return new String[]{ruleReference, buffer.toString()}; + return new String[]{ruleReference, ruleLogic}; } /** @@ -165,6 +165,6 @@ String ruleLogic = MessageFormat.format(Roles.denyRule, ruleReference, condition.substring(0, condition.length()-2).trim()); - return new String[]{ruleReference, buffer.toString()}; + return new String[]{ruleReference, ruleLogic}; } } Modified: modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestParameterMatching.java =================================================================== --- modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestParameterMatching.java 2009-07-11 18:17:51 UTC (rev 13546) +++ modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestParameterMatching.java 2009-07-11 19:55:21 UTC (rev 13547) @@ -27,8 +27,8 @@ import junit.framework.TestCase; +import org.jboss.security.authz.http.component.resource.HttpResource; import org.jboss.security.authz.http.component.action.Get; -import org.jboss.security.authz.http.component.resource.HttpResource; import org.jboss.security.authz.components.subject.Roles; import org.jboss.security.authz.model.Effect; @@ -37,6 +37,8 @@ import org.jboss.security.authz.agent.Agent; import org.jboss.security.authz.agent.enforcement.PolicyEnforcementPoint; +import org.jboss.security.authz.agent.enforcement.EnforcementContext; +import org.jboss.security.authz.agent.enforcement.EnforcementResponse; import org.jboss.security.authz.agent.provisioning.PolicyProvisioner; import org.jboss.security.authz.agent.services.PolicyComposer; import org.jboss.security.authz.agent.services.CompositionContext; @@ -92,7 +94,7 @@ //SetUp a Contextual HttpResource component representing an incoming request that needs authorization //where access should be granted - /*HttpResource permit = new HttpResource(); + HttpResource permit = new HttpResource(); permit.setUri(new URI("/prefix/url/index.html")); for(int i=0; i<5; i++) { @@ -113,10 +115,10 @@ } //Access Granted Enforcement - this.enforce(this.createRequest(permit), true); + this.enforce(this.createEnforcementContext(permit), true); //Access Denied Enforcement - this.enforce(this.createRequest(deny), false);*/ + this.enforce(this.createEnforcementContext(deny), false); } /*public void testMatchContextSubset() throws Exception @@ -156,13 +158,12 @@ //Access Denied Enforcement......In fact in the case where the Context carries a Subset of the parameters expected by the policy //It will always result in a Deny since it will never fulfill the match expected by the policy this.enforce(this.createRequest(deny), false); - } + }*/ //----------------------------------------------------------------------------------------------------------------------------------------------------- - private void enforce(Request request, boolean mustBePermitted) throws Exception - { + private void enforce(EnforcementContext enforcementContext, boolean mustBePermitted) throws Exception + { + EnforcementResponse response = this.enforcer.checkAccess(enforcementContext); - Response response = this.enforcer.checkAccess(request); - assertNotNull(response); log.info("-----------------------------------"); log.info("Decision="+response.getMessage()); @@ -177,22 +178,22 @@ } } - private Request createRequest(HttpResource contextResource) throws Exception + private EnforcementContext createEnforcementContext(HttpResource protectedResource) throws Exception { - //Create a RequestType - Request request = new Request(); - - //Create Subjects - Roles roles = new Roles(); - roles.addName("Admin"); - request.addSubject(roles.getSubject()); - - //Create Resource - request.addResource(contextResource.getResource()); - - //Create Action - request.setAction(new Read().getAction()); - - return request; - }*/ + // Create an EnforcementContext + EnforcementContext context = new EnforcementContext(); + + //Resource being accessed + context.setAttribute("http-resource", protectedResource); + + //Subject who are authenticated + Roles roles = new Roles(); + roles.addName("Admin"); + context.setAttribute("roles", roles); + + //Action being performed + context.setAttribute("http-get", new Get()); + + return context; + } } Modified: modules/authorization/trunk/policy-server/src/main/resources/META-INF/jboss-beans.xml =================================================================== --- modules/authorization/trunk/policy-server/src/main/resources/META-INF/jboss-beans.xml 2009-07-11 18:17:51 UTC (rev 13546) +++ modules/authorization/trunk/policy-server/src/main/resources/META-INF/jboss-beans.xml 2009-07-11 19:55:21 UTC (rev 13547) @@ -16,6 +16,7 @@ </bean> <bean name="/policy-server/PolicyDecisionPoint" class="org.jboss.security.authz.policy.server.decision.PolicyDecisionPoint"> + <property name="debug">true</property> </bean> <bean name="/policy-server/PolicyDeployer" class="org.jboss.security.authz.policy.server.provisioning.PolicyDeployer">