From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 11 Feb 2011 15:21:54 +0000 (+0000)
Subject: Add additional information to assist with tracking down the root cause of https:... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ce2f8c4d21675dd1909182df411d3004b9cebe3c;p=tomcat7.0

Add additional information to assist with tracking down the root cause of https://issues.apache.org/bugzilla/show_bug.cgi?id=50737

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1069832 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/startup/ExpandWar.java b/java/org/apache/catalina/startup/ExpandWar.java
index e9fdcdcfd..80f14ff4f 100644
--- a/java/org/apache/catalina/startup/ExpandWar.java
+++ b/java/org/apache/catalina/startup/ExpandWar.java
@@ -119,7 +119,9 @@ public class ExpandWar {
                     // Trying to expand outside the docBase
                     // Throw an exception to stop the deployment
                     throw new IllegalArgumentException(
-                            sm.getString("expandWar.illegalPath",war, name));
+                            sm.getString("expandWar.illegalPath",war, name,
+                                    expandedFile.getCanonicalPath(),
+                                    canonicalDocBasePrefix));
                 }
                 int last = name.lastIndexOf('/');
                 if (last >= 0) {
@@ -220,7 +222,9 @@ public class ExpandWar {
                     // Entry located outside the docBase
                     // Throw an exception to stop the deployment
                     throw new IllegalArgumentException(
-                            sm.getString("expandWar.illegalPath",war, name));
+                            sm.getString("expandWar.illegalPath",war, name,
+                                    expandedFile.getCanonicalPath(),
+                                    canonicalDocBasePrefix));
                 }
             }
         } catch (IOException e) {
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties b/java/org/apache/catalina/startup/LocalStrings.properties
index b2912b96f..086e06b90 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -69,7 +69,7 @@ engineConfig.start=EngineConfig: Processing START
 engineConfig.stop=EngineConfig: Processing STOP
 expandWar.copy=Error copying {0} to {1}
 expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of the remaining files may cause problems
-expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an entry contains an illegal path [{1}]
+expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an entry contains an illegal path [{1}] which was not expanded to [{2}] since that is outside of the defined docBase [{3}]
 hostConfig.appBase=Application base directory {0} does not exist
 hostConfig.canonicalizing=Error delete redeploy resources from context [{0}]
 hostConfig.cce=Lifecycle event data object {0} is not a Host
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d74b00789..9816fa0f5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -67,6 +67,10 @@
         <bug>50721</bug>: Correctly handle URL decoding where the URL ends in
         %nn. Patch provided by Christof Marti. (markt)
       </fix>
+      <add>
+        <bug>50737</bug>: Add additional information when an invalid WAR file is
+        detected. (markt)
+      </add>
       <fix>
         <bug>50748</bug>: Allow the content length header to be set up to the
         point the response is committed when a writer is being used. (markt)