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

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

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

Modified:
   trunk/labs/jbossweb/src/share/classes/org/apache/catalina/authenticator/AuthenticatorBase.java
Log:
- Don't ask for authentication if deny-from-all is in effect.

Fix for Bug #37934

Modified: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/authenticator/AuthenticatorBase.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/authenticator/AuthenticatorBase.java	2005-12-22 14:13:21 UTC (rev 1919)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/authenticator/AuthenticatorBase.java	2005-12-22 14:13:56 UTC (rev 1920)
@@ -69,7 +69,7 @@
  * requests.  Requests of any other type will simply be passed through.
  *
  * @author Craig R. McClanahan
- * @version $Revision: 348087 $ $Date: 2005-11-22 06:06:40 +0100 (mar., 22 nov. 2005) $
+ * @version $Revision: 357143 $ $Date: 2005-12-16 09:13:19 +0100 (ven., 16 déc. 2005) $
  */
 
 
@@ -475,7 +475,12 @@
         for(i=0; i < constraints.length && authRequired; i++) {
             if(!constraints[i].getAuthConstraint()) {
                 authRequired = false;
-            } 
+            } else if(!constraints[i].getAllRoles()) {
+                String [] roles = constraints[i].findAuthRoles();
+                if(roles == null || roles.length == 0) {
+                    authRequired = false;
+                }
+            }
         }
              
         if(authRequired) {