From 60dd51771625216ca134e48485c8cbf28f0c2aac Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 22 Mar 2011 08:57:12 +0000
Subject: [PATCH] Prevent the custom error pages for the Manager and Host
 Manager applications from being accessed directly.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1084109 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/docs/changelog.xml                     | 4 ++++
 webapps/host-manager/{ => WEB-INF/jsp}/401.jsp | 0
 webapps/host-manager/{ => WEB-INF/jsp}/403.jsp | 0
 webapps/host-manager/{ => WEB-INF/jsp}/404.jsp | 0
 webapps/host-manager/WEB-INF/web.xml           | 6 +++---
 webapps/manager/{ => WEB-INF/jsp}/401.jsp      | 0
 webapps/manager/{ => WEB-INF/jsp}/403.jsp      | 0
 webapps/manager/{ => WEB-INF/jsp}/404.jsp      | 0
 webapps/manager/WEB-INF/web.xml                | 6 +++---
 9 files changed, 10 insertions(+), 6 deletions(-)
 rename webapps/host-manager/{ => WEB-INF/jsp}/401.jsp (100%)
 rename webapps/host-manager/{ => WEB-INF/jsp}/403.jsp (100%)
 rename webapps/host-manager/{ => WEB-INF/jsp}/404.jsp (100%)
 rename webapps/manager/{ => WEB-INF/jsp}/401.jsp (100%)
 rename webapps/manager/{ => WEB-INF/jsp}/403.jsp (100%)
 rename webapps/manager/{ => WEB-INF/jsp}/404.jsp (100%)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3dca0286d..929a1b2d4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,6 +126,10 @@
         Align the authenticator documentation and MBean descriptors with the
         implementation. (markt)
       </fix>
+      <fix>
+        Prevent the custom error pages for the Manager and Host Manager
+        applications from being accessed directly. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">
diff --git a/webapps/host-manager/401.jsp b/webapps/host-manager/WEB-INF/jsp/401.jsp
similarity index 100%
rename from webapps/host-manager/401.jsp
rename to webapps/host-manager/WEB-INF/jsp/401.jsp
diff --git a/webapps/host-manager/403.jsp b/webapps/host-manager/WEB-INF/jsp/403.jsp
similarity index 100%
rename from webapps/host-manager/403.jsp
rename to webapps/host-manager/WEB-INF/jsp/403.jsp
diff --git a/webapps/host-manager/404.jsp b/webapps/host-manager/WEB-INF/jsp/404.jsp
similarity index 100%
rename from webapps/host-manager/404.jsp
rename to webapps/host-manager/WEB-INF/jsp/404.jsp
diff --git a/webapps/host-manager/WEB-INF/web.xml b/webapps/host-manager/WEB-INF/web.xml
index 3a928c0f6..7177ffe2c 100644
--- a/webapps/host-manager/WEB-INF/web.xml
+++ b/webapps/host-manager/WEB-INF/web.xml
@@ -116,15 +116,15 @@
 
   <error-page>
     <error-code>401</error-code>
-    <location>/401.jsp</location>
+    <location>/WEB-INF/jsp/401.jsp</location>
   </error-page>
   <error-page>
     <error-code>403</error-code>
-    <location>/403.jsp</location>
+    <location>/WEB-INF/jsp/403.jsp</location>
   </error-page>
   <error-page>
     <error-code>404</error-code>
-    <location>/404.jsp</location>
+    <location>/WEB-INF/jsp/404.jsp</location>
   </error-page>
   
 </web-app>
diff --git a/webapps/manager/401.jsp b/webapps/manager/WEB-INF/jsp/401.jsp
similarity index 100%
rename from webapps/manager/401.jsp
rename to webapps/manager/WEB-INF/jsp/401.jsp
diff --git a/webapps/manager/403.jsp b/webapps/manager/WEB-INF/jsp/403.jsp
similarity index 100%
rename from webapps/manager/403.jsp
rename to webapps/manager/WEB-INF/jsp/403.jsp
diff --git a/webapps/manager/404.jsp b/webapps/manager/WEB-INF/jsp/404.jsp
similarity index 100%
rename from webapps/manager/404.jsp
rename to webapps/manager/WEB-INF/jsp/404.jsp
diff --git a/webapps/manager/WEB-INF/web.xml b/webapps/manager/WEB-INF/web.xml
index 2d13269ba..5245e3d37 100644
--- a/webapps/manager/WEB-INF/web.xml
+++ b/webapps/manager/WEB-INF/web.xml
@@ -181,15 +181,15 @@
 
   <error-page>
     <error-code>401</error-code>
-    <location>/401.jsp</location>
+    <location>/WEB-INF/jsp/401.jsp</location>
   </error-page>
   <error-page>
     <error-code>403</error-code>
-    <location>/403.jsp</location>
+    <location>/WEB-INF/jsp/403.jsp</location>
   </error-page>
   <error-page>
     <error-code>404</error-code>
-    <location>/404.jsp</location>
+    <location>/WEB-INF/jsp/404.jsp</location>
   </error-page>
 
 </web-app>
-- 
2.11.0