Author: markt
Date: Mon Aug 21 16:02:15 2017
New Revision: 1805649
URL: http://svn.apache.org/viewvc?rev=1805649&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61437
Fix a possible AccessControlException accessing the WebSocket examples when
running under a SecurityManager.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1805649&r1=1805648&r2=1805649&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Mon Aug 21 16:02:15 2017
@@ -47,6 +47,7 @@ public final class SecurityClassLoad {
loadSessionPackage(loader);
loadUtilPackage(loader);
loadValvesPackage(loader);
+ loadWebResourcesPackage(loader);
loadJavaxPackage(loader);
loadConnectorPackage(loader);
loadTomcatPackage(loader);
@@ -164,6 +165,13 @@ public final class SecurityClassLoad {
}
+ private static final void loadWebResourcesPackage(ClassLoader loader)
+ throws Exception {
+ final String basePackage = "org.apache.catalina.webresources.";
+ loader.loadClass(basePackage + "WarResourceSet");
+ }
+
+
private static final void loadCoyotePackage(ClassLoader loader)
throws Exception {
final String basePackage = "org.apache.coyote.";
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1805649&r1=1805648&r2=1805649&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Aug 21 16:02:15 2017
@@ -57,6 +57,11 @@
running under a <code>SecurityManager</code> and using
<code>Subject.doAs()</code>. (markt)
</fix>
+ <fix>
+ <bug>61437</bug>: Fix a possible <code>AccessControlException</code>
+ accessing the WebSocket examples when running under a
+ <code>SecurityManager</code>. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
