Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

Browse Source
This commit is contained in:
gregw 2020-10-05 12:29:00 +02:00
commit 094a25a405
2 changed files with 63 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
View File

@ -230,9 +230,20 @@ public class ServletContextHandler extends ContextHandler
@Override
public void setHandler(Handler handler)
{
if (handler != null)
LOG.warn("ServletContextHandler.setHandler should not be called directly. Use insertHandler or setSessionHandler etc.");
super.setHandler(handler);
if (handler instanceof SessionHandler)
setSessionHandler((SessionHandler)handler);
else if (handler instanceof SecurityHandler)
setSecurityHandler((SecurityHandler)handler);
else if (handler instanceof ServletHandler)
setServletHandler((ServletHandler)handler);
else if (handler instanceof GzipHandler)
setGzipHandler((GzipHandler)handler);
else
{
if (handler != null)
LOG.warn("ServletContextHandler.setHandler should not be called directly. Use insertHandler or setSessionHandler etc.");
super.setHandler(handler);
}
}
private void doSetHandler(HandlerWrapper wrapper, Handler handler)

56
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletContextHandlerTest.java
View File

@ -1216,7 +1216,7 @@ public class ServletContextHandlerTest
}
@Test
public void testAddServletFromSCL() throws Exception
public void testAddFilterServletFromSCL() throws Exception
{
//A servlet can be added from a ServletContextListener
ServletContextHandler context = new ServletContextHandler();
@ -1224,10 +1224,11 @@ public class ServletContextHandlerTest
context.setContextPath("/");
context.addEventListener(new ServletContextListener()
{
@Override
public void contextInitialized(ServletContextEvent sce)
{
sce.getServletContext().addFilter("filter", new MyFilter())
.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
ServletRegistration rego = sce.getServletContext().addServlet("hello", HelloServlet.class);
rego.addMapping("/hello/*");
}
@ -1246,11 +1247,13 @@ public class ServletContextHandlerTest
request.append("\n");
String response = _connector.getResponse(request.toString());
assertThat("Response", response, containsString("Hello World"));
assertThat(response, containsString("200 OK"));
assertThat(response, containsString("filter: filter"));
assertThat(response, containsString("Hello World"));
}
@Test
public void testAddServletFromSCI() throws Exception
public void testAddFilterServletFromSCI() throws Exception
{
//A servlet can be added from a ServletContainerInitializer
ContextHandlerCollection contexts = new ContextHandlerCollection();
@ -1262,6 +1265,8 @@ public class ServletContextHandlerTest
@Override
public void onStartup(Set<Class<?>> c, ServletContext ctx)
{
ctx.addFilter("filter", new MyFilter())
.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
ServletRegistration rego = ctx.addServlet("hello", HelloServlet.class);
rego.addMapping("/hello/*");
}
@ -1276,7 +1281,9 @@ public class ServletContextHandlerTest
request.append("\n");
String response = _connector.getResponse(request.toString());
assertThat("Response", response, containsString("Hello World"));
assertThat(response, containsString("200 OK"));
assertThat(response, containsString("filter: filter"));
assertThat(response, containsString("Hello World"));
}
@Test
@ -1802,7 +1809,6 @@ public class ServletContextHandlerTest
public static class MyFilter implements Filter
{
@Override
public void init(FilterConfig filterConfig) throws ServletException
{
@ -1812,6 +1818,7 @@ public class ServletContextHandlerTest
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
ServletException
{
((HttpServletResponse)response).addHeader("filter", "filter");
request.getServletContext().setAttribute("filter", "filter");
chain.doFilter(request, response);
}
@ -1999,4 +2006,39 @@ public class ServletContextHandlerTest
}
}
}
}
@Test
public void testProgrammaticFilterServlet() throws Exception
{
ServletContextHandler context = new ServletContextHandler();
ServletHandler handler = new ServletHandler();
_server.setHandler(context);
context.setHandler(handler);
handler.addServletWithMapping(new ServletHolder(new TestServlet()), "/");
_server.start();
String request =
"GET /hello HTTP/1.0\n" +
"Host: localhost\n" +
"\n";
String response = _connector.getResponse(request);
assertThat(response, containsString("200 OK"));
assertThat(response, containsString("Test"));
handler.addFilterWithMapping(new FilterHolder(new MyFilter()), "/*", EnumSet.of(DispatcherType.REQUEST));
handler.addServletWithMapping(new ServletHolder(new HelloServlet()), "/hello/*");
_server.dumpStdErr();
request =
"GET /hello HTTP/1.0\n" +
"Host: localhost\n" +
"\n";
response = _connector.getResponse(request);
assertThat(response, containsString("200 OK"));
assertThat(response, containsString("filter: filter"));
assertThat(response, containsString("Hello World"));
}
}