Author: markt
Date: Thu Apr 6 20:27:06 2017
New Revision: 1790454
URL: http://svn.apache.org/viewvc?rev=1790454&view=rev
Log:
Remove unnecessary privileged block from getAttribute.
I can't see anything in doGetAttribute that would trigger a security check.
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
Modified: tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1790454&r1=1790453&r2=1790454&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java Thu Apr 6
20:27:06 2017
@@ -214,25 +214,9 @@ public class PageContextImpl extends Pag
public Object getAttribute(final String name, final int scope) {
if (name == null) {
- throw new NullPointerException(Localizer
- .getMessage("jsp.error.attribute.null_name"));
+ throw new
NullPointerException(Localizer.getMessage("jsp.error.attribute.null_name"));
}
- if (SecurityUtil.isPackageProtectionEnabled()) {
- return AccessController.doPrivileged(
- new PrivilegedAction<Object>() {
- @Override
- public Object run() {
- return doGetAttribute(name, scope);
- }
- });
- } else {
- return doGetAttribute(name, scope);
- }
-
- }
-
- private Object doGetAttribute(String name, int scope) {
switch (scope) {
case PAGE_SCOPE:
return attributes.get(name);
@@ -242,8 +226,7 @@ public class PageContextImpl extends Pag
case SESSION_SCOPE:
if (session == null) {
- throw new IllegalStateException(Localizer
- .getMessage("jsp.error.page.noSession"));
+ throw new
IllegalStateException(Localizer.getMessage("jsp.error.page.noSession"));
}
return session.getAttribute(name);
Modified: tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java?rev=1790454&r1=1790453&r2=1790454&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java Thu Apr
6 20:27:06 2017
@@ -60,7 +60,6 @@ public final class SecurityClassLoad {
loader.loadClass( basePackage + "runtime.PageContextImpl$7");
loader.loadClass( basePackage + "runtime.PageContextImpl$8");
loader.loadClass( basePackage + "runtime.PageContextImpl$9");
- loader.loadClass( basePackage + "runtime.PageContextImpl$10");
loader.loadClass( basePackage + "runtime.JspContextWrapper");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
