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 2016/05/03 19:39:49 UTC
svn commit: r1742152 - in /tomcat/tc8.5.x/trunk: ./
java/org/apache/tomcat/util/scan/StandardJarScanner.java
webapps/docs/changelog.xml
Author: markt
Date: Tue May 3 17:39:49 2016
New Revision: 1742152
URL: http://svn.apache.org/viewvc?rev=1742152&view=rev
Log:
Ensure that JarScanner only uses the explicit call-back to process WEB-INF/classes and only when configured to treat the contents of WEB-INF/classes as a possible exploded JAR.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 3 17:39:49 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742090,1742093,1742139
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742090,1742093,1742101,1742139
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1742152&r1=1742151&r2=1742152&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Tue May 3 17:39:49 2016
@@ -187,23 +187,22 @@ public class StandardJarScanner implemen
}
// Scan WEB-INF/classes
- URL webInfURL = null;
try {
- webInfURL = context.getResource(Constants.WEB_INF_CLASSES);
- if (isScanAllDirectories()) {
- URL url = context.getResource(Constants.WEB_INF_CLASSES + "/META-INF");
- if (url != null) {
- // Class path scanning will look at WEB-INF/classes since
- // that is the URL that Tomcat's web application class
- // loader returns. Therefore, it is this URL that needs to
- // be added to the set of processed URLs.
- if (webInfURL != null) {
- processedURLs.add(webInfURL);
- }
- try {
- callback.scanWebInfClasses();
- } catch (IOException e) {
- log.warn(sm.getString("jarScan.webinfclassesFail"), e);
+ URL webInfURL = context.getResource(Constants.WEB_INF_CLASSES);
+ if (webInfURL != null) {
+ // WEB-INF/classes will also be included in the URLs returned
+ // by the web application class loader so ensure the class path
+ // scanning below does not re-scan this location.
+ processedURLs.add(webInfURL);
+
+ if (isScanAllDirectories()) {
+ URL url = context.getResource(Constants.WEB_INF_CLASSES + "/META-INF");
+ if (url != null) {
+ try {
+ callback.scanWebInfClasses();
+ } catch (IOException e) {
+ log.warn(sm.getString("jarScan.webinfclassesFail"), e);
+ }
}
}
}
@@ -259,17 +258,8 @@ public class StandardJarScanner implemen
if (log.isDebugEnabled()) {
log.debug(sm.getString("jarScan.classloaderJarScan", urls[i]));
}
- String webappPath = null;
- if (urls[i].equals(webInfURL)) {
- if (scanType == JarScanType.PLUGGABILITY) {
- // WEB-INF/classes should not be scanned for
- // web fragments.
- continue;
- }
- webappPath = Constants.WEB_INF_CLASSES;
- }
try {
- process(scanType, callback, urls[i], webappPath, isWebapp);
+ process(scanType, callback, urls[i], null, isWebapp);
} catch (IOException ioe) {
log.warn(sm.getString("jarScan.classloaderFail", urls[i]), ioe);
}
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1742152&r1=1742151&r2=1742152&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue May 3 17:39:49 2016
@@ -160,6 +160,12 @@
<code>HttpServletRequest.getRequestURI()</code> returns an encoded URI
rather than a decoded URI after a dispatch. (markt)
</fix>
+ <fix>
+ Ensure that <code>JarScanner</code> only uses the explicit call-back to
+ process <code>WEB-INF/classes</code> and only when configured to treat
+ the contents of <code>WEB-INF/classes</code> as a possible exploded JAR.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org