970 lines
31 KiB
Java
970 lines
31 KiB
Java
/*
|
|
* 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.connector;
|
|
|
|
import java.io.BufferedReader;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.InputStreamReader;
|
|
import java.io.OutputStreamWriter;
|
|
import java.io.PrintWriter;
|
|
import java.net.HttpURLConnection;
|
|
import java.net.URL;
|
|
import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.Enumeration;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Locale;
|
|
import java.util.Map;
|
|
import java.util.TreeMap;
|
|
|
|
import javax.servlet.ServletException;
|
|
import javax.servlet.http.HttpServlet;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
import org.junit.Assert;
|
|
import org.junit.BeforeClass;
|
|
import org.junit.Ignore;
|
|
import org.junit.Test;
|
|
|
|
import org.apache.catalina.Context;
|
|
import org.apache.catalina.authenticator.BasicAuthenticator;
|
|
import org.apache.catalina.filters.FailedRequestFilter;
|
|
import org.apache.catalina.startup.SimpleHttpClient;
|
|
import org.apache.catalina.startup.TesterMapRealm;
|
|
import org.apache.catalina.startup.Tomcat;
|
|
import org.apache.catalina.startup.TomcatBaseTest;
|
|
import org.apache.tomcat.unittest.TesterRequest;
|
|
import org.apache.tomcat.util.buf.ByteChunk;
|
|
import org.apache.tomcat.util.descriptor.web.FilterDef;
|
|
import org.apache.tomcat.util.descriptor.web.FilterMap;
|
|
import org.apache.tomcat.util.descriptor.web.LoginConfig;
|
|
|
|
/**
|
|
* Test case for {@link Request}.
|
|
*/
|
|
public class TestRequest extends TomcatBaseTest {
|
|
|
|
@BeforeClass
|
|
public static void setup() {
|
|
// Some of these tests need this and it used statically so set it once
|
|
System.setProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH", "true");
|
|
}
|
|
|
|
/**
|
|
* Test case for https://bz.apache.org/bugzilla/show_bug.cgi?id=37794
|
|
* POST parameters are not returned from a call to
|
|
* any of the {@link HttpServletRequest} getParameterXXX() methods if the
|
|
* request is chunked.
|
|
*/
|
|
@Test
|
|
public void testBug37794() {
|
|
Bug37794Client client = new Bug37794Client(true);
|
|
|
|
// Edge cases around zero
|
|
client.doRequest(-1, false); // Unlimited
|
|
Assert.assertTrue(client.isResponse200());
|
|
Assert.assertTrue(client.isResponseBodyOK());
|
|
client.reset();
|
|
client.doRequest(0, false); // 0 bytes - too small should fail
|
|
Assert.assertTrue(client.isResponse413());
|
|
client.reset();
|
|
client.doRequest(1, false); // 1 byte - too small should fail
|
|
Assert.assertTrue(client.isResponse413());
|
|
|
|
client.reset();
|
|
|
|
// Edge cases around actual content length
|
|
client.reset();
|
|
client.doRequest(6, false); // Too small should fail
|
|
Assert.assertTrue(client.isResponse413());
|
|
client.reset();
|
|
client.doRequest(7, false); // Just enough should pass
|
|
Assert.assertTrue(client.isResponse200());
|
|
Assert.assertTrue(client.isResponseBodyOK());
|
|
client.reset();
|
|
client.doRequest(8, false); // 1 extra - should pass
|
|
Assert.assertTrue(client.isResponse200());
|
|
Assert.assertTrue(client.isResponseBodyOK());
|
|
|
|
// Much larger
|
|
client.reset();
|
|
client.doRequest(8096, false); // Plenty of space - should pass
|
|
Assert.assertTrue(client.isResponse200());
|
|
Assert.assertTrue(client.isResponseBodyOK());
|
|
|
|
// Check for case insensitivity
|
|
client.reset();
|
|
client.doRequest(8096, true); // Plenty of space - should pass
|
|
Assert.assertTrue(client.isResponse200());
|
|
Assert.assertTrue(client.isResponseBodyOK());
|
|
}
|
|
|
|
/**
|
|
* Additional test for failed requests handling when no FailedRequestFilter
|
|
* is defined.
|
|
*/
|
|
@Test
|
|
public void testBug37794withoutFilter() {
|
|
Bug37794Client client = new Bug37794Client(false);
|
|
|
|
// Edge cases around actual content length
|
|
client.reset();
|
|
client.doRequest(6, false); // Too small should fail
|
|
// Response code will be OK, but parameters list will be empty
|
|
Assert.assertTrue(client.isResponse200());
|
|
Assert.assertEquals("", client.getResponseBody());
|
|
}
|
|
|
|
private static class Bug37794Servlet extends HttpServlet {
|
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
/**
|
|
* Only interested in the parameters and values for POST requests.
|
|
*/
|
|
@Override
|
|
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
|
|
throws ServletException, IOException {
|
|
// Just echo the parameters and values back as plain text
|
|
resp.setContentType("text/plain");
|
|
|
|
PrintWriter out = resp.getWriter();
|
|
|
|
// Assume one value per attribute
|
|
Enumeration<String> names = req.getParameterNames();
|
|
while (names.hasMoreElements()) {
|
|
String name = names.nextElement();
|
|
out.println(name + "=" + req.getParameter(name));
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Bug 37794 test client.
|
|
*/
|
|
private class Bug37794Client extends SimpleHttpClient {
|
|
|
|
private final boolean createFilter;
|
|
|
|
private boolean init;
|
|
|
|
public Bug37794Client(boolean createFilter) {
|
|
this.createFilter = createFilter;
|
|
}
|
|
|
|
private synchronized void init() throws Exception {
|
|
if (init) return;
|
|
|
|
Tomcat tomcat = getTomcatInstance();
|
|
Context root = tomcat.addContext("", TEMP_DIR);
|
|
Tomcat.addServlet(root, "Bug37794", new Bug37794Servlet());
|
|
root.addServletMappingDecoded("/test", "Bug37794");
|
|
|
|
if (createFilter) {
|
|
FilterDef failedRequestFilter = new FilterDef();
|
|
failedRequestFilter.setFilterName("failedRequestFilter");
|
|
failedRequestFilter.setFilterClass(
|
|
FailedRequestFilter.class.getName());
|
|
FilterMap failedRequestFilterMap = new FilterMap();
|
|
failedRequestFilterMap.setFilterName("failedRequestFilter");
|
|
failedRequestFilterMap.addURLPatternDecoded("/*");
|
|
root.addFilterDef(failedRequestFilter);
|
|
root.addFilterMap(failedRequestFilterMap);
|
|
}
|
|
|
|
tomcat.start();
|
|
|
|
setPort(tomcat.getConnector().getLocalPort());
|
|
|
|
init = true;
|
|
}
|
|
|
|
private Exception doRequest(int postLimit, boolean ucChunkedHead) {
|
|
Tomcat tomcat = getTomcatInstance();
|
|
|
|
try {
|
|
init();
|
|
tomcat.getConnector().setMaxPostSize(postLimit);
|
|
|
|
// Open connection
|
|
connect();
|
|
|
|
// Send request in two parts
|
|
String[] request = new String[2];
|
|
if (ucChunkedHead) {
|
|
request[0] =
|
|
"POST http://localhost:8080/test HTTP/1.1" + CRLF +
|
|
"Host: localhost:8080" + CRLF +
|
|
"content-type: application/x-www-form-urlencoded" + CRLF +
|
|
"Transfer-Encoding: CHUNKED" + CRLF +
|
|
"Connection: close" + CRLF +
|
|
CRLF +
|
|
"3" + CRLF +
|
|
"a=1" + CRLF;
|
|
} else {
|
|
request[0] =
|
|
"POST http://localhost:8080/test HTTP/1.1" + CRLF +
|
|
"Host: localhost:8080" + CRLF +
|
|
"content-type: application/x-www-form-urlencoded" + CRLF +
|
|
"Transfer-Encoding: chunked" + CRLF +
|
|
"Connection: close" + CRLF +
|
|
CRLF +
|
|
"3" + CRLF +
|
|
"a=1" + CRLF;
|
|
}
|
|
request[1] =
|
|
"4" + CRLF +
|
|
"&b=2" + CRLF +
|
|
"0" + CRLF +
|
|
CRLF;
|
|
|
|
setRequest(request);
|
|
processRequest(); // blocks until response has been read
|
|
|
|
// Close the connection
|
|
disconnect();
|
|
} catch (Exception e) {
|
|
return e;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
@Override
|
|
public boolean isResponseBodyOK() {
|
|
if (getResponseBody() == null) {
|
|
return false;
|
|
}
|
|
if (!getResponseBody().contains("a=1")) {
|
|
return false;
|
|
}
|
|
if (!getResponseBody().contains("b=2")) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
|
* Test case for
|
|
* <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=38113">bug
|
|
* 38118</a>.
|
|
*/
|
|
@Test
|
|
public void testBug38113() throws Exception {
|
|
// Setup Tomcat instance
|
|
Tomcat tomcat = getTomcatInstance();
|
|
|
|
// No file system docBase required
|
|
Context ctx = tomcat.addContext("", null);
|
|
|
|
// Add the Servlet
|
|
Tomcat.addServlet(ctx, "servlet", new EchoQueryStringServlet());
|
|
ctx.addServletMappingDecoded("/", "servlet");
|
|
|
|
tomcat.start();
|
|
|
|
// No query string
|
|
ByteChunk res = getUrl("http://localhost:" + getPort() + "/");
|
|
Assert.assertEquals("QueryString=null", res.toString());
|
|
|
|
// Query string
|
|
res = getUrl("http://localhost:" + getPort() + "/?a=b");
|
|
Assert.assertEquals("QueryString=a=b", res.toString());
|
|
|
|
// Empty string
|
|
res = getUrl("http://localhost:" + getPort() + "/?");
|
|
Assert.assertEquals("QueryString=", res.toString());
|
|
}
|
|
|
|
private static final class EchoQueryStringServlet extends HttpServlet {
|
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
@Override
|
|
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
|
|
throws ServletException, IOException {
|
|
resp.setContentType("text/plain");
|
|
PrintWriter pw = resp.getWriter();
|
|
pw.print("QueryString=" + req.getQueryString());
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Test case for {@link Request#login(String, String)} and
|
|
* {@link Request#logout()}.
|
|
*/
|
|
@Test
|
|
public void testLoginLogout() throws Exception{
|
|
// Setup Tomcat instance
|
|
Tomcat tomcat = getTomcatInstance();
|
|
|
|
// No file system docBase required
|
|
Context ctx = tomcat.addContext("", null);
|
|
|
|
LoginConfig config = new LoginConfig();
|
|
config.setAuthMethod("BASIC");
|
|
ctx.setLoginConfig(config);
|
|
ctx.getPipeline().addValve(new BasicAuthenticator());
|
|
|
|
Tomcat.addServlet(ctx, "servlet", new LoginLogoutServlet());
|
|
ctx.addServletMappingDecoded("/", "servlet");
|
|
|
|
TesterMapRealm realm = new TesterMapRealm();
|
|
realm.addUser(LoginLogoutServlet.USER, LoginLogoutServlet.PWD);
|
|
ctx.setRealm(realm);
|
|
|
|
tomcat.start();
|
|
|
|
ByteChunk res = getUrl("http://localhost:" + getPort() + "/");
|
|
Assert.assertEquals(LoginLogoutServlet.OK, res.toString());
|
|
}
|
|
|
|
private static final class LoginLogoutServlet extends HttpServlet {
|
|
private static final long serialVersionUID = 1L;
|
|
private static final String USER = "user";
|
|
private static final String PWD = "pwd";
|
|
private static final String OK = "OK";
|
|
|
|
@Override
|
|
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
|
|
throws ServletException, IOException {
|
|
|
|
req.login(USER, PWD);
|
|
|
|
if (!req.getRemoteUser().equals(USER))
|
|
throw new ServletException();
|
|
if (!req.getUserPrincipal().getName().equals(USER))
|
|
throw new ServletException();
|
|
|
|
req.logout();
|
|
|
|
if (req.getRemoteUser() != null)
|
|
throw new ServletException();
|
|
if (req.getUserPrincipal() != null)
|
|
throw new ServletException();
|
|
|
|
resp.getWriter().write(OK);
|
|
}
|
|
|
|
}
|
|
|
|
@Test
|
|
public void testBug49424NoChunking() throws Exception {
|
|
Tomcat tomcat = getTomcatInstance();
|
|
Context root = tomcat.addContext("",
|
|
System.getProperty("java.io.tmpdir"));
|
|
Tomcat.addServlet(root, "Bug37794", new Bug37794Servlet());
|
|
root.addServletMappingDecoded("/", "Bug37794");
|
|
tomcat.start();
|
|
|
|
HttpURLConnection conn = getConnection("http://localhost:" + getPort() + "/");
|
|
InputStream is = conn.getInputStream();
|
|
Assert.assertNotNull(is);
|
|
}
|
|
|
|
@Test
|
|
public void testBug49424WithChunking() throws Exception {
|
|
Tomcat tomcat = getTomcatInstance();
|
|
Context root = tomcat.addContext("",
|
|
System.getProperty("java.io.tmpdir"));
|
|
Tomcat.addServlet(root, "Bug37794", new Bug37794Servlet());
|
|
root.addServletMappingDecoded("/", "Bug37794");
|
|
tomcat.start();
|
|
|
|
HttpURLConnection conn = getConnection("http://localhost:" + getPort() + "/");
|
|
conn.setChunkedStreamingMode(8 * 1024);
|
|
InputStream is = conn.getInputStream();
|
|
Assert.assertNotNull(is);
|
|
}
|
|
|
|
/**
|
|
* Test case for https://bz.apache.org/bugzilla/show_bug.cgi?id=48692
|
|
* PUT requests should be able to fetch request parameters coming from
|
|
* the request body (when properly configured using the new parseBodyMethod
|
|
* setting).
|
|
*/
|
|
@Test
|
|
public void testBug48692() {
|
|
Bug48692Client client = new Bug48692Client();
|
|
|
|
// Make sure GET works properly
|
|
client.doRequest("GET", "foo=bar", null, null, false);
|
|
|
|
Assert.assertTrue("Non-200 response for GET request",
|
|
client.isResponse200());
|
|
Assert.assertEquals("Incorrect response for GET request",
|
|
"foo=bar",
|
|
client.getResponseBody());
|
|
|
|
client.reset();
|
|
|
|
//
|
|
// Make sure POST works properly
|
|
//
|
|
// POST with separate GET and POST parameters
|
|
client.doRequest("POST", "foo=bar", "application/x-www-form-urlencoded", "bar=baz", true);
|
|
|
|
Assert.assertTrue("Non-200 response for POST request",
|
|
client.isResponse200());
|
|
Assert.assertEquals("Incorrect response for POST request",
|
|
"bar=baz,foo=bar",
|
|
client.getResponseBody());
|
|
|
|
client.reset();
|
|
|
|
// POST with overlapping GET and POST parameters
|
|
client.doRequest("POST", "foo=bar&bar=foo", "application/x-www-form-urlencoded", "bar=baz&foo=baz", true);
|
|
|
|
Assert.assertTrue("Non-200 response for POST request",
|
|
client.isResponse200());
|
|
Assert.assertEquals("Incorrect response for POST request",
|
|
"bar=baz,bar=foo,foo=bar,foo=baz",
|
|
client.getResponseBody());
|
|
|
|
client.reset();
|
|
|
|
// PUT without POST-style parsing
|
|
client.doRequest("PUT", "foo=bar&bar=foo", "application/x-www-form-urlencoded", "bar=baz&foo=baz", false);
|
|
|
|
Assert.assertTrue("Non-200 response for PUT/noparse request",
|
|
client.isResponse200());
|
|
Assert.assertEquals("Incorrect response for PUT request",
|
|
"bar=foo,foo=bar",
|
|
client.getResponseBody());
|
|
|
|
client.reset();
|
|
|
|
// PUT with POST-style parsing
|
|
client.doRequest("PUT", "foo=bar&bar=foo", "application/x-www-form-urlencoded", "bar=baz&foo=baz", true);
|
|
|
|
Assert.assertTrue("Non-200 response for PUT request",
|
|
client.isResponse200());
|
|
Assert.assertEquals("Incorrect response for PUT/parse request",
|
|
"bar=baz,bar=foo,foo=bar,foo=baz",
|
|
client.getResponseBody());
|
|
|
|
client.reset();
|
|
|
|
/*
|
|
private Exception doRequest(String method,
|
|
String queryString,
|
|
String contentType,
|
|
String requestBody,
|
|
boolean allowBody) {
|
|
*/
|
|
}
|
|
|
|
@Test
|
|
public void testBug54984() throws Exception {
|
|
Tomcat tomcat = getTomcatInstance();
|
|
Context root = tomcat.addContext("",
|
|
System.getProperty("java.io.tmpdir"));
|
|
root.setAllowCasualMultipartParsing(true);
|
|
Tomcat.addServlet(root, "Bug54984", new Bug54984Servlet());
|
|
root.addServletMappingDecoded("/", "Bug54984");
|
|
tomcat.start();
|
|
|
|
HttpURLConnection conn = getConnection("http://localhost:" + getPort()
|
|
+ "/parseParametersBeforeParseParts");
|
|
|
|
prepareRequestBug54984(conn);
|
|
|
|
checkResponseBug54984(conn);
|
|
|
|
conn.disconnect();
|
|
|
|
conn = getConnection("http://localhost:" + getPort() + "/");
|
|
|
|
prepareRequestBug54984(conn);
|
|
|
|
checkResponseBug54984(conn);
|
|
|
|
conn.disconnect();
|
|
}
|
|
|
|
/**
|
|
*
|
|
*/
|
|
private static class EchoParametersServlet extends HttpServlet {
|
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
/**
|
|
* Only interested in the parameters and values for requests.
|
|
* Note: echos parameters in alphabetical order.
|
|
*/
|
|
@Override
|
|
protected void service(HttpServletRequest req, HttpServletResponse resp)
|
|
throws ServletException, IOException {
|
|
// Just echo the parameters and values back as plain text
|
|
resp.setContentType("text/plain");
|
|
resp.setCharacterEncoding("UTF-8");
|
|
|
|
PrintWriter out = resp.getWriter();
|
|
|
|
TreeMap<String,String[]> parameters =
|
|
new TreeMap<>(req.getParameterMap());
|
|
|
|
boolean first = true;
|
|
|
|
for(String name: parameters.keySet()) {
|
|
String[] values = req.getParameterValues(name);
|
|
|
|
java.util.Arrays.sort(values);
|
|
|
|
for(int i=0; i<values.length; ++i)
|
|
{
|
|
if(first)
|
|
first = false;
|
|
else
|
|
out.print(",");
|
|
|
|
out.print(name + "=" + values[i]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Bug 48692 test client: test for allowing PUT request bodies.
|
|
*/
|
|
private class Bug48692Client extends SimpleHttpClient {
|
|
|
|
private boolean init;
|
|
|
|
private synchronized void init() throws Exception {
|
|
if (init) return;
|
|
|
|
Tomcat tomcat = getTomcatInstance();
|
|
Context root = tomcat.addContext("", TEMP_DIR);
|
|
Tomcat.addServlet(root, "EchoParameters", new EchoParametersServlet());
|
|
root.addServletMappingDecoded("/echo", "EchoParameters");
|
|
tomcat.start();
|
|
|
|
setPort(tomcat.getConnector().getLocalPort());
|
|
|
|
init = true;
|
|
}
|
|
|
|
private Exception doRequest(String method,
|
|
String queryString,
|
|
String contentType,
|
|
String requestBody,
|
|
boolean allowBody) {
|
|
Tomcat tomcat = getTomcatInstance();
|
|
|
|
try {
|
|
init();
|
|
if(allowBody)
|
|
tomcat.getConnector().setParseBodyMethods(method);
|
|
else
|
|
tomcat.getConnector().setParseBodyMethods(""); // never parse
|
|
|
|
// Open connection
|
|
connect();
|
|
|
|
// Re-encode the request body so that bytes = characters
|
|
if(null != requestBody)
|
|
requestBody = new String(requestBody.getBytes("UTF-8"), "ASCII");
|
|
|
|
// Send specified request body using method
|
|
String[] request = {
|
|
(
|
|
method + " http://localhost:" + getPort() + "/echo"
|
|
+ (null == queryString ? "" : ("?" + queryString))
|
|
+ " HTTP/1.1" + CRLF
|
|
+ "Host: localhost:" + getPort() + CRLF
|
|
+ (null == contentType ? ""
|
|
: ("Content-Type: " + contentType + CRLF))
|
|
+ "Connection: close" + CRLF
|
|
+ (null == requestBody ? "" : "Content-Length: " + requestBody.length() + CRLF)
|
|
+ CRLF
|
|
+ (null == requestBody ? "" : requestBody)
|
|
)
|
|
};
|
|
|
|
setRequest(request);
|
|
processRequest(); // blocks until response has been read
|
|
|
|
// Close the connection
|
|
disconnect();
|
|
} catch (Exception e) {
|
|
return e;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
@Override
|
|
public boolean isResponseBodyOK() {
|
|
return false; // Don't care
|
|
}
|
|
}
|
|
|
|
private HttpURLConnection getConnection(String query) throws IOException {
|
|
URL postURL;
|
|
postURL = new URL(query);
|
|
HttpURLConnection conn = (HttpURLConnection) postURL.openConnection();
|
|
conn.setRequestMethod("POST");
|
|
|
|
conn.setDoInput(true);
|
|
conn.setDoOutput(true);
|
|
conn.setUseCaches(false);
|
|
conn.setAllowUserInteraction(false);
|
|
|
|
return conn;
|
|
}
|
|
|
|
private static class Bug54984Servlet extends HttpServlet {
|
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
@Override
|
|
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
|
|
throws ServletException, IOException {
|
|
req.setCharacterEncoding("UTF-8");
|
|
|
|
if (req.getRequestURI().endsWith("parseParametersBeforeParseParts")) {
|
|
req.getParameterNames();
|
|
}
|
|
|
|
req.getPart("part");
|
|
|
|
resp.setContentType("text/plain");
|
|
resp.setCharacterEncoding("UTF-8");
|
|
|
|
resp.getWriter().println("Part " + req.getParameter("part"));
|
|
}
|
|
}
|
|
|
|
private void prepareRequestBug54984(HttpURLConnection conn)
|
|
throws Exception {
|
|
String boundary = "-----" + System.currentTimeMillis();
|
|
conn.setRequestProperty("Content-Type",
|
|
"multipart/form-data; boundary=" + boundary);
|
|
|
|
try (OutputStreamWriter osw = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
|
|
PrintWriter writer = new PrintWriter(osw, true)) {
|
|
writer.append("--" + boundary).append("\r\n");
|
|
writer.append("Content-Disposition: form-data; name=\"part\"\r\n");
|
|
writer.append("Content-Type: text/plain; charset=UTF-8\r\n");
|
|
writer.append("\r\n");
|
|
writer.append("äö").append("\r\n");
|
|
writer.flush();
|
|
|
|
writer.append("\r\n");
|
|
writer.flush();
|
|
|
|
writer.append("--" + boundary + "--").append("\r\n");
|
|
}
|
|
}
|
|
|
|
private void checkResponseBug54984(HttpURLConnection conn)
|
|
throws Exception {
|
|
List<String> response = new ArrayList<>();
|
|
int status = conn.getResponseCode();
|
|
if (status == HttpURLConnection.HTTP_OK) {
|
|
try (InputStreamReader isr = new InputStreamReader(conn.getInputStream(), "UTF-8");
|
|
BufferedReader reader = new BufferedReader(isr)) {
|
|
String line = null;
|
|
while ((line = reader.readLine()) != null) {
|
|
response.add(line);
|
|
}
|
|
Assert.assertTrue(response.contains("Part äö"));
|
|
}
|
|
} else {
|
|
Assert.fail("OK status was expected: " + status);
|
|
}
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501a() throws Exception {
|
|
doBug56501("/path", "/path", "/path");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501b() throws Exception {
|
|
doBug56501("/path", "/path/", "/path");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501c() throws Exception {
|
|
doBug56501("/path", "/path/xxx", "/path");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501d() throws Exception {
|
|
doBug56501("", "", "");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501e() throws Exception {
|
|
doBug56501("", "/", "");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501f() throws Exception {
|
|
doBug56501("", "/xxx", "");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501g() throws Exception {
|
|
doBug56501("/path/abc", "/path/abc", "/path/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501h() throws Exception {
|
|
doBug56501("/path/abc", "/path/abc/", "/path/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501i() throws Exception {
|
|
doBug56501("/path/abc", "/path/abc/xxx", "/path/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501j() throws Exception {
|
|
doBug56501("/pa_th/abc", "/pa%5Fth/abc", "/pa%5Fth/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501k() throws Exception {
|
|
doBug56501("/pa_th/abc", "/pa%5Fth/abc/", "/pa%5Fth/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501l() throws Exception {
|
|
doBug56501("/pa_th/abc", "/pa%5Fth/abc/xxx", "/pa%5Fth/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501m() throws Exception {
|
|
doBug56501("/pa_th/abc", "/pa_th/abc", "/pa_th/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501n() throws Exception {
|
|
doBug56501("/pa_th/abc", "/pa_th/abc/", "/pa_th/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501o() throws Exception {
|
|
doBug56501("/pa_th/abc", "/pa_th/abc/xxx", "/pa_th/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501p() throws Exception {
|
|
doBug56501("/path/abc", "/path;a=b/abc/xxx", "/path;a=b/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501q() throws Exception {
|
|
doBug56501("/path/abc", "/path/abc;a=b/xxx", "/path/abc;a=b");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501r() throws Exception {
|
|
doBug56501("/path/abc", "/path/abc/xxx;a=b", "/path/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug56501s() throws Exception {
|
|
doBug56501("/path/abc", "/.;a=b/path/abc/xxx", "/.;a=b/path/abc");
|
|
}
|
|
|
|
@Test
|
|
public void testBug57215a() throws Exception {
|
|
doBug56501("/path", "//path", "//path");
|
|
}
|
|
|
|
@Test
|
|
public void testBug57215b() throws Exception {
|
|
doBug56501("/path", "//path/", "//path");
|
|
}
|
|
|
|
@Test
|
|
public void testBug57215c() throws Exception {
|
|
doBug56501("/path", "/%2Fpath", "/%2Fpath");
|
|
}
|
|
|
|
@Test
|
|
public void testBug57215d() throws Exception {
|
|
doBug56501("/path", "/%2Fpath%2F", "/%2Fpath");
|
|
}
|
|
|
|
@Test
|
|
public void testBug57215e() throws Exception {
|
|
doBug56501("/path", "/foo/../path", "/foo/../path");
|
|
}
|
|
|
|
@Test
|
|
public void testBug57215f() throws Exception {
|
|
doBug56501("/path", "/foo/..%2fpath", "/foo/..%2fpath");
|
|
}
|
|
|
|
private void doBug56501(String deployPath, String requestPath, String expected)
|
|
throws Exception {
|
|
|
|
// Setup Tomcat instance
|
|
Tomcat tomcat = getTomcatInstance();
|
|
|
|
// No file system docBase required
|
|
Context ctx = tomcat.addContext(deployPath, null);
|
|
ctx.setAllowMultipleLeadingForwardSlashInPath(true);
|
|
|
|
Tomcat.addServlet(ctx, "servlet", new Bug56501Servlet());
|
|
ctx.addServletMappingDecoded("/*", "servlet");
|
|
|
|
tomcat.start();
|
|
|
|
ByteChunk res = getUrl("http://localhost:" + getPort() + requestPath);
|
|
String resultPath = res.toString();
|
|
if (resultPath == null) {
|
|
resultPath = "";
|
|
}
|
|
Assert.assertEquals(expected, resultPath);
|
|
}
|
|
|
|
private class Bug56501Servlet extends HttpServlet {
|
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
@Override
|
|
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
|
|
throws ServletException, IOException {
|
|
resp.setContentType("text/plain");
|
|
resp.getWriter().print(req.getContextPath());
|
|
}
|
|
}
|
|
|
|
@Test
|
|
public void getLocaleMultipleHeaders01() throws Exception {
|
|
TesterRequest req = new TesterRequest();
|
|
|
|
req.addHeader("accept-language", "en;q=0.5");
|
|
req.addHeader("accept-language", "en-gb");
|
|
|
|
Locale actual = req.getLocale();
|
|
Locale expected = Locale.forLanguageTag("en-gb");
|
|
|
|
Assert.assertEquals(expected, actual);
|
|
}
|
|
|
|
/*
|
|
* Reverse header order of getLocaleMultipleHeaders01() and make sure the
|
|
* result is the same.
|
|
*/
|
|
@Test
|
|
public void getLocaleMultipleHeaders02() throws Exception {
|
|
TesterRequest req = new TesterRequest();
|
|
|
|
req.addHeader("accept-language", "en-gb");
|
|
req.addHeader("accept-language", "en;q=0.5");
|
|
|
|
Locale actual = req.getLocale();
|
|
Locale expected = Locale.forLanguageTag("en-gb");
|
|
|
|
Assert.assertEquals(expected, actual);
|
|
}
|
|
|
|
|
|
@Test
|
|
@Ignore("Used to check performance of different parsing approaches")
|
|
public void localeParsePerformance() throws Exception {
|
|
TesterRequest req = new TesterRequest();
|
|
req.addHeader("accept-encoding", "en-gb,en");
|
|
|
|
long start = System.nanoTime();
|
|
|
|
// Takes about 0.3s on a quad core 2.7Ghz 2013 MacBook
|
|
for (int i = 0; i < 10000000; i++) {
|
|
req.parseLocales();
|
|
req.localesParsed = false;
|
|
req.locales.clear();
|
|
}
|
|
|
|
long time = System.nanoTime() - start;
|
|
|
|
System.out.println(time);
|
|
}
|
|
|
|
|
|
@Test
|
|
public void testGetReaderValidEncoding() throws Exception {
|
|
doTestGetReader("ISO-8859-1", true);
|
|
}
|
|
|
|
|
|
@Test
|
|
public void testGetReaderInvalidEbcoding() throws Exception {
|
|
doTestGetReader("X-Invalid", false);
|
|
}
|
|
|
|
|
|
private void doTestGetReader(String userAgentCharaceterEncoding, boolean expect200)
|
|
throws Exception {
|
|
|
|
// Setup Tomcat instance
|
|
Tomcat tomcat = getTomcatInstance();
|
|
|
|
// No file system docBase required
|
|
Context ctx = tomcat.addContext("", null);
|
|
|
|
Tomcat.addServlet(ctx, "servlet", new Bug61264GetReaderServlet());
|
|
ctx.addServletMappingDecoded("/", "servlet");
|
|
|
|
tomcat.start();
|
|
|
|
byte[] body = "Test".getBytes();
|
|
ByteChunk bc = new ByteChunk();
|
|
Map<String,List<String>> reqHeaders = new HashMap<>();
|
|
reqHeaders.put("Content-Type",
|
|
Arrays.asList(new String[] {"text/plain;charset=" + userAgentCharaceterEncoding}));
|
|
|
|
int rc = postUrl(body, "http://localhost:" + getPort() + "/", bc, reqHeaders, null);
|
|
|
|
if (expect200) {
|
|
Assert.assertEquals(200, rc);
|
|
} else {
|
|
Assert.assertEquals(500, rc);
|
|
}
|
|
}
|
|
|
|
|
|
private class Bug61264GetReaderServlet extends HttpServlet {
|
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
@Override
|
|
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
|
|
throws ServletException, IOException {
|
|
// This is intended for POST requests
|
|
resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
|
|
}
|
|
|
|
@Override
|
|
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
|
|
throws ServletException, IOException {
|
|
// Container will handle any errors
|
|
req.getReader();
|
|
}
|
|
}
|
|
}
|