Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

394370 Add integration test for client resetting SPDY push SYN's

This commit is contained in:
Thomas Becker 2012-11-26 15:25:47 +01:00
parent 7115ea5e12
commit 6e70ee4211
1 changed files with 78 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
View File

@ -34,11 +34,13 @@ import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.spdy.api.DataInfo; import org.eclipse.jetty.spdy.api.DataInfo;
import org.eclipse.jetty.spdy.api.ReplyInfo; import org.eclipse.jetty.spdy.api.ReplyInfo;
import org.eclipse.jetty.spdy.api.RstInfo;
import org.eclipse.jetty.spdy.api.SPDY; import org.eclipse.jetty.spdy.api.SPDY;
import org.eclipse.jetty.spdy.api.Session; import org.eclipse.jetty.spdy.api.Session;
import org.eclipse.jetty.spdy.api.SessionFrameListener; import org.eclipse.jetty.spdy.api.SessionFrameListener;
import org.eclipse.jetty.spdy.api.Stream; import org.eclipse.jetty.spdy.api.Stream;
import org.eclipse.jetty.spdy.api.StreamFrameListener; import org.eclipse.jetty.spdy.api.StreamFrameListener;
import org.eclipse.jetty.spdy.api.StreamStatus;
import org.eclipse.jetty.spdy.api.SynInfo; import org.eclipse.jetty.spdy.api.SynInfo;
import org.eclipse.jetty.spdy.server.NPNServerConnectionFactory; import org.eclipse.jetty.spdy.server.NPNServerConnectionFactory;
import org.eclipse.jetty.util.Fields; import org.eclipse.jetty.util.Fields;
@ -51,13 +53,15 @@ import static org.junit.Assert.assertThat;
public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
{ {
private final String mainResource = "/index.html";
private final int referrerPushPeriod = 1000; private final int referrerPushPeriod = 1000;
private final String mainResource = "/index.html";
private final String cssResource = "/style.css"; private final String cssResource = "/style.css";
private InetSocketAddress serverAddress; private InetSocketAddress serverAddress;
private ReferrerPushStrategy pushStrategy; private ReferrerPushStrategy pushStrategy;
private ConnectionFactory defaultFactory; private ConnectionFactory defaultFactory;
private Fields mainRequestHeaders; private Fields mainRequestHeaders;
private Fields associatedCSSRequestHeaders;
private Fields associatedJSRequestHeaders;
public ReferrerPushStrategyTest(short version) public ReferrerPushStrategyTest(short version)
{ {
@ -83,6 +87,8 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
else else
connector.setDefaultProtocol(defaultFactory.getProtocol()); connector.setDefaultProtocol(defaultFactory.getProtocol());
mainRequestHeaders = createHeadersWithoutReferrer(mainResource); mainRequestHeaders = createHeadersWithoutReferrer(mainResource);
associatedCSSRequestHeaders = createHeaders(cssResource);
associatedJSRequestHeaders = createHeaders("/application.js");
} }
@Test @Test
@ -92,6 +98,47 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
run2ndClientRequests(true, true); run2ndClientRequests(true, true);
} }
@Test
public void testClientResetsPushStreams() throws Exception
{
sendMainRequestAndCSSRequest();
final CountDownLatch pushDataLatch = new CountDownLatch(1);
final CountDownLatch pushSynHeadersValid = new CountDownLatch(1);
Session session = startClient(version, serverAddress, new SessionFrameListener.Adapter()
{
@Override
public StreamFrameListener onSyn(Stream stream, SynInfo synInfo)
{
validateHeaders(synInfo.getHeaders(), pushSynHeadersValid);
assertThat("Stream is unidirectional", stream.isUnidirectional(), is(true));
assertThat("URI header ends with css", synInfo.getHeaders().get(HTTPSPDYHeader.URI.name(version))
.value().endsWith
("" +
".css"),
is(true));
stream.getSession().rst(new RstInfo(stream.getId(), StreamStatus.REFUSED_STREAM));
return new StreamFrameListener.Adapter()
{
@Override
public void onData(Stream stream, DataInfo dataInfo)
{
dataInfo.consume(dataInfo.length());
pushDataLatch.countDown();
}
};
}
});
// Send main request. That should initiate the push syn's which get reset by the client
sendRequest(session, mainRequestHeaders);
assertThat("No push data is received", pushDataLatch.await(1, TimeUnit.SECONDS), is(false));
assertThat("Push syn headers valid", pushSynHeadersValid.await(5, TimeUnit.SECONDS), is(true));
sendRequest(session, associatedCSSRequestHeaders);
}
@Test @Test
public void testUserAgentBlackList() throws Exception public void testUserAgentBlackList() throws Exception
{ {
@ -103,11 +150,11 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
@Test @Test
public void testReferrerPushPeriod() throws Exception public void testReferrerPushPeriod() throws Exception
{ {
Session session1 = sendMainRequestAndCSSRequest(); Session session = sendMainRequestAndCSSRequest();
// Sleep for pushPeriod This should prevent application.js from being mapped as pushResource // Sleep for pushPeriod This should prevent application.js from being mapped as pushResource
Thread.sleep(referrerPushPeriod + 1); Thread.sleep(referrerPushPeriod + 1);
sendJSRequest(session1); sendRequest(session, associatedJSRequestHeaders);
run2ndClientRequests(false, true); run2ndClientRequests(false, true);
} }
@ -119,9 +166,9 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
connector.addConnectionFactory(defaultFactory); connector.addConnectionFactory(defaultFactory);
connector.setDefaultProtocol(defaultFactory.getProtocol()); // TODO I don't think this is right connector.setDefaultProtocol(defaultFactory.getProtocol()); // TODO I don't think this is right
Session session1 = sendMainRequestAndCSSRequest(); Session session = sendMainRequestAndCSSRequest();
sendJSRequest(session1); sendRequest(session, associatedJSRequestHeaders);
run2ndClientRequests(false, true); run2ndClientRequests(false, true);
} }
@ -148,62 +195,43 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
private Session sendMainRequestAndCSSRequest() throws Exception private Session sendMainRequestAndCSSRequest() throws Exception
{ {
Session session1 = startClient(version, serverAddress, null); Session session = startClient(version, serverAddress, null);
final CountDownLatch mainResourceLatch = new CountDownLatch(1); sendRequest(session, mainRequestHeaders);
session1.syn(new SynInfo(mainRequestHeaders, true), new StreamFrameListener.Adapter() sendRequest(session, associatedCSSRequestHeaders);
{
@Override
public void onData(Stream stream, DataInfo dataInfo)
{
dataInfo.consume(dataInfo.length());
if (dataInfo.isClose())
mainResourceLatch.countDown();
}
});
Assert.assertTrue(mainResourceLatch.await(5, TimeUnit.SECONDS));
final CountDownLatch associatedResourceLatch1 = new CountDownLatch(1); return session;
Fields associatedRequestHeaders1 = createHeaders(cssResource);
session1.syn(new SynInfo(associatedRequestHeaders1, true), new StreamFrameListener.Adapter()
{
@Override
public void onData(Stream stream, DataInfo dataInfo)
{
dataInfo.consume(dataInfo.length());
if (dataInfo.isClose())
associatedResourceLatch1.countDown();
}
});
Assert.assertTrue(associatedResourceLatch1.await(5, TimeUnit.SECONDS));
return session1;
} }
private void sendRequest(Session session, Fields requestHeaders) throws InterruptedException
private void sendJSRequest(Session session1) throws InterruptedException
{ {
final CountDownLatch associatedResourceLatch2 = new CountDownLatch(1); final CountDownLatch dataReceivedLatch = new CountDownLatch(1);
String jsResource = "/application.js"; final CountDownLatch received200OKLatch = new CountDownLatch(1);
Fields associatedRequestHeaders2 = createHeaders(jsResource); session.syn(new SynInfo(requestHeaders, true), new StreamFrameListener.Adapter()
session1.syn(new SynInfo(associatedRequestHeaders2, true), new StreamFrameListener.Adapter()
{ {
@Override
public void onReply(Stream stream, ReplyInfo replyInfo)
{
if ("200 OK".equals(replyInfo.getHeaders().get(HTTPSPDYHeader.STATUS.name(version)).value()))
received200OKLatch.countDown();
super.onReply(stream, replyInfo);
}
@Override @Override
public void onData(Stream stream, DataInfo dataInfo) public void onData(Stream stream, DataInfo dataInfo)
{ {
dataInfo.consume(dataInfo.length()); dataInfo.consume(dataInfo.length());
if (dataInfo.isClose()) if (dataInfo.isClose())
associatedResourceLatch2.countDown(); dataReceivedLatch.countDown();
} }
}); });
Assert.assertTrue(associatedResourceLatch2.await(5, TimeUnit.SECONDS)); Assert.assertTrue(received200OKLatch.await(5, TimeUnit.SECONDS));
Assert.assertTrue(dataReceivedLatch.await(5, TimeUnit.SECONDS));
} }
private void run2ndClientRequests(final boolean validateHeaders, private void run2ndClientRequests(final boolean validateHeaders,
boolean expectPushResource) throws Exception boolean expectPushResource) throws Exception
{ {
// Create another client, and perform the same request for the main resource,
// we expect the css being pushed, but not the js
final CountDownLatch mainStreamLatch = new CountDownLatch(2); final CountDownLatch mainStreamLatch = new CountDownLatch(2);
final CountDownLatch pushDataLatch = new CountDownLatch(1); final CountDownLatch pushDataLatch = new CountDownLatch(1);
final CountDownLatch pushSynHeadersValid = new CountDownLatch(1); final CountDownLatch pushSynHeadersValid = new CountDownLatch(1);
@ -215,11 +243,11 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
if (validateHeaders) if (validateHeaders)
validateHeaders(synInfo.getHeaders(), pushSynHeadersValid); validateHeaders(synInfo.getHeaders(), pushSynHeadersValid);
assertThat("Stream is unidirectional",stream.isUnidirectional(),is(true)); assertThat("Stream is unidirectional", stream.isUnidirectional(), is(true));
assertThat("URI header ends with css", synInfo.getHeaders().get(HTTPSPDYHeader.URI.name(version)) assertThat("URI header ends with css", synInfo.getHeaders().get(HTTPSPDYHeader.URI.name(version))
.value().endsWith .value().endsWith
("" + ("" +
".css"), ".css"),
is(true)); is(true));
return new StreamFrameListener.Adapter() return new StreamFrameListener.Adapter()
{ {
@ -252,13 +280,13 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
} }
}); });
assertThat("Main request reply and/or data not received", mainStreamLatch.await(5, TimeUnit.SECONDS), is(true)); assertThat("Main request reply and/or data received", mainStreamLatch.await(5, TimeUnit.SECONDS), is(true));
if (expectPushResource) if (expectPushResource)
assertThat("Pushed data not received", pushDataLatch.await(5, TimeUnit.SECONDS), is(true)); assertThat("Pushed data received", pushDataLatch.await(5, TimeUnit.SECONDS), is(true));
else else
assertThat("No push data is received", pushDataLatch.await(1, TimeUnit.SECONDS), is(false)); assertThat("No push data is received", pushDataLatch.await(1, TimeUnit.SECONDS), is(false));
if (validateHeaders) if (validateHeaders)
assertThat("Push syn headers not valid", pushSynHeadersValid.await(5, TimeUnit.SECONDS), is(true)); assertThat("Push syn headers valid", pushSynHeadersValid.await(5, TimeUnit.SECONDS), is(true));
} }
@Test @Test
@ -295,19 +323,7 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
}); });
Assert.assertTrue(mainResourceLatch.await(5, TimeUnit.SECONDS)); Assert.assertTrue(mainResourceLatch.await(5, TimeUnit.SECONDS));
final CountDownLatch associatedResourceLatch = new CountDownLatch(1); sendRequest(session1, createHeaders(cssResource));
Fields associatedRequestHeaders = createHeaders(cssResource);
session1.syn(new SynInfo(associatedRequestHeaders, true), new StreamFrameListener.Adapter()
{
@Override
public void onData(Stream stream, DataInfo dataInfo)
{
dataInfo.consume(dataInfo.length());
if (dataInfo.isClose())
associatedResourceLatch.countDown();
}
});
Assert.assertTrue(associatedResourceLatch.await(5, TimeUnit.SECONDS));
// Create another client, and perform the same request for the main resource, we expect the css being pushed // Create another client, and perform the same request for the main resource, we expect the css being pushed