Author: markt
Date: Sat Mar 7 15:25:59 2015
New Revision: 1664872
URL: http://svn.apache.org/r1664872
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57638
Avoid an IllegalArgumentException when an AJP request body chunk larger than
the socket read buffer is being read. This typically requires a larger than
default AJP packetSize.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 7 15:25:59 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866
Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java?rev=1664872&r1=1664871&r2=1664872&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Processor.java Sat
Mar 7 15:25:59 2015
@@ -218,7 +218,9 @@ public class AjpNio2Processor extends Ab
} else {
readBuffer.clear();
flipped = false;
- readBuffer.limit(n);
+ if (n < readBuffer.capacity()) {
+ readBuffer.limit(n);
+ }
try {
nRead = socketWrapper.getSocket().read(readBuffer)
.get(socketWrapper.getTimeout(),
TimeUnit.MILLISECONDS).intValue();
Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1664872&r1=1664871&r2=1664872&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Sat
Mar 7 15:25:59 2015
@@ -176,7 +176,9 @@ public class AjpNioProcessor extends Abs
ByteBuffer readBuffer =
socketWrapper.getSocket().getBufHandler().getReadBuffer();
readBuffer.clear();
- readBuffer.limit(n);
+ if (n < readBuffer.capacity()) {
+ readBuffer.limit(n);
+ }
if ( block ) {
Selector selector = null;
try {
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1664872&r1=1664871&r2=1664872&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Sat Mar 7 15:25:59 2015
@@ -60,6 +60,7 @@ import org.apache.catalina.valves.Access
import org.apache.catalina.webresources.StandardRoot;
import org.apache.coyote.http11.Http11NioProtocol;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.websocket.CaseInsensitiveKeyMap;
/**
* Base test case that provides a Tomcat instance for each test - mainly so we
@@ -241,7 +242,7 @@ public abstract class TomcatBaseTest ext
private final Map<String, String> requestInfo = new HashMap<>();
private final Map<String, String> contextInitParameters = new
HashMap<>();
private final Map<String, String> contextAttributes = new HashMap<>();
- private final Map<String, String> headers = new HashMap<>();
+ private final Map<String, String> headers = new
CaseInsensitiveKeyMap<>();
private final Map<String, String> attributes = new HashMap<>();
private final Map<String, String> params = new HashMap<>();
private final Map<String, String> sessionAttributes = new HashMap<>();
@@ -554,6 +555,20 @@ public abstract class TomcatBaseTest ext
(attribute != null ? attribute : "(null)"));
}
}
+
+ int bodySize = 0;
+ if ("PUT".equalsIgnoreCase(request.getMethod())) {
+ InputStream is = request.getInputStream();
+ int read = 0;
+ byte[] buffer = new byte[8192];
+ while (read != -1) {
+ read = is.read(buffer);
+ if (read > -1) {
+ bodySize += read;
+ }
+ }
+ }
+ out.println("REQUEST-BODY-SIZE: " + bodySize);
}
}
Modified: tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java?rev=1664872&r1=1664871&r2=1664872&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/SimpleAjpClient.java Sat
Mar 7 15:25:59 2015
@@ -30,7 +30,7 @@ import javax.net.SocketFactory;
*/
public class SimpleAjpClient {
- private static final int AJP_PACKET_SIZE = 8192;
+ private static final int DEFAULT_AJP_PACKET_SIZE = 8192;
private static final byte[] AJP_CPING;
static {
@@ -43,6 +43,7 @@ public class SimpleAjpClient {
ajpCping.getLen());
}
+ private final int packetSize;
private String host = "localhost";
private int port = -1;
/* GET == 2 */
@@ -56,6 +57,14 @@ public class SimpleAjpClient {
private boolean ssl = false;
private Socket socket = null;
+ public SimpleAjpClient() {
+ this(DEFAULT_AJP_PACKET_SIZE);
+ }
+
+ public SimpleAjpClient(int packetSize) {
+ this.packetSize = packetSize;
+ }
+
public void setPort(int port) {
this.port = port;
}
@@ -284,7 +293,7 @@ public class SimpleAjpClient {
*/
public TesterAjpMessage createForwardMessage() {
- TesterAjpMessage message = new TesterAjpMessage(AJP_PACKET_SIZE);
+ TesterAjpMessage message = new TesterAjpMessage(packetSize);
message.reset();
// Set the header bytes
@@ -323,7 +332,7 @@ public class SimpleAjpClient {
public TesterAjpMessage createBodyMessage(byte[] data) {
- TesterAjpMessage message = new TesterAjpMessage(AJP_PACKET_SIZE);
+ TesterAjpMessage message = new TesterAjpMessage(packetSize);
message.reset();
// Set the header bytes
@@ -376,7 +385,7 @@ public class SimpleAjpClient {
InputStream is = socket.getInputStream();
- TesterAjpMessage message = new TesterAjpMessage(AJP_PACKET_SIZE);
+ TesterAjpMessage message = new TesterAjpMessage(packetSize);
byte[] buf = message.getBuffer();
int headerLength = message.getHeaderLength();
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1664872&r1=1664871&r2=1664872&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
Sat Mar 7 15:25:59 2015
@@ -68,6 +68,8 @@ public class TestAbstractAjpProcessor ex
private void doSnoopTest(RequestDescriptor desc) throws Exception {
+ final int ajpPacketSize = 16000;
+
Map<String, String> requestInfo = desc.getRequestInfo();
Map<String, String> contextInitParameters =
desc.getContextInitParameters();
Map<String, String> contextAttributes = desc.getContextAttributes();
@@ -76,6 +78,7 @@ public class TestAbstractAjpProcessor ex
Map<String, String> params = desc.getParams();
Tomcat tomcat = getTomcatInstance();
+ tomcat.getConnector().setProperty("packetSize",
Integer.toString(ajpPacketSize));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
@@ -83,7 +86,7 @@ public class TestAbstractAjpProcessor ex
Tomcat.addServlet(ctx, "snoop", new SnoopServlet());
ctx.addServletMapping("/", "snoop");
- SimpleAjpClient ajpClient = new SimpleAjpClient();
+ SimpleAjpClient ajpClient = new SimpleAjpClient(ajpPacketSize);
if (requestInfo.get("REQUEST-QUERY-STRING") != null &&
params.size() > 0) {
@@ -93,6 +96,7 @@ public class TestAbstractAjpProcessor ex
}
String value;
+ int bodySize = 0;
Map<String, String> savedRequestInfo = new HashMap<>();
for (String name: requestInfo.keySet()) {
value = requestInfo.get(name);
@@ -140,6 +144,10 @@ public class TestAbstractAjpProcessor ex
case "REQUEST-CONTENT-LENGTH":
headers.put("CONTENT-LENGTH", value);
break;
+ case "REQUEST-BODY-SIZE":
+ savedRequestInfo.put(name, value);
+ bodySize = Integer.parseInt(value);
+ break;
case "REQUEST-CONTENT-TYPE":
headers.put("CONTENT-TYPE", value);
break;
@@ -205,6 +213,8 @@ public class TestAbstractAjpProcessor ex
case "REQUEST-SECRET":
forwardMessage.addAttribute(0x0C, value);
break;
+ case "REQUEST-BODY-SIZE":
+ break;
default:
throw(new IllegalArgumentException("Request setting '" +
name + "' not supported"));
}
@@ -288,8 +298,20 @@ public class TestAbstractAjpProcessor ex
ajpClient.setPort(getPort());
ajpClient.connect();
+ TesterAjpMessage responseHeaders = null;
+ if (bodySize == 0) {
+ responseHeaders = ajpClient.sendMessage(forwardMessage);
+ } else {
+ TesterAjpMessage bodyMessage = ajpClient.createBodyMessage(new
byte[bodySize]);
+ responseHeaders = ajpClient.sendMessage(forwardMessage,
bodyMessage);
+ // Expect back a request for more data (which will be emty and
+ // trigger end of stream in Servlet)
+ validateGetBody(responseHeaders);
+ bodyMessage = ajpClient.createBodyMessage(new byte[0]);
+ responseHeaders = ajpClient.sendMessage(bodyMessage);
+ }
+
// Expect 3 packets: headers, body, end
- TesterAjpMessage responseHeaders =
ajpClient.sendMessage(forwardMessage);
validateResponseHeaders(responseHeaders, 200, "OK");
String body = extractResponseBody(ajpClient.readMessage());
@@ -448,6 +470,26 @@ public class TestAbstractAjpProcessor ex
}
@Test
+ public void testSmallBody() throws Exception {
+ RequestDescriptor desc = new RequestDescriptor();
+ desc.putRequestInfo("REQUEST-METHOD", "PUT");
+ desc.putRequestInfo("REQUEST-CONTENT-LENGTH", "100");
+ desc.putRequestInfo("REQUEST-BODY-SIZE", "100");
+ desc.putRequestInfo("REQUEST-URI", "/testSmallBody");
+ doSnoopTest(desc);
+ }
+
+ @Test
+ public void testLargeBody() throws Exception {
+ RequestDescriptor desc = new RequestDescriptor();
+ desc.putRequestInfo("REQUEST-METHOD", "PUT");
+ desc.putRequestInfo("REQUEST-CONTENT-LENGTH", "10000");
+ desc.putRequestInfo("REQUEST-BODY-SIZE", "10000");
+ desc.putRequestInfo("REQUEST-URI", "/testLargeBody");
+ doSnoopTest(desc);
+ }
+
+ @Test
public void testSecret() throws Exception {
Tomcat tomcat = getTomcatInstance();
tomcat.getConnector().setProperty("requiredSecret", "RIGHTSECRET");
@@ -759,6 +801,14 @@ public class TestAbstractAjpProcessor ex
}
}
+ private void validateGetBody(TesterAjpMessage message) {
+ // First two bytes should always be AB
+ Assert.assertEquals((byte) 'A', message.buf[0]);
+ Assert.assertEquals((byte) 'B', message.buf[1]);
+ // Should be a body chunk message
+ Assert.assertEquals(0x06, message.readByte());
+ }
+
/**
* Extract the content from a response message.
*/
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1664872&r1=1664871&r2=1664872&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sat Mar 7 15:25:59 2015
@@ -134,6 +134,11 @@
<code>AsyncContext</code> is used for non-blocking I/O and is completed
during a write operation. (markt)
</fix>
+ <fix>
+ <bug>57638</bug>: Avoid an IllegalArgumentException when an AJP request
+ body chunk larger than the socket read buffer is being read. This
+ typically requires a larger than default AJP packetSize. (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
