Author: markt Date: Wed Oct 5 10:48:51 2016 New Revision: 1763403 URL: http://svn.apache.org/viewvc?rev=1763403&view=rev Log: Refactor the web resources handling to use the Tomcat specific 'war:file:...' URL protocol to refer to WAR files and their contents rather than the standard 'jar:file:...' form since some components of the JRE, such as JAR verification, give unexpected results when the standard form is used. A side-effect of the refactoring is that when using packed WARs, it is now possible to reference a WAR and/or specific JARs within a WAR in the security policy file used when running under a SecurityManager.
Added: tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResource.java - copied unchanged from r1763377, tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResource.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java - copied unchanged from r1763377, tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/WarResource.java - copied unchanged from r1763377, tomcat/trunk/java/org/apache/catalina/webresources/WarResource.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/WarResourceSet.java - copied unchanged from r1763377, tomcat/trunk/java/org/apache/catalina/webresources/WarResourceSet.java Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/bin/catalina.bat tomcat/tc8.5.x/trunk/bin/catalina.sh tomcat/tc8.5.x/trunk/build.xml tomcat/tc8.5.x/trunk/conf/catalina.policy tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarResource.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/war/Handler.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/JarFactory.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml tomcat/tc8.5.x/trunk/webapps/docs/security-manager-howto.xml Propchange: tomcat/tc8.5.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 5 10:48:51 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,1737903,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,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259 +/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,1737903,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,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747 924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1 756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332 0,1763370,1763372,1763375,1763377,1763393 Modified: tomcat/tc8.5.x/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/bin/catalina.bat?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/bin/catalina.bat (original) +++ tomcat/tc8.5.x/trunk/bin/catalina.bat Wed Oct 5 10:48:51 2016 @@ -201,6 +201,10 @@ set JSSE_OPTS="-Djdk.tls.ephemeralDHKeyS :gotJsseOpts set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%" +rem Register custom URL handlers +rem Do this here so they can be used in the security policy +set "JAVA_OPTS=%JAVA_OPTS% -Djava.protocol.handler.pkgs=org.apache.catalina.webresources" + if not "%LOGGING_CONFIG%" == "" goto noJuliConfig set LOGGING_CONFIG=-Dnop if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig Modified: tomcat/tc8.5.x/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/bin/catalina.sh?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/bin/catalina.sh (original) +++ tomcat/tc8.5.x/trunk/bin/catalina.sh Wed Oct 5 10:48:51 2016 @@ -240,6 +240,10 @@ if [ -z "$JSSE_OPTS" ] ; then fi JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS" +# Register custom URL handlers +# Do this here so they can be used in the security policy +JAVA_OPTS="%JAVA_OPTS% -Djava.protocol.handler.pkgs=org.apache.catalina.webresources" + # Set juli LogManager config file if it is present and an override has not been issued if [ -z "$LOGGING_CONFIG" ]; then if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then Modified: tomcat/tc8.5.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/build.xml (original) +++ tomcat/tc8.5.x/trunk/build.xml Wed Oct 5 10:48:51 2016 @@ -325,6 +325,11 @@ <include name="org/apache/tomcat/websocket/**" /> </patternset> + <!-- This duplicates some classes in files.catalina --> + <!-- Duplicating a few classes in bootstrap.jar is simpler than excluding --> + <!-- them from files.catalina and having to manually add them to --> + <!-- files.tomcat-embed-core because of an include/exclude conflict --> + <!-- between files.catalina and files.bootstrap. --> <patternset id="files.bootstrap"> <include name="org/apache/catalina/startup/Bootstrap.*" /> <include name="org/apache/catalina/startup/catalina.properties" /> @@ -333,6 +338,8 @@ <include name="org/apache/catalina/startup/ClassLoaderFactory$*.*" /> <include name="org/apache/catalina/startup/Tool.*" /> <include name="org/apache/catalina/security/SecurityClassLoad.*" /> + <include name="org/apache/catalina/webresources/war/**" /> + <include name="org/apache/tomcat/util/buf/UriUtil.*" /> </patternset> <patternset id="files.tomcat-juli"> @@ -433,7 +440,6 @@ <!-- Every standard pattern set above should be included in an embedded JAR --> <patternset id="files.tomcat-embed-core" > <patternset refid="files.annotations-api" /> - <patternset refid="files.bootstrap" /> <patternset refid="files.catalina" /> <patternset refid="files.servlet-api" /> <patternset refid="files.jaspic-api" /> Modified: tomcat/tc8.5.x/trunk/conf/catalina.policy URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/conf/catalina.policy?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/conf/catalina.policy (original) +++ tomcat/tc8.5.x/trunk/conf/catalina.policy Wed Oct 5 10:48:51 2016 @@ -249,3 +249,13 @@ grant codeBase "file:${catalina.home}/we // permission java.net.SocketPermission "*.noaa.gov:80", "connect"; // }; +// To grant permissions for web applications using packed WAR files, use the +// Tomcat specific WAR url scheme. +// +// The permissions granted to the entire web application +// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/-" { +// }; +// +// The permissions granted to a specific JAR +// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" { +// }; \ No newline at end of file Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarResource.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarResource.java?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarResource.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarResource.java Wed Oct 5 10:48:51 2016 @@ -16,10 +16,7 @@ */ package org.apache.catalina.webresources; -import java.io.IOException; -import java.io.InputStream; import java.util.jar.JarEntry; -import java.util.jar.JarFile; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -28,35 +25,16 @@ import org.apache.juli.logging.LogFactor * Represents a single resource (file or directory) that is located within a * JAR. */ -public class JarResource extends AbstractArchiveResource { +public class JarResource extends AbstractSingleArchiveResource { private static final Log log = LogFactory.getLog(JarResource.class); + public JarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath, String baseUrl, JarEntry jarEntry) { super(archiveResourceSet, webAppPath, "jar:" + baseUrl, jarEntry, baseUrl); } - @Override - protected JarInputStreamWrapper getJarInputStreamWrapper() { - JarFile jarFile = null; - try { - jarFile = getArchiveResourceSet().openJarFile(); - // Need to create a new JarEntry so the certificates can be read - JarEntry jarEntry = jarFile.getJarEntry(getResource().getName()); - InputStream is = jarFile.getInputStream(jarEntry); - return new JarInputStreamWrapper(jarEntry, is); - } catch (IOException e) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("jarResource.getInputStreamFail", - getResource().getName(), getBaseUrl()), e); - } - if (jarFile != null) { - getArchiveResourceSet().closeJarFile(); - } - return null; - } - } @Override protected Log getLog() { Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java Wed Oct 5 10:48:51 2016 @@ -16,24 +16,16 @@ */ package org.apache.catalina.webresources; -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.Enumeration; -import java.util.HashMap; import java.util.jar.JarEntry; -import java.util.jar.JarFile; import java.util.jar.Manifest; -import org.apache.catalina.LifecycleException; import org.apache.catalina.WebResource; import org.apache.catalina.WebResourceRoot; -import org.apache.tomcat.util.buf.UriUtil; /** * Represents a {@link org.apache.catalina.WebResourceSet} based on a JAR file. */ -public class JarResourceSet extends AbstractArchiveResourceSet { +public class JarResourceSet extends AbstractSingleArchiveResourceSet { /** * A no argument constructor is required for this to work with the digester. @@ -41,6 +33,7 @@ public class JarResourceSet extends Abst public JarResourceSet() { } + /** * Creates a new {@link org.apache.catalina.WebResourceSet} based on a JAR * file. @@ -63,86 +56,13 @@ public class JarResourceSet extends Abst */ public JarResourceSet(WebResourceRoot root, String webAppMount, String base, String internalPath) throws IllegalArgumentException { - setRoot(root); - setWebAppMount(webAppMount); - setBase(base); - setInternalPath(internalPath); - - if (getRoot().getState().isAvailable()) { - try { - start(); - } catch (LifecycleException e) { - throw new IllegalStateException(e); - } - } + super(root, webAppMount, base, internalPath); } + @Override protected WebResource createArchiveResource(JarEntry jarEntry, String webAppPath, Manifest manifest) { return new JarResource(this, webAppPath, getBaseUrlString(), jarEntry); } - - - @Override - protected HashMap<String,JarEntry> getArchiveEntries(boolean single) { - synchronized (archiveLock) { - if (archiveEntries == null && !single) { - JarFile jarFile = null; - archiveEntries = new HashMap<>(); - try { - jarFile = openJarFile(); - Enumeration<JarEntry> entries = jarFile.entries(); - while (entries.hasMoreElements()) { - JarEntry entry = entries.nextElement(); - archiveEntries.put(entry.getName(), entry); - } - } catch (IOException ioe) { - // Should never happen - archiveEntries = null; - throw new IllegalStateException(ioe); - } finally { - if (jarFile != null) { - closeJarFile(); - } - } - } - return archiveEntries; - } - } - - - @Override - protected JarEntry getArchiveEntry(String pathInArchive) { - JarFile jarFile = null; - try { - jarFile = openJarFile(); - return jarFile.getJarEntry(pathInArchive); - } catch (IOException ioe) { - // Should never happen - throw new IllegalStateException(ioe); - } finally { - if (jarFile != null) { - closeJarFile(); - } - } - } - - - //-------------------------------------------------------- Lifecycle methods - @Override - protected void initInternal() throws LifecycleException { - - try (JarFile jarFile = new JarFile(getBase())) { - setManifest(jarFile.getManifest()); - } catch (IOException ioe) { - throw new IllegalArgumentException(ioe); - } - - try { - setBaseUrl(UriUtil.buildJarSafeUrl(new File(getBase()))); - } catch (MalformedURLException e) { - throw new IllegalArgumentException(e); - } - } } Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java Wed Oct 5 10:48:51 2016 @@ -37,8 +37,9 @@ public class JarWarResource extends Abst public JarWarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath, String baseUrl, JarEntry jarEntry, String archivePath) { - super(archiveResourceSet, webAppPath, "jar:war:" + baseUrl + "*/" + archivePath, - jarEntry, "jar:" + baseUrl + "!/" + archivePath); + + super(archiveResourceSet, webAppPath, "jar:war:" + baseUrl + "*/" + archivePath + "!/", + jarEntry, "war:" + baseUrl + "*/" + archivePath); this.archivePath = archivePath; } Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java Wed Oct 5 10:48:51 2016 @@ -727,7 +727,7 @@ public class StandardRoot extends Lifecy if (f.isDirectory()) { mainResourceSet = new DirResourceSet(this, "/", f.getAbsolutePath(), "/"); } else if(f.isFile() && docBase.endsWith(".war")) { - mainResourceSet = new JarResourceSet(this, "/", f.getAbsolutePath(), "/"); + mainResourceSet = new WarResourceSet(this, "/", f.getAbsolutePath()); } else { throw new IllegalArgumentException( sm.getString("standardRoot.startInvalidMain", @@ -800,9 +800,14 @@ public class StandardRoot extends Lifecy BaseLocation(URL url) { File f = null; - if ("jar".equals(url.getProtocol())) { + if ("jar".equals(url.getProtocol()) || "war".equals(url.getProtocol())) { String jarUrl = url.toString(); - int endOfFileUrl = jarUrl.indexOf("!/"); + int endOfFileUrl = -1; + if ("jar".equals(url.getProtocol())) { + endOfFileUrl = jarUrl.indexOf("!/"); + } else { + endOfFileUrl = jarUrl.indexOf("*/"); + } String fileUrl = jarUrl.substring(4, endOfFileUrl); try { f = new File(new URL(fileUrl).toURI()); Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/war/Handler.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/war/Handler.java?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/war/Handler.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/war/Handler.java Wed Oct 5 10:48:51 2016 @@ -27,4 +27,20 @@ public class Handler extends URLStreamHa protected URLConnection openConnection(URL u) throws IOException { return new WarURLConnection(u); } + + @Override + protected void setURL(URL u, String protocol, String host, int port, String authority, String userInfo, String path, + String query, String ref) { + if (path.startsWith("file:") && !path.startsWith("file:/")) { + // Work around a problem with the URLs in the security policy file. + // On Windows, the use of ${catalina.[home|base]} in the policy file + // results in codebase URLs of the form file:C:/... when they should + // be file:/C:/... + // For file: and jar: URLs, the JRE compensates for this. It does not + // compensate for this for war:file:... URLs. Therefore, we do that + // here + path = "file:/" + path.substring(5); + } + super.setURL(u, protocol, host, port, authority, userInfo, path, query, ref); + } } Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java Wed Oct 5 10:48:51 2016 @@ -22,6 +22,8 @@ import java.net.URL; import java.net.URLConnection; import java.security.Permission; +import org.apache.tomcat.util.buf.UriUtil; + public class WarURLConnection extends URLConnection { @@ -30,18 +32,7 @@ public class WarURLConnection extends UR protected WarURLConnection(URL url) throws IOException { super(url); - - // Need to make this look like a JAR URL for the WAR file - // Assumes that the spec is absolute and starts war:file:/... - String file = url.getFile(); - if (file.contains("*/")) { - file = file.replaceFirst("\\*/", "!/"); - } else { - file = file.replaceFirst("\\^/", "!/"); - } - - URL innerJarUrl = new URL("jar", url.getHost(), url.getPort(), file); - + URL innerJarUrl = UriUtil.warToJar(url); wrappedJarUrlConnection = innerJarUrl.openConnection(); } Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java Wed Oct 5 10:48:51 2016 @@ -128,4 +128,27 @@ public final class UriUtil { tmp = PATTERN_CARET.matcher(tmp).replaceAll("%5e/"); return PATTERN_ASTERISK.matcher(tmp).replaceAll("%2a/"); } + + + /** + * Convert a URL of the form <code>war:file:...</code> to + * <code>war:file:...</code>. + * + * @param warUrl The WAR URL to convert + * + * @return The equivalent JAR URL + * + * @throws MalformedURLException If the conversion fails + */ + public static URL warToJar(URL warUrl) throws MalformedURLException { + // Assumes that the spec is absolute and starts war:file:/... + String file = warUrl.getFile(); + if (file.contains("*/")) { + file = file.replaceFirst("\\*/", "!/"); + } else { + file = file.replaceFirst("\\^/", "!/"); + } + + return new URL("jar", warUrl.getHost(), warUrl.getPort(), file); + } } Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/JarFactory.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/JarFactory.java?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/JarFactory.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/JarFactory.java Wed Oct 5 10:48:51 2016 @@ -21,6 +21,7 @@ import java.net.MalformedURLException; import java.net.URL; import org.apache.tomcat.Jar; +import org.apache.tomcat.util.buf.UriUtil; /** * Provide a mechanism to obtain objects that implement {@link Jar}. @@ -31,21 +32,26 @@ public class JarFactory { // Factory class. Hide public constructor. } + public static Jar newInstance(URL url) throws IOException { - String jarUrl = url.toString(); - if (jarUrl.startsWith("jar:file:")) { - if (jarUrl.endsWith("!/")) { + String urlString = url.toString(); + if (urlString.startsWith("jar:file:")) { + if (urlString.endsWith("!/")) { return new JarFileUrlJar(url, true); } else { return new JarFileUrlNestedJar(url); } - } else if (jarUrl.startsWith("file:")) { + } else if (urlString.startsWith("war:file:")) { + URL jarUrl = UriUtil.warToJar(url); + return new JarFileUrlNestedJar(jarUrl); + } else if (urlString.startsWith("file:")) { return new JarFileUrlJar(url, false); } else { return new UrlJar(url); } } + public static URL getJarEntryURL(URL baseUrl, String entryName) throws MalformedURLException { Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java Wed Oct 5 10:48:51 2016 @@ -36,8 +36,8 @@ public class TestWebappClassLoader exten String[] expected = new String[2]; String warUrl = f.toURI().toURL().toExternalForm(); - expected[0] = "jar:" + warUrl + "!/WEB-INF/classes/"; - expected[1] = "jar:" + warUrl + "!/WEB-INF/lib/test.jar"; + expected[0] = "war:" + warUrl + "*/WEB-INF/classes/"; + expected[1] = "war:" + warUrl + "*/WEB-INF/lib/test.jar"; Tomcat tomcat = getTomcatInstance(); 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=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Oct 5 10:48:51 2016 @@ -60,6 +60,16 @@ test cases by Santhana Preethiand a patch by Tiago Oliveira. (markt) </fix> <fix> + <bug>60087</bug>: Refactor the web resources handling to use the Tomcat + specific <code>war:file:...</code> URL protocol to refer to WAR files + and their contents rather than the standard <code>jar:file:...</code> + form since some components of the JRE, such as JAR verification, give + unexpected results when the standard form is used. A side-effect of the + refactoring is that when using packed WARs, it is now possible to + reference a WAR and/or specific JARs within a WAR in the security policy + file used when running under a <code>SecurityManager</code>. (markt) + </fix> + <fix> <bug>60116</bug>: Fix a problem with the rewrite valve that caused back references evaluated in conditions to be forced to lower case when using the <code>NC</code> flag. (markt) Modified: tomcat/tc8.5.x/trunk/webapps/docs/security-manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/security-manager-howto.xml?rev=1763403&r1=1763402&r2=1763403&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/webapps/docs/security-manager-howto.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/security-manager-howto.xml Wed Oct 5 10:48:51 2016 @@ -154,7 +154,33 @@ grant [signedBy <signer>,] [codeBase <co <source>$CATALINA_HOME/bin/catalina.sh start -security (Unix) %CATALINA_HOME%\bin\catalina start -security (Windows)</source> + <subsection name="Permissions for packed WAR files"> + + <p>When using packed WAR files, it is necessary to use Tomcat's custom war + URL protocol to asisgn permissions to web application code.</p> + + <p>To assign permissions to the entire web application the entry in the + policy file would look like this:</p> + +<source><![CDATA[// Example policy file entry +grant codeBase "war:file:${catalina.base}/webapps/examples.war*/-" { + ... +}; +]]></source> + + <p>To assign permissions to a single JAR within the web application the + entry in the policy file would look like this:</p> + +<source><![CDATA[// Example policy file entry +grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" { + ... +}; +]]></source> + + </subsection> + </section> + <section name="Configuring Package Protection in Tomcat"> <p>Starting with Tomcat 5, it is now possible to configure which Tomcat internal package are protected against package definition and access. See --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org