You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2016/05/17 07:23:22 UTC

svn commit: r1744195 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/scan/StandardJarScanner.java webapps/docs/changelog.xml

Author: violetagg
Date: Tue May 17 07:23:21 2016
New Revision: 1744195

URL: http://svn.apache.org/viewvc?rev=1744195&view=rev
Log:
Merged revision 1744194 from tomcat/trunk:
Ensure NPE will not be thrown during deployment when scanning jar files without MANIFEST.MF file.

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 17 07:23:21 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,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125
+/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,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194

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=1744195&r1=1744194&r2=1744195&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 17 07:23:21 2016
@@ -370,40 +370,42 @@ public class StandardJarScanner implemen
         }
 
         Manifest manifest = jar.getManifest();
-        Attributes attributes = manifest.getMainAttributes();
-        String classPathAttribute = attributes.getValue("Class-Path");
-        if (classPathAttribute == null) {
-            return;
-        }
-        String[] classPathEntries = classPathAttribute.split(" ");
-        for (String classPathEntry : classPathEntries) {
-            classPathEntry = classPathEntry.trim();
-            if (classPathEntry.length() == 0) {
-                continue;
+        if (manifest != null) {
+            Attributes attributes = manifest.getMainAttributes();
+            String classPathAttribute = attributes.getValue("Class-Path");
+            if (classPathAttribute == null) {
+                return;
             }
-            URL jarURL = jar.getJarFileURL();
-            URI jarURI;
-            try {
-                jarURI = jarURL.toURI();
-            } catch (URISyntaxException e) {
-                if (log.isDebugEnabled()) {
-                    log.debug(sm.getString("jarScan.invalidUri", jarURL));
+            String[] classPathEntries = classPathAttribute.split(" ");
+            for (String classPathEntry : classPathEntries) {
+                classPathEntry = classPathEntry.trim();
+                if (classPathEntry.length() == 0) {
+                    continue;
+                }
+                URL jarURL = jar.getJarFileURL();
+                URI jarURI;
+                try {
+                    jarURI = jarURL.toURI();
+                } catch (URISyntaxException e) {
+                    if (log.isDebugEnabled()) {
+                        log.debug(sm.getString("jarScan.invalidUri", jarURL));
+                    }
+                    continue;
                 }
-                continue;
+                /*
+                 * Note: Resolving the relative URLs from the manifest has the
+                 *       potential to introduce security concerns. However, since
+                 *       only JARs provided by the container and NOT those provided
+                 *       by web applications are processed, there should be no
+                 *       issues.
+                 *       If this feature is ever extended to include JARs provided
+                 *       by web applications, checks should be added to ensure that
+                 *       any relative URL does not step outside the web application.
+                 */
+                URI classPathEntryURI = jarURI.resolve(classPathEntry);
+                URL classPathEntryURL = classPathEntryURI.toURL();
+                classPathUrlsToProcess.add(classPathEntryURL);
             }
-            /*
-             * Note: Resolving the relative URLs from the manifest has the
-             *       potential to introduce security concerns. However, since
-             *       only JARs provided by the container and NOT those provided
-             *       by web applications are processed, there should be no
-             *       issues.
-             *       If this feature is ever extended to include JARs provided
-             *       by web applications, checks should be added to ensure that
-             *       any relative URL does not step outside the web application.
-             */
-            URI classPathEntryURI = jarURI.resolve(classPathEntry);
-            URL classPathEntryURL = classPathEntryURI.toURL();
-            classPathUrlsToProcess.add(classPathEntryURL);
         }
     }
 

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=1744195&r1=1744194&r2=1744195&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue May 17 07:23:21 2016
@@ -53,6 +53,10 @@
         around. Therefore, start logging RMI Target related memory leaks on web
         application stop. (markt)
       </fix>
+      <fix>
+        Ensure NPE will not be thrown during deployment when scanning jar files
+        without MANIFEST.MF file. (violetagg)
+      </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