Author: markt
Date: Thu Jan 22 20:59:08 2015
New Revision: 1654070
URL: http://svn.apache.org/r1654070
Log:
Resource JARs should only be used for static resources. Block class loader
resources.
Added:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
- copied, changed from r1654030,
tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
tomcat/tc8.0.x/trunk/test/webresources/non-static-resources.jar
- copied unchanged from r1654030,
tomcat/trunk/test/webresources/non-static-resources.jar
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 22 20:59:08 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,1654013
+/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,1654013,1654030,1654050
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java?rev=1654070&r1=1654069&r2=1654070&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/WebResourceSet.java Thu Jan
22 20:59:08 2015
@@ -92,18 +92,33 @@ public interface WebResourceSet extends
void setRoot(WebResourceRoot root);
/**
- * Are resources provided by this resource set only intended for use by
- * calls to {@link WebResourceRoot#getClassLoaderResource(String)}.
+ * Should resources returned by this resource set only be included in any
+ * results when the lookup is explicitly looking for class loader
resources.
+ * i.e. should these resources be excluded from look ups that are
explicitly
+ * looking for static (non-class loader) resources.
*
* @return <code>true</code> if these resources should only be used for
- * calls to {@link WebResourceRoot#getClassLoaderResource(String)},
- * otherwise <code>false</code>
+ * class loader resource lookups, otherwise <code>false</code>
*/
boolean getClassLoaderOnly();
void setClassLoaderOnly(boolean classLoaderOnly);
/**
+ * Should resources returned by this resource set only be included in any
+ * results when the lookup is explicitly looking for static (non-class
+ * loader) resources. i.e. should these resources be excluded from look ups
+ * that are explicitly looking for class loader resources.
+ *
+ * @return <code>true</code> if these resources should only be used for
+ * static (non-class loader) resource lookups, otherwise
+ * <code>false</code>
+ */
+ boolean getStaticOnly();
+
+ void setStaticOnly(boolean staticOnly);
+
+ /**
* Obtain the base URL for this set of resources. One of the uses of this
is
* to grant read permissions to the resources when running under a security
* manager.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1654070&r1=1654069&r2=1654070&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Thu Jan 22 20:59:08 2015
@@ -31,6 +31,7 @@ public abstract class AbstractResourceSe
private String internalPath = "";
private String webAppMount;
private boolean classLoaderOnly;
+ private boolean staticOnly;
protected static final StringManager sm =
@@ -100,6 +101,16 @@ public abstract class AbstractResourceSe
this.classLoaderOnly = classLoaderOnly;
}
+ @Override
+ public boolean getStaticOnly() {
+ return staticOnly;
+ }
+
+ @Override
+ public void setStaticOnly(boolean staticOnly) {
+ this.staticOnly = staticOnly;
+ }
+
//-------------------------------------------------------- Lifecycle
methods
@Override
protected final void startInternal() throws LifecycleException {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java?rev=1654070&r1=1654069&r2=1654070&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/EmptyResourceSet.java
Thu Jan 22 20:59:08 2015
@@ -40,6 +40,7 @@ public class EmptyResourceSet extends Li
private WebResourceRoot root;
private boolean classLoaderOnly;
+ private boolean staticOnly;
public EmptyResourceSet(WebResourceRoot root) {
this.root = root;
@@ -110,6 +111,16 @@ public class EmptyResourceSet extends Li
this.classLoaderOnly = classLoaderOnly;
}
+ @Override
+ public boolean getStaticOnly() {
+ return staticOnly;
+ }
+
+ @Override
+ public void setStaticOnly(boolean staticOnly) {
+ this.staticOnly = staticOnly;
+ }
+
/**
* {@inheritDoc}
* <p>
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1654070&r1=1654069&r2=1654070&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Thu Jan 22 20:59:08 2015
@@ -276,7 +276,8 @@ public class StandardRoot extends Lifecy
WebResource mainEmpty = null;
for (List<WebResourceSet> list : allResources) {
for (WebResourceSet webResourceSet : list) {
- if (useClassLoaderResources ||
!webResourceSet.getClassLoaderOnly()) {
+ if (!useClassLoaderResources &&
!webResourceSet.getClassLoaderOnly() ||
+ useClassLoaderResources &&
!webResourceSet.getStaticOnly()) {
result = webResourceSet.getResource(path);
if (result.exists()) {
return result;
@@ -419,6 +420,8 @@ public class StandardRoot extends Lifecy
if (type.equals(ResourceSetType.CLASSES_JAR)) {
resourceSet.setClassLoaderOnly(true);
+ } else if (type.equals(ResourceSetType.RESOURCE_JAR)) {
+ resourceSet.setStaticOnly(true);
}
resourceList.add(resourceSet);
Copied:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
(from r1654030,
tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestResourceJars.java?p2=tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestResourceJars.java&p1=tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java&r1=1654030&r2=1654070&rev=1654070&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestResourceJars.java
Thu Jan 22 20:59:08 2015
@@ -19,7 +19,6 @@ package org.apache.catalina.webresources
import java.io.File;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.apache.catalina.WebResource;
@@ -27,7 +26,6 @@ import org.apache.catalina.WebResourceSe
public class TestResourceJars {
- @Ignore // This test currenty fails. A fix is in hand...
@Test
public void testNonStaticResources() {
File empty = new File("test/webresources/dir3");
@@ -43,6 +41,7 @@ public class TestResourceJars {
// would be added
JarResourceSet test =
new JarResourceSet(root, "/", jar.getAbsolutePath(),
"/META-INF/resources");
+ test.setStaticOnly(true);
root.addJarResources(test);
WebResource resource =
root.getClassLoaderResource("/org/apache/tomcat/unittest/foo.txt");
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=1654070&r1=1654069&r2=1654070&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Jan 22 20:59:08 2015
@@ -98,6 +98,10 @@
Change Response to use UEncoder instances with shared safeChars.
(fschumacher)
</fix>
+ <fix>
+ Ensure that when static resources are served from JARs, only static
+ resources are served. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
