Protect initialization of ResourceLinkFactory when running with a Sec…

…urityManager. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1725926 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 21, 2016 · 76ebc90 · 76ebc90
1 parent 0a6502c
commit 76ebc90
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/java/org/apache/naming/factory/ResourceLinkFactory.java b/java/org/apache/naming/factory/ResourceLinkFactory.java
@@ -60,6 +60,11 @@ public class ResourceLinkFactory
  * @param newGlobalContext new global context value
  */
  public static void setGlobalContext(Context newGlobalContext) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(new RuntimePermission(
+ ResourceLinkFactory.class.getName() + ".setGlobalContext"));
+ }
  globalContext = newGlobalContext;
  }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
  issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 9.0.0.M3" rtext="In development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Protect initialization of <code>ResourceLinkFactory</code> when
+ running with a SecurityManager. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
 </section>
 <section name="Tomcat 9.0.0.M2" rtext="Voting in progress">
  <subsection name="Catalina">