Author: sohil.shah(a)jboss.com Date: 2009-02-01 23:10:43 -0500 (Sun, 01 Feb 2009) New Revision: 12764 Modified: modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/http/TestHttpResource.java modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/subject/TestIdentity.java modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/provisioning/HttpPolicyConfig.java modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestDroolsFunction.java Log: fixing Policy code. Concept of PolicyMetaData introduced Modified: modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/http/TestHttpResource.java =================================================================== --- modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/http/TestHttpResource.java 2009-02-01 17:28:39 UTC (rev 12763) +++ modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/http/TestHttpResource.java 2009-02-02 04:10:43 UTC (rev 12764) @@ -49,7 +49,7 @@ Target target = httpResource.getURLTarget(false); - Policy policy = new MockPolicy("testGetURLTargetNoParameters", target, new HashSet<Rule>()); + Policy policy = new MockPolicy("testGetURLTargetNoParameters", httpResource.getPolicyMetaData(false)); log.info("------------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); @@ -64,7 +64,7 @@ Target target = httpResource.getURLTarget(true); - Policy policy = new MockPolicy("testGetURLTargetWithParameters", target, new HashSet<Rule>()); + Policy policy = new MockPolicy("testGetURLTargetWithParameters", httpResource.getPolicyMetaData(true)); log.info("------------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); @@ -84,7 +84,7 @@ rules.add(httpResource.getPermittedRolesRule()); rules.add(httpResource.getDeniedRolesRule()); - Policy policy = new MockPolicy("testRoleRules", target, rules); + Policy policy = new MockPolicy("testRoleRules", httpResource.getPolicyMetaData(true)); log.info("------------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); @@ -106,7 +106,7 @@ rules.add(httpResource.getDeniedRolesRule()); rules.add(httpResource.getAllowedIpsRule()); - Policy policy = new MockPolicy("testIPRules", target, rules); + Policy policy = new MockPolicy("testIPRules", httpResource.getPolicyMetaData(true)); log.info("------------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); Modified: modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/subject/TestIdentity.java =================================================================== --- modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/subject/TestIdentity.java 2009-02-01 17:28:39 UTC (rev 12763) +++ modules/authorization/trunk/core-components/src/test/java/org/jboss/security/authz/components/subject/TestIdentity.java 2009-02-02 04:10:43 UTC (rev 12764) @@ -27,6 +27,7 @@ import junit.framework.TestCase; import org.apache.log4j.Logger; +import org.jboss.security.authz.model.PolicyMetaData; import org.jboss.security.authz.model.Target; import org.jboss.security.authz.model.Policy; import org.jboss.security.authz.model.Rule; @@ -52,7 +53,10 @@ Set<Rule> rules = new HashSet<Rule>(); rules.add(identity.getAllowAuthMethodRule()); - Policy policy = new MockPolicy("testGetAllowAuthMethodRule", target, rules); + PolicyMetaData metadata = new PolicyMetaData(); + metadata.setTarget(target); + metadata.setRules(rules); + Policy policy = new MockPolicy("testGetAllowAuthMethodRule", metadata); log.info("----------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); @@ -70,7 +74,10 @@ Set<Rule> rules = new HashSet<Rule>(); rules.add(identity.getDenyAuthMethodRule()); - Policy policy = new MockPolicy("testGetDenyAuthMethodRule", target, rules); + PolicyMetaData metadata = new PolicyMetaData(); + metadata.setTarget(target); + metadata.setRules(rules); + Policy policy = new MockPolicy("testGetDenyAuthMethodRule", metadata); log.info("----------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); @@ -88,7 +95,10 @@ Set<Rule> rules = new HashSet<Rule>(); rules.add(identity.getAllowIdentityRule()); - Policy policy = new MockPolicy("testGetAllowIdentityRule", target, rules); + PolicyMetaData metadata = new PolicyMetaData(); + metadata.setTarget(target); + metadata.setRules(rules); + Policy policy = new MockPolicy("testGetAllowIdentityRule", metadata); log.info("----------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); @@ -105,9 +115,12 @@ Set<Rule> rules = new HashSet<Rule>(); rules.add(identity.getDenyIdentityRule()); + + PolicyMetaData metadata = new PolicyMetaData(); + metadata.setTarget(target); + metadata.setRules(rules); + Policy policy = new MockPolicy("testGetDenyIdentityRule", metadata); - Policy policy = new MockPolicy("testGetDenyIdentityRule", target, rules); - log.info("----------------------------------------------------------------"); log.info(policy.generateXACMLPolicy()); } Modified: modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/provisioning/HttpPolicyConfig.java =================================================================== --- modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/provisioning/HttpPolicyConfig.java 2009-02-01 17:28:39 UTC (rev 12763) +++ modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/provisioning/HttpPolicyConfig.java 2009-02-02 04:10:43 UTC (rev 12764) @@ -84,35 +84,9 @@ HttpResource httpResource = new HttpResource(); this.parseTarget(httpResource, aclRuleElem); this.parseRules(httpResource, aclRuleElem); - - - Target target = httpResource.getURLTarget(true); //a target with all the parameters matched - - Set<Rule> rules = new HashSet<Rule>(); - - //Permitted Roles - Rule permittedRoles = httpResource.getPermittedRolesRule(); - if(permittedRoles != null) - { - rules.add(permittedRoles); - } - - //Denied Roles - Rule deniedRoles = httpResource.getDeniedRolesRule(); - if(deniedRoles != null) - { - rules.add(deniedRoles); - } - - //AllowedIP Rules - Rule allowedIps = httpResource.getAllowedIpsRule(); - if(allowedIps != null) - { - rules.add(allowedIps); - } - + //Generate the policy from the HttpResource component - Policy policy = new HierarchialPolicy(policyUri, target, rules); + Policy policy = new HierarchialPolicy(policyUri, httpResource.getPolicyMetaData(true)); cour.add(policy); } Modified: modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestDroolsFunction.java =================================================================== --- modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestDroolsFunction.java 2009-02-01 17:28:39 UTC (rev 12763) +++ modules/authorization/trunk/policy-server/src/test/java/org/jboss/security/authz/policy/server/plugin/TestDroolsFunction.java 2009-02-02 04:10:43 UTC (rev 12764) @@ -212,7 +212,10 @@ rules.add(writeRule); //Populate the HierarchialPolicy - HierarchialPolicy policy = new HierarchialPolicy("simpleHierarchialPolicy", target, rules); + PolicyMetaData metadata = new PolicyMetaData(); + metadata.setTarget(target); + metadata.setRules(rules); + HierarchialPolicy policy = new HierarchialPolicy("simpleHierarchialPolicy", metadata); return policy; }