You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2002/09/13 23:59:48 UTC

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationFilterChain.java ApplicationFilterConfig.java StandardWrapper.java

jfarcand    2002/09/13 14:59:48

  Modified:    catalina/src/share/org/apache/catalina/core
                        ApplicationFilterChain.java
                        ApplicationFilterConfig.java StandardWrapper.java
  Log:
  When a SecurityManager is used, add a javax.security.auth.Subject object to the current java.security.AccessControlContext. This change allows a custom SecurityManager to grant/denied permission based on the Subject/Principal. This change does not affect either Tomcat used with no SecurityManager or Tomcat used with the default security manager. It will allow JSR 115 Java Authorization Contract for Container implementation to use Tomcat code as it is. Authorization decisions can now be implemented by creating an instance of a Realm.
  
  Revision  Changes    Path
  1.2       +42 -8     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java
  
  Index: ApplicationFilterChain.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApplicationFilterChain.java	18 Jul 2002 16:48:06 -0000	1.1
  +++ ApplicationFilterChain.java	13 Sep 2002 21:59:48 -0000	1.2
  @@ -69,6 +69,7 @@
   import java.util.ArrayList;
   import java.util.Iterator;
   import java.security.AccessController;
  +import java.security.Principal;
   import java.security.PrivilegedActionException;
   import javax.servlet.Filter;
   import javax.servlet.FilterChain;
  @@ -82,7 +83,7 @@
   import org.apache.catalina.InstanceEvent;
   import org.apache.catalina.util.InstanceSupport;
   import org.apache.catalina.util.StringManager;
  -
  +import org.apache.catalina.util.SecurityUtil;
   
   /**
    * Implementation of <code>javax.servlet.FilterChain</code> used to manage
  @@ -210,7 +211,25 @@
                   filter = filterConfig.getFilter();
                   support.fireInstanceEvent(InstanceEvent.BEFORE_FILTER_EVENT,
                                             filter, request, response);
  -                filter.doFilter(request, response, this);
  +                
  +                if( System.getSecurityManager() != null ) {
  +                    final ServletRequest req = request;
  +                    final ServletResponse res = response;
  +                    Principal principal = ((HttpServletRequest) req).getUserPrincipal();
  +                    Class[] classType = new Class[]{ServletRequest.class, 
  +                                                    ServletResponse.class,
  +                                                    FilterChain.class};
  +                    Object[] args = new Object[]{req, res, this};
  +                    SecurityUtil.doAsPrivilege("doFilter",
  +                                               filter,
  +                                               classType, 
  +                                               args);                                                   
  +                } else {  
  +                    filter.doFilter(request, response, this);
  +                }
  +                
  +                
  +                
                   support.fireInstanceEvent(InstanceEvent.AFTER_FILTER_EVENT,
                                             filter, request, response);
               } catch (IOException e) {
  @@ -244,8 +263,23 @@
                                         servlet, request, response);
               if ((request instanceof HttpServletRequest) &&
                   (response instanceof HttpServletResponse)) {
  -                servlet.service((HttpServletRequest) request,
  -                                (HttpServletResponse) response);
  +                    
  +                if( System.getSecurityManager() != null ) {
  +                    final ServletRequest req = request;
  +                    final ServletResponse res = response;
  +                    Principal principal = ((HttpServletRequest) req).getUserPrincipal();
  +                    Class[] classType = new Class[]{ServletRequest.class, 
  +                                                     ServletResponse.class};
  +                    Object[] args = new Object[]{req, res};
  +                    SecurityUtil.doAsPrivilege("service",
  +                                               servlet,
  +                                               classType, 
  +                                               args,
  +                                               principal);                                                   
  +                } else {  
  +                    servlet.service((HttpServletRequest) request,
  +                                    (HttpServletResponse) response);
  +                }
               } else {
                   servlet.service(request, response);
               }
  
  
  
  1.2       +32 -10    jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java
  
  Index: ApplicationFilterConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApplicationFilterConfig.java	18 Jul 2002 16:48:06 -0000	1.1
  +++ ApplicationFilterConfig.java	13 Sep 2002 21:59:48 -0000	1.2
  @@ -76,7 +76,7 @@
   import org.apache.catalina.Context;
   import org.apache.catalina.deploy.FilterDef;
   import org.apache.catalina.util.Enumerator;
  -
  +import org.apache.catalina.util.SecurityUtil;
   
   /**
    * Implementation of a <code>javax.servlet.FilterConfig</code> useful in
  @@ -89,7 +89,9 @@
   
   final class ApplicationFilterConfig implements FilterConfig {
   
  -
  +    private static org.apache.commons.logging.Log log=
  +        org.apache.commons.logging.LogFactory.getLog( ApplicationFilterConfig.class );
  + 
       // ----------------------------------------------------------- Constructors
   
   
  @@ -273,8 +275,18 @@
        */
       void release() {
   
  -        if (this.filter != null)
  -            filter.destroy();
  +        if (this.filter != null){
  +             if( System.getSecurityManager() != null) {
  +                try{
  +                    SecurityUtil.doAsPrivilege("destroy",
  +                                               filter);  
  +                } catch(java.lang.Exception ex){                    
  +                    log.error("ApplicationFilterConfig.doAsPrivilege", ex);
  +                }
  +            } else { 
  +                filter.destroy();
  +            }
  +        }
           this.filter = null;
   
        }
  @@ -304,8 +316,18 @@
           if (filterDef == null) {
   
               // Release any previously allocated filter instance
  -            if (this.filter != null)
  -                this.filter.destroy();
  +            if (this.filter != null){
  +                 if( System.getSecurityManager() != null) {
  +                    try{
  +                        SecurityUtil.doAsPrivilege("destroy",
  +                                                   filter);  
  +                    } catch(java.lang.Exception ex){    
  +                        log.error("ApplicationFilterConfig.doAsPrivilege", ex);
  +                    }
  +                } else { 
  +                    filter.destroy();
  +                }
  +            }
               this.filter = null;
   
           } else {
  
  
  
  1.2       +51 -11    jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StandardWrapper.java	18 Jul 2002 16:48:10 -0000	1.1
  +++ StandardWrapper.java	13 Sep 2002 21:59:48 -0000	1.2
  @@ -91,14 +91,19 @@
   import org.apache.catalina.Request;
   import org.apache.catalina.Response;
   import org.apache.catalina.Wrapper;
  +import javax.servlet.ServletRequest;
  +import javax.servlet.ServletResponse;
   import org.apache.catalina.connector.HttpRequestBase;
   import org.apache.catalina.connector.HttpResponseBase;
   import org.apache.catalina.loader.StandardClassLoader;
   import org.apache.catalina.util.Enumerator;
   import org.apache.catalina.util.InstanceSupport;
  +import org.apache.catalina.util.SecurityUtil;
   import org.apache.tomcat.util.log.SystemLogHandler;
   
  -
  +import java.security.PrivilegedActionException;
  +import java.security.PrivilegedExceptionAction;
  +import javax.security.auth.Subject;
   /**
    * Standard implementation of the <b>Wrapper</b> interface that represents
    * an individual servlet definition.  No child Containers are allowed, and
  @@ -156,7 +161,7 @@
       /**
        * The facade associated with this wrapper.
        */
  -    private StandardWrapperFacade facade =
  +    private final StandardWrapperFacade facade =
           new StandardWrapperFacade(this);
   
   
  @@ -828,7 +833,7 @@
   
           PrintStream out = System.out;
           SystemLogHandler.startCapture();
  -        Servlet servlet = null;
  +        final Servlet servlet;
           try {
               // If this "servlet" is really a JSP file, get the right class.
               // HOLD YOUR NOSE - this is a kludge that avoids having to do special
  @@ -921,7 +926,18 @@
               try {
                   instanceSupport.fireInstanceEvent(InstanceEvent.BEFORE_INIT_EVENT,
                                                     servlet);
  -                servlet.init(facade);
  +                
  +                if( System.getSecurityManager() != null) {
  +                    Class[] classType = new Class[]{ServletConfig.class};
  +                    Object[] args = new Object[]{((ServletConfig)facade)};
  +                    SecurityUtil.doAsPrivilege("init",
  +                                               servlet,
  +                                               classType, 
  +                                               args); 
  +                } else {
  +                    servlet.init(facade);                  
  +                }
  +                
                   // Invoke jspInit on JSP pages
                   if ((loadOnStartup > 0) && (jspFile != null)) {
                       // Invoking jspInit
  @@ -929,13 +945,25 @@
                       HttpResponseBase res = new HttpResponseBase();
                       req.setServletPath(jspFile);
                       req.setQueryString("jsp_precompile=true");
  -                    servlet.service(req, res);
  +                    
  +                    if( System.getSecurityManager() != null) {
  +                        Class[] classType = new Class[]{ServletRequest.class, 
  +                                                        ServletResponse.class};
  +                        Object[] args = new Object[]{req, res};
  +                        SecurityUtil.doAsPrivilege("service",
  +                                                   servlet,
  +                                                   classType, 
  +                                                   args);  
  +                    } else { 
  +                        servlet.service(req, res);
  +                    }
                   }
                   instanceSupport.fireInstanceEvent(InstanceEvent.AFTER_INIT_EVENT,
                                                     servlet);
               } catch (UnavailableException f) {
                   instanceSupport.fireInstanceEvent(InstanceEvent.AFTER_INIT_EVENT,
                                                     servlet, f);
  +                System.out.println("*************************************");
                   unavailable(f);
                   throw f;
               } catch (ServletException f) {
  @@ -1102,8 +1130,15 @@
           try {
               instanceSupport.fireInstanceEvent
                 (InstanceEvent.BEFORE_DESTROY_EVENT, instance);
  +            
               Thread.currentThread().setContextClassLoader(classLoader);
  -            instance.destroy();
  +            if( System.getSecurityManager() != null) {
  +                SecurityUtil.doAsPrivilege("destroy",
  +                                           instance);  
  +            } else { 
  +                instance.destroy();
  +            }
  +            
               instanceSupport.fireInstanceEvent
                 (InstanceEvent.AFTER_DESTROY_EVENT, instance);
           } catch (Throwable t) {
  @@ -1129,7 +1164,12 @@
               try {
                   Thread.currentThread().setContextClassLoader(classLoader);
                   while (!instancePool.isEmpty()) {
  -                    ((Servlet) instancePool.pop()).destroy();
  +                    if( System.getSecurityManager() != null) {
  +                        SecurityUtil.doAsPrivilege("destroy",
  +                                                   ((Servlet) instancePool.pop()));  
  +                    } else { 
  +                        ((Servlet) instancePool.pop()).destroy();
  +                    }
                   }
               } catch (Throwable t) {
                   instancePool = null;
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>