[portal-commits] JBoss Portal SVN: r12819 - in modules/authorization/trunk/policy-server/src: test/java/org/jboss/security/authz/policy/server and 1 other directories.

Author: sohil.shah(a)jboss.com Date: 2009-02-13 11:19:19 -0500 (Fri, 13 Feb 2009) New Revision: 12819 Modified: modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/HierarchialPolicy.java modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliedActions.java modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestEnterprisePolicyFinderModule.java Log: cleaning up tests to use the component-api instead of the low-level xacml api Modified: modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/HierarchialPolicy.java =================================================================== --- modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/HierarchialPolicy.java 2009-02-13 14:09:04 UTC (rev 12818) +++ modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/HierarchialPolicy.java 2009-02-13 16:19:19 UTC (rev 12819) @@ -62,6 +62,13 @@ import org.jboss.security.xacml.factories.PolicyAttributeFactory; /** + * TODO: Implement Hierarchial propagation feature.....such as Policy Inheritance, Policy Overriding + * + * Usecases: A resource /blah/blah2/index, should inherit Overriden Policy from /blah/blah2 (if found), or from /blah (if found) + * /blah/blah2/index can also explicitly specify its own Policy which will override any inherited policies from its parent + */ + +/** * Used for specifying policies for Resources represented by unique URIs, sometimes forming a tree like relationship with other Resources in the system * * An example of such resources would be tree of resources/nodes in a Content Management System Modified: modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliedActions.java =================================================================== --- modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliedActions.java 2009-02-13 14:09:04 UTC (rev 12818) +++ modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/TestImpliedActions.java 2009-02-13 16:19:19 UTC (rev 12819) @@ -26,23 +26,21 @@ import junit.framework.TestCase; import org.apache.log4j.Logger; -import org.jboss.security.authz.model.Attribute; import org.jboss.security.authz.model.Policy; import org.jboss.security.authz.model.PolicyMetaData; import org.jboss.security.authz.model.Resource; -import org.jboss.security.authz.model.Subject; -import org.jboss.security.authz.enforcement.Request; -import org.jboss.security.authz.enforcement.Response; + import org.jboss.security.authz.components.resource.URIResource; +import org.jboss.security.authz.components.subject.Roles; import org.jboss.security.authz.components.action.Operation; import org.jboss.security.authz.components.action.Read; import org.jboss.security.authz.components.action.Write; import org.jboss.security.authz.components.action.Manage; + +import org.jboss.security.authz.enforcement.Request; +import org.jboss.security.authz.enforcement.Response; import org.jboss.security.authz.policy.server.PolicyServer; -import org.jboss.security.xacml.interfaces.XACMLConstants; -import org.jboss.security.xacml.interfaces.XMLSchemaConstants; - /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> */ @@ -126,11 +124,9 @@ request.addResource(urlResource); //Create Subjects - Subject subject = new Subject(); - Attribute subjectAttr = new Attribute(XACMLConstants.ATTRIBUTEID_ROLE, - XMLSchemaConstants.DATATYPE_STRING, "user"); - subject.addAttribute(subjectAttr); - request.addSubject(subject); + Roles roles = new Roles(); + roles.addName("user"); + request.addSubject(roles.getSubject()); //Create Action request.setAction(operation.getAction()); Modified: modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestEnterprisePolicyFinderModule.java =================================================================== --- modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestEnterprisePolicyFinderModule.java 2009-02-13 14:09:04 UTC (rev 12818) +++ modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestEnterprisePolicyFinderModule.java 2009-02-13 16:19:19 UTC (rev 12819) @@ -29,17 +29,16 @@ import org.jboss.security.authz.model.Policy; import org.jboss.security.authz.model.PolicyMetaData; import org.jboss.security.authz.model.Resource; -import org.jboss.security.authz.model.Subject; -import org.jboss.security.authz.model.Action; -import org.jboss.security.authz.model.Attribute; + import org.jboss.security.authz.components.resource.HttpResource; +import org.jboss.security.authz.components.subject.Roles; +import org.jboss.security.authz.components.action.Read; + import org.jboss.security.authz.enforcement.Request; import org.jboss.security.authz.enforcement.Response; import org.jboss.security.authz.policy.server.PolicyServer; import org.jboss.security.authz.policy.server.Server; -import org.jboss.security.xacml.interfaces.XACMLConstants; -import org.jboss.security.xacml.interfaces.XMLSchemaConstants; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> @@ -111,22 +110,16 @@ Request request = new Request(); //Create Subjects - Subject subject = new Subject(); - Attribute subjectAttr = new Attribute(XACMLConstants.ATTRIBUTEID_ROLE, - XMLSchemaConstants.DATATYPE_STRING, mustBePermitted?"Admin":"Anonymous"); - subject.addAttribute(subjectAttr); - request.addSubject(subject); + Roles roles = new Roles(); + roles.addName(mustBePermitted?"Admin":"Anonymous"); + request.addSubject(roles.getSubject()); //Create Resource Resource urlResource = httpResource.getResource(); request.addResource(urlResource); - //Create Action - Action action = new Action(); - Attribute actionAttr = new Attribute(XACMLConstants.ATTRIBUTEID_ACTION_ID, - XMLSchemaConstants.DATATYPE_STRING, "GET"); - action.addAttribute(actionAttr); - request.setAction(action); + //Create Action + request.setAction(new Read().getAction()); return request; }