billbarker    2003/07/24 22:06:49

  Modified:    catalina/src/share/org/apache/catalina Realm.java
               catalina/src/share/org/apache/catalina/authenticator
                        AuthenticatorBase.java
               catalina/src/share/org/apache/catalina/realm
                        GenericPrincipal.java JAASMemoryLoginModule.java
                        RealmBase.java
  Log:
  Changing the Realm API to conform with the new requirements in the 2.4 spec.
  
  This implementation is sub-optimal, but committing it now so that at least the 5.0.5 
release will be spec-compliant.  I plan to revisit this (as well as other 
Authenticator optimizations).
  
  In implementing this, I discovered that I needed to do a two-pass over the 
constraints (since I can't usefully do a 401 before a SSL-redirect).  That's the 
reason for using SecurityConstraint [].
  
  Revision  Changes    Path
  1.4       +7 -6      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Realm.java
  
  Index: Realm.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Realm.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Realm.java        9 Aug 2002 01:12:39 -0000       1.3
  +++ Realm.java        25 Jul 2003 05:06:49 -0000      1.4
  @@ -68,6 +68,7 @@
   import java.io.IOException;
   import java.security.Principal;
   import java.security.cert.X509Certificate;
  +import java.util.List;
   
   import org.apache.catalina.deploy.SecurityConstraint;
   /**
  @@ -171,12 +172,12 @@
       public Principal authenticate(X509Certificate certs[]);
       
       /**
  -     * Return the SecurityConstraint configured to guard the request URI for
  +     * Return the SecurityConstraints configured to guard the request URI for
        * this request, or <code>null</code> if there is no such constraint.
        *
        * @param request Request we are processing
        */
  -    public SecurityConstraint findSecurityConstraint(HttpRequest request,
  +    public SecurityConstraint [] findSecurityConstraints(HttpRequest request,
                                                        Context context);
       /**
        * Perform access control based on the specified authorization constraint.
  
  
  
  1.9       +47 -42    
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
  
  Index: AuthenticatorBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AuthenticatorBase.java    18 Jul 2003 04:38:30 -0000      1.8
  +++ AuthenticatorBase.java    25 Jul 2003 05:06:49 -0000      1.9
  @@ -73,6 +73,8 @@
   import java.security.NoSuchAlgorithmException;
   import java.security.Principal;
   import java.util.Random;
  +import java.util.List;
  +import java.util.Iterator;
   import javax.servlet.ServletException;
   import javax.servlet.http.Cookie;
   import javax.servlet.http.HttpServletRequest;
  @@ -489,18 +491,16 @@
   
           Realm realm = this.context.getRealm();
           // Is this request URI subject to a security constraint?
  -        SecurityConstraint constraint = realm.
  -                                findSecurityConstraint(hrequest, this.context);
  +        SecurityConstraint [] constraints = realm.
  +                       findSecurityConstraints(hrequest, this.context);
          
  -        if ((constraint == null) /* &&
  +        if ((constraints == null) /* &&
               (!Constants.FORM_METHOD.equals(config.getAuthMethod())) */ ) {
               if (log.isDebugEnabled())
                   log.debug(" Not subject to any constraint");
               context.invokeNext(request, response);
               return;
           }
  -        if ((log.isDebugEnabled()) && (constraint != null))
  -            log.debug(" Subject to constraint " + constraint);
   
           // Make sure that constrained resources are not cached by web proxies
           // or browsers as caching can provide a security hole
  @@ -514,44 +514,49 @@
               sresponse.setHeader("Cache-Control", "no-cache");
               sresponse.setDateHeader("Expires", 1);
           }
  -
  -        // Enforce any user data constraint for this security constraint
  -        if (log.isDebugEnabled())
  -            log.debug(" Calling hasUserDataPermission()");
  +     int i;
  +     for(i=0; i < constraints.length; i++) {
  +         if (log.isDebugEnabled())
  +             log.debug(" Subject to constraint " + constraints[i]);
  +         // Enforce any user data constraint for this security constraint
  +         if (log.isDebugEnabled())
  +             log.debug(" Calling hasUserDataPermission()");
           
  -        if (!realm.hasUserDataPermission(hrequest, hresponse, constraint)) {
  -            if (log.isDebugEnabled())
  -                log.debug(" Failed hasUserDataPermission() test");
  -            // ASSERT: Authenticator already set the appropriate
  -            // HTTP status code, so we do not have to do anything special
  -            return;
  -        }
  -
  -        // Authenticate based upon the specified login configuration
  -        if (constraint.getAuthConstraint()) {
  -            if (log.isDebugEnabled())
  -                log.debug(" Calling authenticate()");
  -            if (!authenticate(hrequest, hresponse, config)) {
  -                if (log.isDebugEnabled())
  -                    log.debug(" Failed authenticate() test");
  -                // ASSERT: Authenticator already set the appropriate
  -                // HTTP status code, so we do not have to do anything special
  -                return;
  +         if (!realm.hasUserDataPermission(hrequest, hresponse, constraints[i])) {
  +             if (log.isDebugEnabled())
  +                 log.debug(" Failed hasUserDataPermission() test");
  +             // ASSERT: Authenticator already set the appropriate
  +             // HTTP status code, so we do not have to do anything special
  +             return;
  +         }
  +     }
  +     for(i=0; i < constraints.length; i++) {
  +         // Authenticate based upon the specified login configuration
  +         if (constraints[i].getAuthConstraint()) {
  +             if (log.isDebugEnabled())
  +                 log.debug(" Calling authenticate()");
  +             if (!authenticate(hrequest, hresponse, config)) {
  +                 if (log.isDebugEnabled())
  +                     log.debug(" Failed authenticate() test");
  +                 // ASSERT: Authenticator already set the appropriate
  +                 // HTTP status code, so we do not have to do anything special
  +                 return;
               }
           }
   
  -        // Perform access control based on the specified role(s)
  -        if (constraint.getAuthConstraint()) {
  -            if (log.isDebugEnabled())
  -                log.debug(" Calling accessControl()");
  +         // Perform access control based on the specified role(s)
  +         if (constraints[i].getAuthConstraint()) {
  +             if (log.isDebugEnabled())
  +                 log.debug(" Calling accessControl()");
               
  -            if (!realm.hasResourcePermission(hrequest, hresponse, constraint, 
this.context)) {
  -                if (log.isDebugEnabled())
  -                    log.debug(" Failed accessControl() test");
  -                // ASSERT: AccessControl method has already set the appropriate
  -                // HTTP status code, so we do not have to do anything special
  -                return;
  -            }
  +             if (!realm.hasResourcePermission(hrequest, hresponse, constraints[i], 
this.context)) {
  +                 if (log.isDebugEnabled())
  +                     log.debug(" Failed accessControl() test");
  +                 // ASSERT: AccessControl method has already set the appropriate
  +                 // HTTP status code, so we do not have to do anything special
  +                 return;
  +             }
  +         }
           }
   
           // Any and all specified constraints have been satisfied
  
  
  
  1.3       +6 -4      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/GenericPrincipal.java
  
  Index: GenericPrincipal.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/GenericPrincipal.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GenericPrincipal.java     12 Mar 2003 07:14:18 -0000      1.2
  +++ GenericPrincipal.java     25 Jul 2003 05:06:49 -0000      1.3
  @@ -197,6 +197,8 @@
        */
       public boolean hasRole(String role) {
   
  +        if("*".equals(role)) // Special 2.4 role meaning everyone
  +            return true;
           if (role == null)
               return (false);
           return (Arrays.binarySearch(roles, role) >= 0);
  
  
  
  1.5       +21 -11    
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java
  
  Index: JAASMemoryLoginModule.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASMemoryLoginModule.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JAASMemoryLoginModule.java        12 Mar 2003 06:45:32 -0000      1.4
  +++ JAASMemoryLoginModule.java        25 Jul 2003 05:06:49 -0000      1.5
  @@ -72,6 +72,8 @@
   import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Map;
  +import java.util.List;
  +import java.util.ArrayList;
   
   import java.security.Principal;
   import java.security.cert.X509Certificate;
  @@ -265,14 +267,15 @@
   
       
       /**
  -     * Return the SecurityConstraint configured to guard the request URI for
  +     * Return the SecurityConstraints configured to guard the request URI for
        * this request, or <code>null</code> if there is no such constraint.
        *
        * @param request Request we are processing
  +     * @param context Context the Request is mapped to
        */
  -    public SecurityConstraint findSecurityConstraint(HttpRequest request,
  +    public SecurityConstraint [] findSecurityConstraints(HttpRequest request,
                                                        Context context) {
  -
  +        ArrayList results = null;
           // Are there any defined security constraints?
           SecurityConstraint constraints[] = context.findConstraints();
           if ((constraints == null) || (constraints.length == 0)) {
  @@ -294,15 +297,22 @@
                   log("  Checking constraint '" + constraints[i] +
                       "' against " + method + " " + uri + " --> " +
                       constraints[i].included(uri, method));
  -            if (constraints[i].included(uri, method))
  -                return (constraints[i]);
  +            if (constraints[i].included(uri, method)) {
  +                if(results == null) {
  +                    results = new ArrayList();
  +                }
  +                results.add(constraints[i]);
  +            }
           }
   
           // No applicable security constraint was found
           if (debug)
               log("  No applicable constraint located");
  -        return (null);
  -
  +        if(results == null)
  +            return null;
  +        SecurityConstraint [] array = new SecurityConstraint[results.size()];
  +        System.arraycopy(results.toArray(), 0, array, 0, array.length);
  +        return array;
       }
       
       
  
  
  
  1.14      +21 -9     
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java
  
  Index: RealmBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- RealmBase.java    27 May 2003 17:02:36 -0000      1.13
  +++ RealmBase.java    25 Jul 2003 05:06:49 -0000      1.14
  @@ -73,6 +73,8 @@
   import java.security.cert.X509Certificate;
   import java.io.IOException;
   import java.util.Set;
  +import java.util.List;
  +import java.util.ArrayList;
   
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  @@ -441,14 +443,16 @@
       }
   
       /**
  -     * Return the SecurityConstraint configured to guard the request URI for
  +     * Return the SecurityConstraints configured to guard the request URI for
        * this request, or <code>null</code> if there is no such constraint.
        *
        * @param request Request we are processing
  +     * @param context Context the Request is mapped to
        */
  -    public SecurityConstraint findSecurityConstraint(HttpRequest request,
  +    public SecurityConstraint [] findSecurityConstraints(HttpRequest request,
                                                        Context context) {
   
  +        ArrayList results = null;
           // Are there any defined security constraints?
           SecurityConstraint constraints[] = context.findConstraints();
           if ((constraints == null) || (constraints.length == 0)) {
  @@ -469,14 +473,22 @@
                   log.debug("  Checking constraint '" + constraints[i] +
                       "' against " + method + " " + uri + " --> " +
                       constraints[i].included(uri, method));
  -            if (constraints[i].included(uri, method))
  -                return (constraints[i]);
  +            if (constraints[i].included(uri, method)) {
  +                if(results == null) {
  +                    results = new ArrayList();
  +                }
  +                results.add(constraints[i]);
  +            }
           }
   
           // No applicable security constraint was found
           if (log.isDebugEnabled())
               log.debug("  No applicable constraint located");
  -        return (null);
  +        if(results == null)
  +            return null;
  +        SecurityConstraint [] array = new SecurityConstraint [results.size()];
  +        System.arraycopy(results.toArray(), 0, array, 0, array.length);
  +        return array;
   
       }
    
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to