Author: markt
Date: Fri Jun 3 14:43:07 2016
New Revision: 1746725
URL: http://svn.apache.org/viewvc?rev=1746725&view=rev
Log:
If an async dispatch results in the completion of request processing, ensure
that any remaining request body is swallowed before starting the processing of
the next request else the remaining body may be read as the start of the next
request leading to a 400 response.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 14:43:07 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1746725&r1=1746724&r2=1746725&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri
Jun 3 14:43:07 2016
@@ -1727,6 +1727,7 @@ public class Http11Processor extends Abs
if (!keepAlive) {
return SocketState.CLOSED;
} else {
+ endRequest();
inputBuffer.nextRequest();
outputBuffer.nextRequest();
if (socketWrapper.isReadPending()) {
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?rev=1746725&r1=1746724&r2=1746725&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
Fri Jun 3 14:43:07 2016
@@ -16,11 +16,18 @@
*/
package org.apache.coyote.http11;
+import java.io.BufferedReader;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.io.Reader;
import java.io.Writer;
+import java.net.InetSocketAddress;
import java.net.Socket;
+import java.net.SocketAddress;
import java.nio.CharBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -31,6 +38,7 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServlet;
@@ -842,4 +850,99 @@ public class TestHttp11Processor extends
throws ServletException, IOException {
}
}
+
+
+ /*
+ * Tests what happens if a request is completed during a dispatch but the
+ * request body has not been fully read.
+ */
+ @Test
+ public void testRequestBodySwallowing() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ // No file system docBase required
+ Context ctx = tomcat.addContext("", null);
+
+ SempahoreServlet servlet = new SempahoreServlet();
+ Wrapper w = Tomcat.addServlet(ctx, "Test", servlet);
+ w.setAsyncSupported(true);
+ ctx.addServletMapping("/test", "Test");
+
+ tomcat.start();
+
+ // Hand-craft the client so we have complete control over the timing
+ SocketAddress addr = new InetSocketAddress("localhost", getPort());
+ Socket socket = new Socket();
+ socket.setSoTimeout(300000);
+ socket.connect(addr,300000);
+ OutputStream os = socket.getOutputStream();
+ Writer writer = new OutputStreamWriter(os, "ISO-8859-1");
+ InputStream is = socket.getInputStream();
+ Reader r = new InputStreamReader(is, "ISO-8859-1");
+ BufferedReader reader = new BufferedReader(r);
+
+ // Write the headers
+ writer.write("POST /test HTTP/1.1\r\n");
+ writer.write("Host: localhost:8080\r\n");
+ writer.write("Transfer-Encoding: chunked\r\n");
+ writer.write("\r\n");
+ writer.flush();
+
+ validateResponse(reader);
+
+ // Write the request body
+ writer.write("2\r\n");
+ writer.write("AB\r\n");
+ writer.write("0\r\n");
+ writer.write("\r\n");
+ writer.flush();
+
+ // Write the 2nd request
+ writer.write("POST /test HTTP/1.1\r\n");
+ writer.write("Host: localhost:8080\r\n");
+ writer.write("Transfer-Encoding: chunked\r\n");
+ writer.write("\r\n");
+ writer.flush();
+
+ // Read the 2nd response
+ validateResponse(reader);
+
+ // Write the 2nd request body
+ writer.write("2\r\n");
+ writer.write("AB\r\n");
+ writer.write("0\r\n");
+ writer.write("\r\n");
+ writer.flush();
+
+ // Done
+ socket.close();
+ }
+
+
+ private void validateResponse(BufferedReader reader) throws IOException {
+ // First line has the response code and should always be 200
+ String line = reader.readLine();
+ Assert.assertEquals("HTTP/1.1 200 ", line);
+ while (!"OK".equals(line)) {
+ line = reader.readLine();
+ }
+ }
+
+
+ private static class SempahoreServlet extends HttpServlet {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+ if (DispatcherType.ASYNC.equals(req.getDispatcherType())) {
+ resp.setContentType("text/plain");
+ resp.setCharacterEncoding("UTF-8");
+ resp.getWriter().write("OK\n");
+ } else {
+ req.startAsync().dispatch();
+ }
+ }
+ }
}
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1746725&r1=1746724&r2=1746725&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Fri Jun 3 14:43:07 2016
@@ -109,6 +109,12 @@
<code>WriteListener.onError()</code> or
<code>AsycnListener.onError()</code>) is called. (markt)
</fix>
+ <fix>
+ If an async dispatch results in the completion of request processing,
+ ensure that any remaining request body is swallowed before starting the
+ processing of the next request else the remaining body may be read as
the
+ start of the next request leading to a 400 response. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
