[Jboss-svn-commits] JBL Code SVN: r1919 - trunk/labs/jbossweb/src/share/classes/org/apache/catalina/realm

[<jbo...@li...>]

Author: rem...@jb...
Date: 2005-12-22 09:13:21 -0500 (Thu, 22 Dec 2005)
New Revision: 1919

Modified:
   trunk/labs/jbossweb/src/share/classes/org/apache/catalina/realm/RealmBase.java
Log:
- Fix regression where the magic role '*' was denying all access.

I had forgotten that '*' isn't stored as a role, so Tomcat was treating it like <auth-constraint />.

Fix for Bug #37852
Submitted By:  xrcat (xrcat at mailinator.com)

Modified: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/realm/RealmBase.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/realm/RealmBase.java	2005-12-21 16:19:19 UTC (rev 1918)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/realm/RealmBase.java	2005-12-22 14:13:21 UTC (rev 1919)
@@ -60,7 +60,7 @@
  * location) are identical to those currently supported by Tomcat 3.X.
  *
  * @author Craig R. McClanahan
- * @version $Revision: 348091 $ $Date: 2005-11-22 06:18:05 +0100 (mar., 22 nov. 2005) $
+ * @version $Revision: 355701 $ $Date: 2005-12-10 03:53:21 +0100 (sam., 10 déc. 2005) $
  */
 
 public abstract class RealmBase
@@ -738,7 +738,7 @@
             if (log.isDebugEnabled())
                 log.debug("  Checking roles " + principal);
 
-            if (roles.length == 0) {
+            if (roles.length == 0 && !constraint.getAllRoles()) {
                 if(constraint.getAuthConstraint()) {
                     if( log.isDebugEnabled() )
                         log.debug("No roles ");