[jboss-cvs] JBossAS SVN: r86873 - in projects/security/security-xacml/trunk/jboss-xacml/src: test/java/org/jboss/test/security/xacml/config and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2009-04-06 15:52:19 -0400 (Mon, 06 Apr 2009)
New Revision: 86873

Added:
   projects/security/security-xacml/trunk/jboss-xacml/src/test/resources/test/config/justLocatorsConfig.xml
Modified:
   projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java
   projects/security/security-xacml/trunk/jboss-xacml/src/test/java/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java
Log:
SECURITY-407: just locators only

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java	2009-04-06 19:26:20 UTC (rev 86872)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/main/java/org/jboss/security/xacml/core/JBossPDP.java	2009-04-06 19:52:19 UTC (rev 86873)
@@ -246,16 +246,24 @@
    private void bootstrap(PDP pdp) throws Exception
    {
       PoliciesType policiesType = pdp.getPolicies();
-      List<PolicySetType> pset = policiesType.getPolicySet();
+      //SECURITY-407: Just allow Locators
+      if(policiesType != null)
+      {
+         List<PolicySetType> pset = policiesType.getPolicySet();
 
-      this.addPolicySets(pset, true);
+         this.addPolicySets(pset, true);
 
-      //Take care of additional policies
-      List<XACMLPolicy> policyList = this.addPolicies(policiesType.getPolicy());
-      policies.addAll(policyList);
-
+         //Take care of additional policies
+         List<XACMLPolicy> policyList = this.addPolicies(policiesType.getPolicy());
+         policies.addAll(policyList);  
+      }
+      
       //Take care of the locators
       LocatorsType locatorsType = pdp.getLocators();
+      
+      if(policiesType == null && locatorsType == null)
+         throw new IllegalStateException("Configuration should have either policies or locators");
+      
       List<LocatorType> locs = locatorsType.getLocator();
       for (LocatorType lt : locs)
       {

Modified: projects/security/security-xacml/trunk/jboss-xacml/src/test/java/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/test/java/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java	2009-04-06 19:26:20 UTC (rev 86872)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/test/java/org/jboss/test/security/xacml/config/JBossXACMLConfigUnitTestCase.java	2009-04-06 19:52:19 UTC (rev 86873)
@@ -153,4 +153,24 @@
             XACMLConstants.DECISION_DENY, XACMLTestUtil.getDecision(pdp,
             "test/policies/custom/custom-request.xml")); 
    }
-}
+   
+   /**
+    * SECURITY-407: Add just Locators in the config file
+    * @throws Exception
+    */
+   public void testPDPJustLocators() throws Exception
+   {
+      String fileName = "test/config/justLocatorsConfig.xml";
+      ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+      URL configFile = tcl.getResource(fileName);
+      JAXBContext jc = JAXBContext.newInstance("org.jboss.security.xacml.jaxb");
+      assertNotNull("JAXBContext is !null", jc);
+      Unmarshaller u = jc.createUnmarshaller();
+      JAXBElement<?> j = (JAXBElement<?>) u.unmarshal(configFile);
+      assertNotNull("JAXBElement is !null", j);
+      
+      assertNotNull("configFile != null", configFile);
+      PolicyDecisionPoint pdp = new JBossPDP(j);
+      assertNotNull(pdp); 
+   }
+}
\ No newline at end of file

Added: projects/security/security-xacml/trunk/jboss-xacml/src/test/resources/test/config/justLocatorsConfig.xml
===================================================================
--- projects/security/security-xacml/trunk/jboss-xacml/src/test/resources/test/config/justLocatorsConfig.xml	                        (rev 0)
+++ projects/security/security-xacml/trunk/jboss-xacml/src/test/resources/test/config/justLocatorsConfig.xml	2009-04-06 19:52:19 UTC (rev 86873)
@@ -0,0 +1,6 @@
+<ns:jbosspdp xmlns:ns="urn:jboss:xacml:2.0">
+  <ns:Locators>
+    <ns:Locator Name="org.jboss.security.xacml.locators.JBossPolicyLocator"> 
+    </ns:Locator>
+  </ns:Locators>
+</ns:jbosspdp>
\ No newline at end of file