Author: markt
Date: Mon Sep 7 14:50:28 2009
New Revision: 812169
URL: http://svn.apache.org/viewvc?rev=812169&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403
Add additional checks on web app deployment and do not swallow IO errors
(kkolinko)
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 7 14:50:28 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77
7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,805153,812125,812137
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77
7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,805153,812125,812137
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=812169&r1=812168&r2=812169&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 7 14:50:28 2009
@@ -182,17 +182,6 @@
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403
- Add a check when enumerating jar files, and
- do not suppress IO errors when starting a web application.
- Note:
- - tested in normal operation on windows, with unpackWARs="true" and "false"
- - test on linux in normal and failure modes
- http://svn.apache.org/viewvc?rev=804462&view=rev
- http://svn.apache.org/viewvc?rev=804544&view=rev
- +1: kkolinko, markt, funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158
Update AccessLogValve and ExtendedAccessLogValve with all the recent
threading
improvements
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=812169&r1=812168&r2=812169&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
Mon Sep 7 14:50:28 2009
@@ -45,3 +45,5 @@
webappLoader.starting=Starting this Loader
webappLoader.stopping=Stopping this Loader
webappLoader.failModifiedCheck=Error tracking modifications
+webappLoader.copyFailure=Failed to copy resources
+webappLoader.namingFailure=Failed to access resource {0}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=812169&r1=812168&r2=812169&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java Mon
Sep 7 14:50:28 2009
@@ -40,7 +40,6 @@
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import javax.naming.Binding;
import javax.naming.NameClassPair;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -877,8 +876,9 @@
/**
* Configure the repositories for our class loader, based on the
* associated Context.
+ * @throws IOException
*/
- private void setRepositories() {
+ private void setRepositories() throws IOException {
if (!(container instanceof Context))
return;
@@ -932,7 +932,10 @@
classRepository = new File(workDir, classesPath);
classRepository.mkdirs();
- copyDir(classes, classRepository);
+ if (!copyDir(classes, classRepository)) {
+ throw new IOException(
+ sm.getString("webappLoader.copyFailure"));
+ }
}
@@ -980,25 +983,43 @@
}
// Looking up directory /WEB-INF/lib in the context
+ NamingEnumeration<NameClassPair> enumeration = null;
try {
- NamingEnumeration enumeration =
resources.listBindings(libPath);
+ enumeration = libDir.list("");
+ } catch (NamingException e) {
+ IOException ioe = new IOException(sm.getString(
+ "webappLoader.namingFailure", libPath));
+ ioe.initCause(e);
+ throw ioe;
+ }
while (enumeration.hasMoreElements()) {
-
- Binding binding = (Binding) enumeration.nextElement();
- String filename = libPath + "/" + binding.getName();
+ NameClassPair ncPair = enumeration.nextElement();
+ String filename = libPath + "/" + ncPair.getName();
if (!filename.endsWith(".jar"))
continue;
// Copy JAR in the work directory, always (the JAR file
// would get locked otherwise, which would make it
// impossible to update it or remove it at runtime)
- File destFile = new File(destDir, binding.getName());
+ File destFile = new File(destDir, ncPair.getName());
if( log.isDebugEnabled())
log.debug(sm.getString("webappLoader.jarDeploy", filename,
destFile.getAbsolutePath()));
- Object obj = binding.getObject();
+ // Bug 45403 - Explicitly call lookup() on the name to check
+ // that the resource is readable. We cannot use resources
+ // returned by listBindings(), because that lists all of them,
+ // but does not perform the necessary checks on each.
+ Object obj = null;
+ try {
+ obj = libDir.lookup(ncPair.getName());
+ } catch (NamingException e) {
+ IOException ioe = new IOException(sm.getString(
+ "webappLoader.namingFailure", filename));
+ ioe.initCause(e);
+ throw ioe;
+ }
if (!(obj instanceof Resource))
continue;
@@ -1007,33 +1028,26 @@
if (copyJars) {
if (!copy(jarResource.streamContent(),
- new FileOutputStream(destFile)))
- continue;
+ new FileOutputStream(destFile))) {
+ throw new IOException(
+ sm.getString("webappLoader.copyFailure"));
}
+ }
try {
JarFile jarFile = new JarFile(destFile);
classLoader.addJar(filename, jarFile, destFile);
} catch (Exception ex) {
// Catch the exception if there is an empty jar file
- // Should ignore and continute loading other jar files
+ // Should ignore and continue loading other jar files
// in the dir
}
loaderRepositories.add( filename );
-
}
- } catch (NamingException e) {
- // Silent catch: it's valid that no /WEB-INF/lib directory
- // exists
- } catch (IOException e) {
- e.printStackTrace();
}
-
}
- }
-
/**
* Set the appropriate context attribute for our class path. This
@@ -1157,7 +1171,8 @@
return false;
} else if (object instanceof DirContext) {
currentFile.mkdir();
- copyDir((DirContext) object, currentFile);
+ if (!copyDir((DirContext) object, currentFile))
+ return false;
}
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=812169&r1=812168&r2=812169&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Sep 7 14:50:28 2009
@@ -78,6 +78,9 @@
reduce copy and pastes issues. (markt, kkolinko)
</fix>
<fix>
+ <bug>45403</bug>:
+ </fix>
+ <fix>
<bug>46908</bug>: Try and support java encoding names when using an xml
parser provided via the endorsed mechanism. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
