[jboss-cvs] JBossAS SVN: r73919 - projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins.

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

Author: anil.saldhana at jboss.com
Date: 2008-06-02 09:27:47 -0400 (Mon, 02 Jun 2008)
New Revision: 73919

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
Log:
SECURITY-227: authorize method

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java	2008-06-02 13:26:51 UTC (rev 73918)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossAuthorizationManager.java	2008-06-02 13:27:47 UTC (rev 73919)
@@ -38,9 +38,7 @@
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.jacc.PolicyContext;
-import javax.security.jacc.PolicyContextException;
+import javax.security.auth.callback.CallbackHandler; 
 
 import org.jboss.logging.Logger;
 import org.jboss.security.AnybodyPrincipal;
@@ -101,20 +99,31 @@
    public int authorize(Resource resource) throws AuthorizationException
    {
       validateResource(resource);
-      
-      String SUBJECT_CONTEXT_KEY = SecurityConstants.SUBJECT_CONTEXT_KEY;
-      Subject subject = null;
+      Subject subject;
       try
       {
-         subject = (Subject) PolicyContext.getContext(SUBJECT_CONTEXT_KEY);
+         subject = SubjectActions.getActiveSubject();
       }
-      catch (PolicyContextException e)
+      catch (PrivilegedActionException e)
       {
-         log.error("Error obtaining AuthenticatedSubject:",e);
+         log.trace("Exception ",e);         
+         throw new AuthorizationException(e.getLocalizedMessage()); 
       }
       return internalAuthorization(resource,subject, null);
    }
    
+   /**
+    * @see AuthorizationManager#authorize(Resource, Subject)
+    */
+   public int authorize(Resource resource, Subject subject)
+   throws AuthorizationException
+   {
+      return internalAuthorization(resource, subject, null);
+   }
+   
+   /**
+    * @see AuthorizationManager#authorize(Resource, Subject, RoleGroup) 
+    */
    public int authorize(Resource resource, Subject subject,
          RoleGroup role) throws AuthorizationException
    {
@@ -122,6 +131,9 @@
       return internalAuthorization(resource, subject, role);
    }
 
+   /**
+    * @see AuthorizationManager#authorize(Resource, Subject, Group)
+    */
    public int authorize(Resource resource, Subject subject, 
          Group roleGroup) throws AuthorizationException
    {