Author: kkolinko
Date: Tue May 13 14:15:06 2014
New Revision: 1594230
URL: http://svn.apache.org/r1594230
Log:
Merged r1594229 from tomcat/trunk:
Require RuntimePermission when introducing a new token.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/ContextAccessController.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1594229
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/ContextAccessController.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/ContextAccessController.java?rev=1594230&r1=1594229&r2=1594230&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/ContextAccessController.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/ContextAccessController.java
Tue May 13 14:15:06 2014
@@ -55,6 +55,12 @@ public class ContextAccessController {
* @param token Security token
*/
public static void setSecurityToken(Object name, Object token) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(new RuntimePermission(
+ ContextAccessController.class.getName()
+ + ".setSecurityToken"));
+ }
if ((!securityTokens.containsKey(name)) && (token != null)) {
securityTokens.put(name, token);
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1594230&r1=1594229&r2=1594230&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue May 13 14:15:06 2014
@@ -157,8 +157,8 @@
when running under a security manager. (markt)
</add>
<fix>
- Make the naming context tokens for containers more robust by using a
- separate object. (markt/kkolinko)
+ Make the naming context tokens for containers more robust. Require
+ RuntimePermission when introducing a new token. (markt/kkolinko)
</fix>
<fix>
<bug>56472</bug>: Allow NamingContextListener to clean up on stop if
its
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
