You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/03/05 14:57:14 UTC
svn commit: r1664348 - in /tomcat/tc8.0.x/trunk: ./
java/javax/el/ImportHandler.java test/javax/el/TestImportHandler.java
test/util/a/ test/util/b/ webapps/docs/changelog.xml
Author: markt
Date: Thu Mar 5 13:57:13 2015
New Revision: 1664348
URL: http://svn.apache.org/r1664348
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57135
When using the EL ImportHandler, import of a package should only import the public, concrete classes.
Added:
tomcat/tc8.0.x/trunk/test/util/a/
- copied from r1664347, tomcat/trunk/test/util/a/
tomcat/tc8.0.x/trunk/test/util/b/
- copied from r1664347, tomcat/trunk/test/util/b/
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java
tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 5 13:57:13 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347
Modified: tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java?rev=1664348&r1=1664347&r2=1664348&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java (original)
+++ tomcat/tc8.0.x/trunk/java/javax/el/ImportHandler.java Thu Mar 5 13:57:13 2015
@@ -51,7 +51,7 @@ public class ImportHandler {
String className = name.substring(0, lastPeriod);
String fieldOrMethodName = name.substring(lastPeriod + 1);
- Class<?> clazz = findClass(className);
+ Class<?> clazz = findClass(className, true);
if (clazz == null) {
throw new ELException(Util.message(
@@ -150,7 +150,7 @@ public class ImportHandler {
// Search the class imports
String className = classNames.get(name);
if (className != null) {
- Class<?> clazz = findClass(className);
+ Class<?> clazz = findClass(className, true);
if (clazz != null) {
clazzes.put(className, clazz);
return clazz;
@@ -161,7 +161,7 @@ public class ImportHandler {
// (which correctly triggers an error)
for (String p : packageNames) {
className = p + '.' + name;
- Class<?> clazz = findClass(className);
+ Class<?> clazz = findClass(className, false);
if (clazz != null) {
if (result != null) {
throw new ELException(Util.message(null,
@@ -188,7 +188,7 @@ public class ImportHandler {
}
- private Class<?> findClass(String name) {
+ private Class<?> findClass(String name, boolean throwException) {
Class<?> clazz;
ClassLoader cl = Thread.currentThread().getContextClassLoader();
try {
@@ -201,8 +201,12 @@ public class ImportHandler {
int modifiers = clazz.getModifiers();
if (!Modifier.isPublic(modifiers) || Modifier.isAbstract(modifiers) ||
Modifier.isInterface(modifiers)) {
- throw new ELException(Util.message(
- null, "importHandler.invalidClass", name));
+ if (throwException) {
+ throw new ELException(Util.message(
+ null, "importHandler.invalidClass", name));
+ } else {
+ return null;
+ }
}
return clazz;
Modified: tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java?rev=1664348&r1=1664347&r2=1664348&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java (original)
+++ tomcat/tc8.0.x/trunk/test/javax/el/TestImportHandler.java Thu Mar 5 13:57:13 2015
@@ -255,4 +255,19 @@ public class TestImportHandler {
}
}
}
+
+
+ /**
+ * Package imports with conflicts due to non-public classes should not
+ * conflict.
+ */
+ @Test
+ public void testBug57135() {
+ ImportHandler importHandler = new ImportHandler();
+
+ importHandler.importPackage("util.a");
+ importHandler.importPackage("util.b");
+
+ importHandler.resolveClass("Foo");
+ }
}
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=1664348&r1=1664347&r2=1664348&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Mar 5 13:57:13 2015
@@ -134,6 +134,11 @@
<subsection name="Jasper">
<changelog>
<fix>
+ <bug>57135</bug>: Package imports via
+ <code>javax.el.ImportHandler</code> should only import public, concrete
+ classes. (markt)
+ </fix>
+ <fix>
<bug>57583</bug>: Cache 'Not Found' results in
<code>javax.el.ImportHandler.resolveClass()</code> to save repeated
attempts to load classes that are known not to exist to improve
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org