Adding unit tests for DefaultServlet and WebdavServlet to test basic serving/mounting...

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

diff --git a/test/org/apache/catalina/servlets/TestDefaultServlet.java b/test/org/apache/catalina/servlets/TestDefaultServlet.java
new file mode 100644 (file)
index 0000000..23ba951
--- /dev/null
+++ b/test/org/apache/catalina/servlets/TestDefaultServlet.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.servlets;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestDefaultServlet extends TomcatBaseTest {
+
+    /**
+     * Test attempting to access special paths (WEB-INF/META-INF) using DefaultServlet 
+     */
+    public void testGetSpecials() throws Exception {
+        Tomcat tomcat = getTomcatInstance();
+        
+        String contextPath = "/examples";
+        
+        File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
+        // app dir is relative to server home
+        tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+        
+        tomcat.start();
+        
+        final ByteChunk res = new ByteChunk();
+        
+        int rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/WEB-INF/web.xml", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/WEB-INF/doesntexistanywhere", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+         
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/WEB-INF/", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+         
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/META-INF/MANIFEST.MF", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/META-INF/doesntexistanywhere", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+    }
+
+    /**
+     * Test https://issues.apache.org/bugzilla/show_bug.cgi?id=50026
+     * Verify serving of resources from context root with subpath mapping.
+     */
+    public void testGetWithSubpathmount() throws Exception {
+        Tomcat tomcat = getTomcatInstance();
+        
+        String contextPath = "/examples";
+        
+        File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
+        // app dir is relative to server home
+        org.apache.catalina.Context ctx =
+            tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+        
+        // Override the default servlet with our own mappings
+        Tomcat.addServlet(ctx, "default2", new DefaultServlet());
+        ctx.addServletMapping("/", "default2");
+        ctx.addServletMapping("/servlets/*", "default2");
+        ctx.addServletMapping("/static/*", "default2");
+        
+        tomcat.start();
+        
+        final ByteChunk res = new ByteChunk();
+        
+        // Make sure DefaultServlet isn't exposing special directories
+        // by remounting the webapp under a sub-path
+        
+        int rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/static/WEB-INF/web.xml", res, null);
+        
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/static/WEB-INF/doesntexistanywhere", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+         
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/static/WEB-INF/", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+         
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/static/META-INF/MANIFEST.MF", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/static/META-INF/doesntexistanywhere", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+        // Make sure DefaultServlet is serving resources relative to the 
+        // context root regardless of where the it is mapped
+        
+        final ByteChunk rootResource = new ByteChunk();
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/index.html", rootResource, null);
+        assertEquals(HttpServletResponse.SC_OK, rc);
+        
+        final ByteChunk subpathResource = new ByteChunk();
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/servlets/index.html", subpathResource, null);
+        assertEquals(HttpServletResponse.SC_OK, rc);
+        
+        assertFalse(rootResource.toString().equals(subpathResource.toString()));
+        
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/static/index.html", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+    }
+
+    public static int getUrl(String path, ByteChunk out,
+            Map<String, List<String>> resHead) throws IOException {
+        out.recycle();
+        return TomcatBaseTest.getUrl(path, out, resHead);
+    }
+
+}

diff --git a/test/org/apache/catalina/servlets/TestWebdavServlet.java b/test/org/apache/catalina/servlets/TestWebdavServlet.java
new file mode 100644 (file)
index 0000000..86d4028
--- /dev/null
+++ b/test/org/apache/catalina/servlets/TestWebdavServlet.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.servlets;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestWebdavServlet extends TomcatBaseTest {
+
+    /**
+     * Test attempting to access special paths (WEB-INF/META-INF) using WebdavServlet 
+     */
+    public void testGetSpecials() throws Exception {
+        Tomcat tomcat = getTomcatInstance();
+        
+        String contextPath = "/examples";
+        
+        File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
+        // app dir is relative to server home
+        org.apache.catalina.Context ctx =
+            tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+        
+        Tomcat.addServlet(ctx, "webdav", new WebdavServlet());
+        ctx.addServletMapping("/*", "webdav");
+        
+        tomcat.start();
+        
+        final ByteChunk res = new ByteChunk();
+        
+        int rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/WEB-INF/web.xml", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/WEB-INF/doesntexistanywhere", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+         
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/WEB-INF/", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+         
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/META-INF/MANIFEST.MF", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/META-INF/doesntexistanywhere", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+    }
+
+    /**
+     * Test https://issues.apache.org/bugzilla/show_bug.cgi?id=50026
+     * Verify protection of special paths with re-mount of web app resource root.
+     */
+    public void testGetWithSubpathmount() throws Exception {
+        Tomcat tomcat = getTomcatInstance();
+        
+        String contextPath = "/examples";
+        
+        File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
+        // app dir is relative to server home
+        org.apache.catalina.Context ctx =
+            tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+        
+        Tomcat.addServlet(ctx, "webdav", new WebdavServlet());
+        ctx.addServletMapping("/webdav/*", "webdav");
+        
+        tomcat.start();
+        
+        final ByteChunk res = new ByteChunk();
+        
+        // Make sure WebdavServlet isn't exposing special directories
+        // by remounting the webapp under a sub-path
+        
+        int rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/webdav/WEB-INF/web.xml", res, null);
+        
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/webdav/WEB-INF/doesntexistanywhere", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+         
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/webdav/WEB-INF/", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+         
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/webdav/META-INF/MANIFEST.MF", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/webdav/META-INF/doesntexistanywhere", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+        // Make sure WebdavServlet is serving resources         
+        // relative to the map/mount point
+        final ByteChunk rootResource = new ByteChunk();
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/index.html", rootResource, null);
+        assertEquals(HttpServletResponse.SC_OK, rc);
+        
+        final ByteChunk subpathResource = new ByteChunk();
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/webdav/index.html", subpathResource, null);
+        assertEquals(HttpServletResponse.SC_OK, rc);
+        
+        assertEquals(rootResource.toString(), subpathResource.toString());
+        
+        rc =getUrl("http://localhost:" + getPort() + contextPath +
+                "/webdav/static/index.html", res, null);
+        assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        
+    }
+
+    public static int getUrl(String path, ByteChunk out,
+            Map<String, List<String>> resHead) throws IOException {
+        out.recycle();
+        return TomcatBaseTest.getUrl(path, out, resHead);
+    }
+
+}