This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new b5ec896 Align with 9.0.x b5ec896 is described below commit b5ec8964c9c9e1ae1d3d1a351eed867e3ce00699 Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed Jul 10 12:59:16 2019 +0100 Align with 9.0.x --- .../apache/catalina/security/SecurityClassLoad.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java b/java/org/apache/catalina/security/SecurityClassLoad.java index a76515d..1bb6ecd 100644 --- a/java/org/apache/catalina/security/SecurityClassLoad.java +++ b/java/org/apache/catalina/security/SecurityClassLoad.java @@ -14,13 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.catalina.security; /** - * Static class used to preload java classes when using the Java SecurityManager - * so that the defineClassInPackage RuntimePermission does not trigger an - * AccessControlException. + * Static class used to preload java classes when using the + * Java SecurityManager so that the defineClassInPackage + * RuntimePermission does not trigger an AccessControlException. * * @author Glenn L. Nielsen */ @@ -30,6 +29,7 @@ public final class SecurityClassLoad { securityClassLoad(loader, true); } + static void securityClassLoad(ClassLoader loader, boolean requireSecurityManager) throws Exception { if (requireSecurityManager && System.getSecurityManager() == null) { @@ -49,6 +49,7 @@ public final class SecurityClassLoad { loadTomcatPackage(loader); } + private static final void loadCorePackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.core."; loader.loadClass(basePackage + "AccessLogAdapter"); @@ -67,17 +68,20 @@ public final class SecurityClassLoad { loader.loadClass(basePackage + "ApplicationHttpRequest$AttributeNamesEnumerator"); } + private static final void loadLoaderPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.loader."; loader.loadClass(basePackage + "WebappClassLoaderBase$PrivilegedFindClassByName"); loader.loadClass(basePackage + "WebappClassLoaderBase$PrivilegedHasLoggingConfig"); } + private static final void loadRealmPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.realm."; loader.loadClass(basePackage + "LockOutRealm$LockRecord"); } + private static final void loadServletsPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.servlets."; // Avoid a possible memory leak in the DefaultServlet when running with @@ -88,6 +92,7 @@ public final class SecurityClassLoad { loader.loadClass(basePackage + "DefaultServlet"); } + private static final void loadSessionPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.session."; loader.loadClass(basePackage + "StandardSession"); @@ -95,6 +100,7 @@ public final class SecurityClassLoad { loader.loadClass(basePackage + "StandardManager$PrivilegedDoUnload"); } + private static final void loadUtilPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.util."; loader.loadClass(basePackage + "ParameterMap"); @@ -102,6 +108,7 @@ public final class SecurityClassLoad { loader.loadClass(basePackage + "TLSUtil"); } + private static final void loadValvesPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.valves."; loadAnonymousInnerClasses(loader, basePackage + "AbstractAccessLogValve"); @@ -116,10 +123,12 @@ public final class SecurityClassLoad { loader.loadClass(basePackage + "http2.Stream$PrivilegedPush"); } + private static final void loadJavaxPackage(ClassLoader loader) throws Exception { loader.loadClass("javax.servlet.http.Cookie"); } + private static final void loadConnectorPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.catalina.connector."; loader.loadClass(basePackage + "RequestFacade$GetAttributePrivilegedAction"); @@ -144,6 +153,7 @@ public final class SecurityClassLoad { loadAnonymousInnerClasses(loader, basePackage + "Response"); } + private static final void loadTomcatPackage(ClassLoader loader) throws Exception { final String basePackage = "org.apache.tomcat."; // buf --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org