Author: rjung
Date: Tue Dec 16 11:11:17 2014
New Revision: 1645920
URL: http://svn.apache.org/r1645920
Log:
Add tests for AJP connector "requiredSecret"
feature.
Backport of r1645763 from trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 16 11:11:17 2014
@@ -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
+/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
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=1645920&r1=1645919&r2=1645920&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
Tue Dec 16 11:11:17 2014
@@ -447,6 +447,66 @@ public class TestAbstractAjpProcessor ex
}
@Test
+ public void testSecret() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+ tomcat.getConnector().setProperty("requiredSecret", "RIGHTSECRET");
+ tomcat.start();
+
+ // No file system docBase required
+ Context ctx = tomcat.addContext("", null);
+
+ Tomcat.addServlet(ctx, "helloWorld", new HelloWorldServlet());
+ ctx.addServletMapping("/", "helloWorld");
+
+ SimpleAjpClient ajpClient = new SimpleAjpClient();
+
+ ajpClient.setPort(getPort());
+
+ ajpClient.connect();
+ validateCpong(ajpClient.cping());
+
+ TesterAjpMessage forwardMessage = ajpClient.createForwardMessage();
+ forwardMessage.end();
+
+ TesterAjpMessage responseHeaders =
ajpClient.sendMessage(forwardMessage);
+ // Expect 3 packets: headers, body, end
+ validateResponseHeaders(responseHeaders, 403, "Forbidden");
+ //TesterAjpMessage responseBody = ajpClient.readMessage();
+ //validateResponseBody(responseBody, HelloWorldServlet.RESPONSE_TEXT);
+ validateResponseEnd(ajpClient.readMessage(), false);
+
+ ajpClient.connect();
+ validateCpong(ajpClient.cping());
+
+ forwardMessage = ajpClient.createForwardMessage();
+ forwardMessage.addAttribute(0x0C, "WRONGSECRET");
+ forwardMessage.end();
+
+ responseHeaders = ajpClient.sendMessage(forwardMessage);
+ // Expect 3 packets: headers, body, end
+ validateResponseHeaders(responseHeaders, 403, "Forbidden");
+ //responseBody = ajpClient.readMessage();
+ //validateResponseBody(responseBody, HelloWorldServlet.RESPONSE_TEXT);
+ validateResponseEnd(ajpClient.readMessage(), false);
+
+ ajpClient.connect();
+ validateCpong(ajpClient.cping());
+
+ forwardMessage = ajpClient.createForwardMessage();
+ forwardMessage.addAttribute(0x0C, "RIGHTSECRET");
+ forwardMessage.end();
+
+ responseHeaders = ajpClient.sendMessage(forwardMessage);
+ // Expect 3 packets: headers, body, end
+ validateResponseHeaders(responseHeaders, 200, "OK");
+ TesterAjpMessage responseBody = ajpClient.readMessage();
+ validateResponseBody(responseBody, HelloWorldServlet.RESPONSE_TEXT);
+ validateResponseEnd(ajpClient.readMessage(), true);
+
+ ajpClient.disconnect();
+ }
+
+ @Test
public void testKeepAlive() throws Exception {
Tomcat tomcat = getTomcatInstance();
tomcat.getConnector().setProperty("connectionTimeout", "-1");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
