cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources DirContextURLConnection.java

[glenn]

glenn       01/03/31 06:06:31

  Modified:    catalina/src/share/org/apache/naming/resources
                        DirContextURLConnection.java
  Log:
  Implement getPermission so that a FilePermission used to enforce security instead of 
the default AllPermission
  
  Revision  Changes    Path
  1.5       +22 -4     
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java
  
  Index: DirContextURLConnection.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DirContextURLConnection.java      2001/03/21 19:51:48     1.4
  +++ DirContextURLConnection.java      2001/03/31 14:06:31     1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java,v
 1.4 2001/03/21 19:51:48 remm Exp $
  - * $Revision: 1.4 $
  - * $Date: 2001/03/21 19:51:48 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java,v
 1.5 2001/03/31 14:06:31 glenn Exp $
  + * $Revision: 1.5 $
  + * $Date: 2001/03/31 14:06:31 $
    *
    * ====================================================================
    *
  @@ -68,6 +68,8 @@
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.FileNotFoundException;
  +import java.io.FilePermission;
  +import java.security.Permission;
   import java.util.Date;
   import java.util.Enumeration;
   import java.util.Vector;
  @@ -89,7 +91,7 @@
    * content is directly returned.
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public class DirContextURLConnection 
       extends URLConnection {
  @@ -103,6 +105,7 @@
           if (context == null)
               throw new IllegalArgumentException
                   ("Directory context can't be null");
  +        this.permission = new FilePermission(url.toString(),"read");
           this.context = context;
       }
       
  @@ -146,6 +149,12 @@
       protected long date;
       
       
  +    /**
  +     * Permission
  +     */
  +    protected Permission permission;
  +
  +
       // ------------------------------------------------------------- Properties
       
       
  @@ -314,6 +323,15 @@
       }
       
       
  +    /**
  +     * Get the Permission for this URL
  +     */
  +    public Permission getPermission() {
  +
  +        return permission;
  +    }
  +
  +
       // --------------------------------------------------------- Public Methods