[jboss-cvs] JBossAS SVN: r58052 - branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/security

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

Author: anil.saldhana at jboss.com
Date: 2006-11-03 00:03:27 -0500 (Fri, 03 Nov 2006)
New Revision: 58052

Modified:
   branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java
Log:
EJBTHREE-775:consider deployment level roles in jboss-app.xml

Modified: branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java
===================================================================
--- branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java	2006-11-03 05:02:30 UTC (rev 58051)
+++ branches/JEE5_TCK/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java	2006-11-03 05:03:27 UTC (rev 58052)
@@ -22,12 +22,8 @@
 package org.jboss.ejb3.security;
 
 import java.security.GeneralSecurityException;
-import java.security.Principal;
-import java.util.Set;
-import java.util.HashSet;
+import java.security.Principal; 
 
-import javax.security.auth.Subject;
-
 import javax.ejb.EJBAccessException;
 
 import org.jboss.ejb3.Container;
@@ -40,15 +36,16 @@
 import org.jboss.aspects.security.AuthenticationInterceptor;
 import org.jboss.aspects.security.SecurityContext;
 import org.jboss.security.AuthenticationManager;
-import org.jboss.security.RealmMapping;
-import org.jboss.security.RunAsIdentity;
+import org.jboss.security.RealmMapping; 
 import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SecurityRolesAssociation;
 import org.jboss.security.SimplePrincipal;
 
 /**
- * Comment
+ * Authentication Interceptor
  *
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @author Anil.Saldhana at jboss.org
  * @version $Revision$
  */
 public class Ejb3AuthenticationInterceptor extends AuthenticationInterceptor
@@ -98,7 +95,15 @@
             }
          }
       }
-
-      return super.invoke(invocation);
-   }
+      try
+      {  
+         //Set a map of principal-roles that may be configured at deployment level
+         SecurityRolesAssociation.setSecurityRoles(container.getAssemblyDescriptor().getPrincipalVersusRolesMap());
+         return super.invoke(invocation);
+      }
+      finally
+      { 
+         SecurityRolesAssociation.setSecurityRoles(null);
+      }
+   } 
 }