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

Fixed ee9 ContextHandler usage of cached HttpChannel

This commit is contained in:
Greg Wilkins 2022-05-09 13:35:06 +02:00
parent 852e5850dc
commit 1fcdc2176f
3 changed files with 100 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java
View File

@ -125,8 +125,6 @@ public class ContextHandlerCollection extends Handler.Collection
public Request.Processor handle(Request request) throws Exception
{
List<Handler> handlers = getHandlers();
System.err.println("HANDLERS = " + handlers);
// Handle no contexts
if (handlers == null || handlers.isEmpty())

7
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java
View File

@ -2502,10 +2502,15 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
httpChannel = new HttpChannel(ContextHandler.this, request.getConnectionMetaData());
request.getComponents().getCache().put(HttpChannel.class.getName(), httpChannel);
}
else
else if (httpChannel.getContextHandler() == ContextHandler.this)
{
httpChannel.recycle();
}
else
{
// Don't use cached channel for secondary context
httpChannel = new HttpChannel(ContextHandler.this, request.getConnectionMetaData());
}
return new CoreContextRequest(this, this.getContext(), request, pathInContext, httpChannel);
}

123
jetty-ee9/jetty-ee9-nested/src/test/java/org/eclipse/jetty/ee9/nested/ContextHandlerTest.java
View File

@ -30,6 +30,7 @@ import org.eclipse.jetty.logging.StacklessLogging;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@ -181,40 +182,42 @@ public class ContextHandlerTest
});
_server.start();
LocalConnector.LocalEndPoint endPoint = _connector.connect();
endPoint.addInput("""
GET /one HTTP/1.1
Host: localhost
GET /two HTTP/1.1
Host: localhost
""");
try (LocalConnector.LocalEndPoint endPoint = _connector.connect())
{
endPoint.addInput("""
GET /one HTTP/1.1
Host: localhost
GET /two HTTP/1.1
Host: localhost
""");
String rawResponse = endPoint.getResponse();
System.err.println(rawResponse);
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat(response.getStatus(), is(200));
assertThat(response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
Properties one = new Properties();
one.load(new StringReader(response.getContent()));
String rawResponse = endPoint.getResponse();
System.err.println(rawResponse);
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat(response.getStatus(), is(200));
assertThat(response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
Properties one = new Properties();
one.load(new StringReader(response.getContent()));
rawResponse = endPoint.getResponse();
System.err.println(rawResponse);
response = HttpTester.parseResponse(rawResponse);
assertThat(response.getStatus(), is(200));
assertThat(response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
Properties two = new Properties();
two.load(new StringReader(response.getContent()));
rawResponse = endPoint.getResponse();
System.err.println(rawResponse);
response = HttpTester.parseResponse(rawResponse);
assertThat(response.getStatus(), is(200));
assertThat(response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
Properties two = new Properties();
two.load(new StringReader(response.getContent()));
assertThat(one.getProperty("baseRequest.hashCode"), notNullValue());
assertThat(one.getProperty("baseRequest.hashCode"), equalTo(two.getProperty("baseRequest.hashCode")));
assertThat(one.getProperty("baseRequest.hashCode"), notNullValue());
assertThat(one.getProperty("baseRequest.hashCode"), equalTo(two.getProperty("baseRequest.hashCode")));
assertThat(one.getProperty("coreRequest.connectionMetaData.id"), notNullValue());
assertThat(one.getProperty("coreRequest.connectionMetaData.id"), equalTo(two.getProperty("coreRequest.connectionMetaData.id")));
assertThat(one.getProperty("coreRequest.connectionMetaData.id"), notNullValue());
assertThat(one.getProperty("coreRequest.connectionMetaData.id"), equalTo(two.getProperty("coreRequest.connectionMetaData.id")));
assertThat(one.getProperty("coreRequest.id"), notNullValue());
assertThat(one.getProperty("coreRequest.id"), not(equalTo(two.getProperty("coreRequest.id"))));
assertThat(one.getProperty("coreRequest.id"), notNullValue());
assertThat(one.getProperty("coreRequest.id"), not(equalTo(two.getProperty("coreRequest.id"))));
}
}
@Test
@ -571,6 +574,68 @@ public class ContextHandlerTest
assertThat(response.getContent(), containsString("ERROR /errorPage"));
}
@Test
public void testTwoContexts() throws Exception
{
_contextHandler.setContextPath("/ctxA");
_contextHandler.setHandler(new AbstractHandler()
{
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException
{
baseRequest.setHandled(true);
response.setStatus(200);
response.setContentType("text/plain");
response.getOutputStream().print("Hello %s\n".formatted(baseRequest.getContext().getContextPath()));
}
});
ContextHandler contextHandler = new ContextHandler();
contextHandler.setContextPath("/ctxB");
contextHandler.setHandler(new AbstractHandler()
{
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException
{
baseRequest.setHandled(true);
response.setStatus(200);
response.setContentType("text/plain");
response.getOutputStream().print("Buongiorno %s\n".formatted(baseRequest.getContext().getContextPath()));
}
});
ContextHandlerCollection contexts = new ContextHandlerCollection();
contexts.addHandler(_contextHandler);
contexts.addHandler(contextHandler);
_server.setHandler(contexts);
_server.start();
try(LocalConnector.LocalEndPoint endp = _connector.connect())
{
endp.addInput("""
GET /ctxA/ HTTP/1.1
Host: localhost
""");
String raw = endp.getResponse();
HttpTester.Response response = HttpTester.parseResponse(raw);
assertThat(response.getStatus(), is(200));
assertThat(response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
assertThat(response.getContent(), containsString("Hello /ctxA"));
endp.addInput("""
GET /ctxB/ HTTP/1.1
Host: localhost
""");
raw = endp.getResponse();
response = HttpTester.parseResponse(raw);
assertThat(response.getStatus(), is(200));
assertThat(response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
assertThat(response.getContent(), containsString("Buongiorno /ctxB"));
}
}
private static class TestErrorHandler extends ErrorHandler implements ErrorHandler.ErrorPageMapper
{
@Override