[tomcat] branch 8.5.x updated: Fix BZ 64852. Avoid exception under a security manager

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[tomcat] branch 8.5.x updated: Fix BZ 64852. Avoid exception under a security manager

Mark Thomas-2
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 216ae87  Fix BZ 64852. Avoid exception under a security manager
216ae87 is described below

commit 216ae87ffbdf01edfa3b29d606b93f9cbd236588
Author: Mark Thomas <[hidden email]>
AuthorDate: Thu Jul 9 11:50:39 2020 +0100

    Fix BZ 64852. Avoid exception under a security manager
   
    Patch provided by Johnathan Gilday
    https://bz.apache.org/bugzilla/show_bug.cgi?id=64582
---
 java/org/apache/catalina/security/SecurityClassLoad.java | 1 +
 webapps/docs/changelog.xml                               | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java b/java/org/apache/catalina/security/SecurityClassLoad.java
index 5afa0a0..e19d7a2 100644
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -125,6 +125,7 @@ public final class SecurityClassLoad {
 
     private static final void loadConnectorPackage(ClassLoader loader) throws Exception {
         final String basePackage = "org.apache.catalina.connector.";
+        loader.loadClass(basePackage + "CoyoteOutputStream");
         loader.loadClass(basePackage + "RequestFacade$GetAttributePrivilegedAction");
         loader.loadClass(basePackage + "RequestFacade$GetParameterMapPrivilegedAction");
         loader.loadClass(basePackage + "RequestFacade$GetRequestDispatcherPrivilegedAction");
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0bd9c23..ceab57a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 8.5.58 (markt)" rtext="in development">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        <bug>64582</bug>: Pre-load the <code>CoyoteOutputStream</code> class to
+        prevent a potential exception when running under a security manager.
+        Patch provided by Johnathan Gilday. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Coyote">
     <changelog>
       <fix>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]