cvs commit: jakarta-tomcat/src/etc tomcat.policy

[glenn]

glenn       01/04/13 15:09:06

  Modified:    src/etc  Tag: tomcat_32 tomcat.policy
  Log:
  Fix PropertyPermission type, add a default grant
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.2   +27 -5     jakarta-tomcat/src/etc/tomcat.policy
  
  Index: tomcat.policy
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/etc/tomcat.policy,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- tomcat.policy     2000/12/28 22:11:00     1.5.2.1
  +++ tomcat.policy     2001/04/13 22:09:06     1.5.2.2
  @@ -2,16 +2,16 @@
   
   // javac
   grant codeBase "file:${java.home}/../lib/-" {
  -       permission java.security.AllPermission;
  +    permission java.security.AllPermission;
   };
   
   // Tomcat gets all permissions
   grant codeBase "file:${tomcat.home}/lib/-" {
  -       permission java.security.AllPermission;
  +    permission java.security.AllPermission;
   };
   
   grant codeBase "file:${tomcat.home}/classes/-" {
  -     permission java.security.AllPermission;
  +    permission java.security.AllPermission;
   };
   
   // Example webapp policy
  @@ -19,7 +19,29 @@
   // line.separator, path.separator, and file.separator PropertyPermissions. 
   // Any permissions you grant here are in addition to the default.
   grant codeBase "file:${tomcat.home}/webapps/examples" {
  -      // Allow the example web application to read all java properties
  -      permission java.util.ProperyPermission "*", "read";
  +    // Allow the example web application to read all java properties
  +    permission java.util.PropertyPermission "*", "read";
   };
   
  +grant {
  +    // OS Specific properties to allow read access
  +    permission java.util.PropertyPermission "os.name", "read";
  +    permission java.util.PropertyPermission "os.version", "read";
  +    permission java.util.PropertyPermission "os.arch", "read";
  +     
  +    // JVM properties to allow read access
  +    permission java.util.PropertyPermission "java.version", "read";
  +    permission java.util.PropertyPermission "java.vendor", "read";
  +    permission java.util.PropertyPermission "java.vendor.url", "read";
  +    permission java.util.PropertyPermission "java.class.version", "read";
  +    permission java.util.PropertyPermission "java.specification.version", "read";
  +    permission java.util.PropertyPermission "java.specification.vendor", "read";
  +    permission java.util.PropertyPermission "java.specification.name", "read";
  +
  +    permission java.util.PropertyPermission "java.vm.specification.version", "read";
  +    permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
  +    permission java.util.PropertyPermission "java.vm.specification.name", "read";
  +    permission java.util.PropertyPermission "java.vm.version", "read";
  +    permission java.util.PropertyPermission "java.vm.vendor", "read";
  +    permission java.util.PropertyPermission "java.vm.name", "read";
  +};