glenn 01/01/23 14:01:20
Modified: catalina/src/share/org/apache/catalina/startup Catalina.java
Log:
Implement SecurityManager
Revision Changes Path
1.13 +23 -9
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Catalina.java 2001/01/23 05:05:51 1.12
+++ Catalina.java 2001/01/23 22:01:16 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.12 2001/01/23 05:05:51 remm Exp $
- * $Revision: 1.12 $
- * $Date: 2001/01/23 05:05:51 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.13 2001/01/23 22:01:16 glenn Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/01/23 22:01:16 $
*
* ====================================================================
*
@@ -70,6 +70,7 @@
import java.io.OutputStream;
import java.lang.reflect.InvocationTargetException;
import java.net.Socket;
+import java.security.Security;
import java.util.Stack;
import org.apache.catalina.Container;
import org.apache.catalina.Lifecycle;
@@ -96,7 +97,7 @@
* </u>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.12 $ $Date: 2001/01/23 05:05:51 $
+ * @version $Revision: 1.13 $ $Date: 2001/01/23 22:01:16 $
*/
public class Catalina {
@@ -484,12 +485,6 @@
("addLifecycleListener",
"org.apache.catalina.LifecycleListener"));
- /*
- mapper.addRule(prefix + "/Loader",
- mapper.objectCreate
- ("org.apache.catalina.loader.StandardLoader",
- "className"));
- */
mapper.addRule(prefix + "/Loader",
new CreateLoaderAction());
mapper.addRule(prefix + "/Loader",
@@ -647,6 +642,25 @@
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
"org.apache.naming.java.javaURLContextFactory");
}
+
+ // If a SecurityManager is being used, set properties for
+ // checkPackageAccess() and checkPackageDefinition
+ if( System.getSecurityManager() != null ) {
+ String access = Security.getProperty("package.access");
+ if( access != null && access.length() > 0 )
+ access += ",";
+ else
+ access = "sun.,";
+ Security.setProperty("package.access",
+ access + "org.apache.catalina.,org.apache.jasper.");
+ String definition = Security.getProperty("package.definition");
+ if( definition != null && definition.length() > 0 )
+ definition += ",";
+ else
+ definition = "sun.,";
+ Security.setProperty("package.definition",
+ "java.,javax.,org.apache.catalina.,org.apache.jasper.");
+ }
// Start the new server
if (server instanceof Lifecycle) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
