[jboss-cvs] JBossAS SVN: r89001 - branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/security.

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

Author: wolfc
Date: 2009-05-18 05:50:59 -0400 (Mon, 18 May 2009)
New Revision: 89001

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java
Log:
JBPAPP-1951: hack to maintain unsecured MDBs

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java	2009-05-18 08:25:51 UTC (rev 89000)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/security/Ejb3AuthenticationInterceptor.java	2009-05-18 09:50:59 UTC (rev 89001)
@@ -33,6 +33,7 @@
 import org.jboss.aspects.security.SecurityContext;
 import org.jboss.ejb3.Container;
 import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.mdb.MessagingContainer;
 import org.jboss.logging.Logger;
 import org.jboss.security.AuthenticationManager;
 import org.jboss.security.RealmMapping;
@@ -130,7 +131,20 @@
          {
             SecurityRolesAssociation.setSecurityRoles(container.getAssemblyDescriptor().getPrincipalVersusRolesMap());
          }
-         return super.invoke(invocation);
+         // JBPAPP-1951: hack to maintain unsecured MDBs
+         // there could be an unauthenticated principal on the login module,
+         // let's try to authenticate.
+         try
+         {
+            return super.invoke(invocation);
+         }
+         catch(EJBAccessException e)
+         {
+            // no unauthenticated principal specified, but we are a messaging container
+            if(container instanceof MessagingContainer)
+               return invocation.invokeNext();
+            throw e;
+         }
       }
       finally
       {