craigmcc 01/03/30 13:20:05
Modified: tester/src/bin tester.xml
tester/web/WEB-INF web.xml
Added: tester/src/tester/org/apache/tester Decoding01.java
Log:
Add unit tests to validate URL decoding of getServletPath() and
getPathInfo() values.
Revision Changes Path
1.25 +48 -2 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tester.xml 2001/03/26 20:04:37 1.24
+++ tester.xml 2001/03/30 21:20:02 1.25
@@ -12,7 +12,7 @@
<taskdef name="tester" classname="org.apache.tester.TestClient"/>
- <target name="all"
depends="ROOT,Authentication,CaseSensitive,ErrorPage,Jndi,RequestDispatcher,Resources,ServletRequest,ServletResponse,HttpSession,XercesTest"/>
+ <target name="all"
depends="ROOT,Authentication,CaseSensitive,Decoding,ErrorPage,Jndi,RequestDispatcher,Resources,ServletRequest,ServletResponse,HttpSession,XercesTest"/>
<target name="ROOT">
@@ -137,6 +137,53 @@
</target>
+ <target name="Decoding">
+
+ <!-- ========== URL Decoding Tests ==================================== -->
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Decoding01?servlet=/Decoding01"
+ outContent="Decoding01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+
request="${context.path}/Decoding01/extra?servlet=/Decoding01&path=/extra"
+ outContent="Decoding01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/Decoding0%31?servlet=/Decoding01"
+ outContent="Decoding01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+
request="${context.path}/Decoding01/extr%61?servlet=/Decoding01&path=/extra"
+ outContent="Decoding01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+
request="${context.path}/Decoding0%31/extr%61?servlet=/Decoding01&path=/extra"
+ outContent="Decoding01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedDecoding01?servlet=/WrappedDecoding01"
+ outContent="Decoding01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+
request="${context.path}/WrappedDecoding01/extra?servlet=/WrappedDecoding01&path=/extra"
+ outContent="Decoding01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+ request="${context.path}/WrappedDecoding0%31?servlet=/WrappedDecoding01"
+ outContent="Decoding01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+
request="${context.path}/WrappedDecoding01/extr%61?servlet=/WrappedDecoding01&path=/extra"
+ outContent="Decoding01 PASSED"/>
+
+ <tester host="${host}" port="${port}" protocol="${protocol}"
+
request="${context.path}/WrappedDecoding0%31/extr%61?servlet=/WrappedDecoding01&path=/extra"
+ outContent="Decoding01 PASSED"/>
+
+ </target>
+
+
<target name="ErrorPage">
<!-- ========== Error Code Mapping ==================================== -->
@@ -521,7 +568,6 @@
<tester host="${host}" port="${port}" protocol="${protocol}"
request="${context.path}/WrappedGetInputStream01" debug="${debug}"
outContent="GetInputStream01 PASSED"/>
-
</target>
1.1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Decoding01.java
Index: Decoding01.java
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999, 2000, 2001 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
* *
* Redistribution and use in source and binary forms, with or without modi- *
* fication, are permitted provided that the following conditions are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice *
* notice, this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. The end-user documentation included with the redistribution, if any, *
* must include the following acknowlegement: *
* *
* "This product includes software developed by the Apache Software *
* Foundation <http://www.apache.org/>." *
* *
* Alternately, this acknowlegement may appear in the software itself, if *
* and wherever such third-party acknowlegements normally appear. *
* *
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software *
* Foundation" must not be used to endorse or promote products derived *
* from this software without prior written permission. For written *
* permission, please contact <[EMAIL PROTECTED]>. *
* *
* 5. Products derived from this software may not be called "Apache" nor may *
* "Apache" appear in their names without prior written permission of the *
* Apache Software Foundation. *
* *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY *
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY *
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL *
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, *
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= *
* *
* This software consists of voluntary contributions made by many indivi- *
* duals on behalf of the Apache Software Foundation. For more information *
* on the Apache Software Foundation, please see <http://www.apache.org/>. *
* *
* ========================================================================= */
package org.apache.tester;
import java.io.*;
import javax.servlet.*;
import javax.servlet.http.*;
/**
* Test for proper URL decoding of the getServletPath() and getPathInfo()
* methods of HttpServletRequest. The desired values are specified by the
* <strong>servlet</strong> and <strong>path</strong> request parameters,
* respectively.
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2001/03/30 21:20:03 $
*/
public class Decoding01 extends HttpServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
// Identify our configuration parameters
String desiredServlet = request.getParameter("servlet");
String desiredPath = request.getParameter("path");
// Prepare for the desired test
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
StringBuffer results = new StringBuffer();
// Check the value returned by getServletPath()
String servletPath = request.getServletPath();
if (desiredServlet == null) {
if (servletPath != null)
results.append(" servletPath is '" + servletPath +
"' instead of NULL/");
} else {
if (servletPath == null)
results.append(" servletPath is NULL instead of '" +
desiredPath + "'/");
else if (!servletPath.equals(desiredServlet))
results.append(" servletPath is '" + servletPath +
"' instead of '" + desiredServlet + "'/");
}
// Check the value returned by getPathInfo()
String pathInfo = request.getPathInfo();
if (desiredPath == null) {
if (pathInfo != null)
results.append(" pathInfo is '" + pathInfo +
"' instead of NULL/");
} else {
if (pathInfo == null)
results.append(" pathInfo is NULL instead of '" +
desiredPath + "'/");
else if (!pathInfo.equals(desiredPath))
results.append(" pathInfo is '" + pathInfo +
"' instead of '" + desiredPath + "'/");
}
// Report success or failure
if (results.length() < 1)
writer.println("Decoding01 PASSED");
else {
writer.print("Decoding01 FAILED -");
writer.println(results.toString());
}
// Add wrapper messages as required
while (true) {
String message = StaticLogger.read();
if (message == null)
break;
writer.println(message);
}
StaticLogger.reset();
}
}
1.17 +20 -0 jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- web.xml 2001/03/26 20:04:40 1.16
+++ web.xml 2001/03/30 21:20:04 1.17
@@ -52,6 +52,11 @@
<filter-mapping>
<filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedDecoding01</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
<url-pattern>/WrappedErrorPage01</url-pattern>
</filter-mapping>
@@ -223,6 +228,11 @@
</servlet>
<servlet>
+ <servlet-name>Decoding01</servlet-name>
+ <servlet-class>org.apache.tester.Decoding01</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>ErrorPage01</servlet-name>
<servlet-class>org.apache.tester.ErrorPage01</servlet-class>
</servlet>
@@ -403,6 +413,16 @@
<servlet-mapping>
<servlet-name>Authentication03</servlet-name>
<url-pattern>/protected/Authentication03</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Decoding01</servlet-name>
+ <url-pattern>/Decoding01/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Decoding01</servlet-name>
+ <url-pattern>/WrappedDecoding01/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
