[jboss-cvs] JBossAS SVN: r72326 - in projects/security/security-jboss-sx/trunk/jbosssx/src: main/org/jboss/security/authorization/modules/web and 1 other directories.

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

Author: anil.saldhana at jboss.com
Date: 2008-04-17 01:20:07 -0400 (Thu, 17 Apr 2008)
New Revision: 72326

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBXACMLPolicyModuleDelegate.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/web/WebXACMLPolicyModuleDelegate.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/xacml/WebXACMLUnitTestCase.java
Log:
SECURITY-196: additional cleanup

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBXACMLPolicyModuleDelegate.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBXACMLPolicyModuleDelegate.java	2008-04-17 05:02:28 UTC (rev 72325)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBXACMLPolicyModuleDelegate.java	2008-04-17 05:20:07 UTC (rev 72326)
@@ -23,7 +23,6 @@
 
 import java.lang.reflect.Method;
 import java.security.Principal;
-import java.util.HashMap;
 import java.util.Map;
 
 import javax.security.auth.Subject;
@@ -114,10 +113,6 @@
          RequestContext requestCtx = util.createXACMLRequest(this.ejbName,
                this.ejbMethod.getName(),this.principal, callerRoles);
          
-         //See if a PDP exists already
-         Map<String,Object> contextMap = new HashMap<String,Object>();
-         contextMap.put("PDP", "PDP");
-         
          PolicyDecisionPoint pdp = util.getPDP(policyRegistration, this.policyContextID); 
          if(pdp == null)
             throw new IllegalStateException("PDP is null");

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/web/WebXACMLPolicyModuleDelegate.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/web/WebXACMLPolicyModuleDelegate.java	2008-04-17 05:02:28 UTC (rev 72325)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/web/WebXACMLPolicyModuleDelegate.java	2008-04-17 05:20:07 UTC (rev 72326)
@@ -51,7 +51,9 @@
  *  @version $Revision: 46543 $
  */
 public class WebXACMLPolicyModuleDelegate extends AuthorizationModuleDelegate
-{  
+{ 
+   private String policyContextID = null;
+   
    public WebXACMLPolicyModuleDelegate()
    {  
       log = Logger.getLogger(getClass());
@@ -81,6 +83,7 @@
       this.policyRegistration = (PolicyRegistration) map.get(ResourceKeys.POLICY_REGISTRATION);
       if(this.policyRegistration == null)
          throw new IllegalStateException("PolicyRegistration passed is null");
+      this.policyContextID = webResource.getPolicyContextID();  
       
       Boolean userDataCheck = checkBooleanValue((Boolean)map.get(ResourceKeys.USERDATA_PERM_CHECK));
       Boolean roleRefCheck = checkBooleanValue((Boolean)map.get(ResourceKeys.ROLEREF_PERM_CHECK)); 
@@ -125,9 +128,10 @@
       try
       {
          RequestContext requestCtx = util.createXACMLRequest(request,callerRoles);
-         String contextID = PolicyContext.getContextID();
+         if(this.policyContextID == null)
+           this.policyContextID = PolicyContext.getContextID();
           
-         PolicyDecisionPoint pdp = util.getPDP(this.policyRegistration, contextID);
+         PolicyDecisionPoint pdp = util.getPDP(this.policyRegistration, this.policyContextID);
          ResponseContext response = pdp.evaluate(requestCtx);
          result = response.getDecision() == XACMLConstants.DECISION_PERMIT ? 
                AuthorizationContext.PERMIT : AuthorizationContext.DENY; 

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/xacml/WebXACMLUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/xacml/WebXACMLUnitTestCase.java	2008-04-17 05:02:28 UTC (rev 72325)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/tests/org/jboss/test/authorization/xacml/WebXACMLUnitTestCase.java	2008-04-17 05:20:07 UTC (rev 72326)
@@ -26,7 +26,6 @@
 import java.util.HashMap;
 
 import javax.security.auth.Subject;
-import javax.security.jacc.PolicyContext;
 import javax.servlet.http.HttpServletRequest;
 
 import junit.framework.TestCase;
@@ -46,7 +45,6 @@
 import org.jboss.security.identity.RoleGroup;
 import org.jboss.security.identity.plugins.SimpleRole;
 import org.jboss.security.identity.plugins.SimpleRoleGroup;
-import org.jboss.security.jacc.SubjectPolicyContextHandler;
 import org.jboss.security.plugins.JBossPolicyRegistration;
 import org.jboss.test.SecurityActions;
 import org.jboss.test.util.TestHttpServletRequest;
@@ -67,8 +65,7 @@
    protected void setUp() throws Exception
    { 
       super.setUp();
-      setSecurityContext();
-      setUpPolicyContext();
+      setSecurityContext(); 
       setSecurityConfiguration();
    }
 
@@ -79,6 +76,7 @@
       PolicyRegistration policyRegistration = new JBossPolicyRegistration();
       registerPolicy(policyRegistration);
       WebResource er = getResource(policyRegistration); 
+      er.setPolicyContextID(this.contextID);
       
       er.setServletRequest(new TestHttpServletRequest(p, uri, "GET"));
       assertEquals(AuthorizationContext.PERMIT, 
@@ -99,6 +97,7 @@
       PolicyRegistration policyRegistration = new JBossPolicyRegistration();
       registerPolicy(policyRegistration);
       WebResource er = getResource(policyRegistration); 
+      er.setPolicyContextID(this.contextID);
       
       Principal principal = new SimplePrincipal("Notjduke");
       HttpServletRequest hsr = new TestHttpServletRequest(principal, uri, "GET");
@@ -151,18 +150,10 @@
       {
          throw new RuntimeException(e);
       }
-      sc.getUtil().createSubjectInfo(p, "cred", getSubject());
-      //sc.getUtil().setRoles(getRoleGroup());
+      sc.getUtil().createSubjectInfo(p, "cred", getSubject()); 
       SecurityContextAssociation.setSecurityContext(sc);
-   }
+   } 
    
-   private void setUpPolicyContext() throws Exception
-   {
-      SecurityActions.setPolicyContextID(contextID);
-      PolicyContext.registerHandler(SecurityConstants.SUBJECT_CONTEXT_KEY, 
-            new SubjectPolicyContextHandler(), true);
-   }
-   
    private void setSecurityConfiguration() throws Exception
    {
       SecurityConfiguration.addApplicationPolicy(new ApplicationPolicy("other"));