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

433431 Support ServletHandler fall through

This commit is contained in:
Greg Wilkins 2014-04-25 12:21:55 +02:00
parent b764a1d136
commit 8855b79be5
2 changed files with 77 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
View File

@ -89,6 +89,10 @@ import org.eclipse.jetty.util.log.Logger;
* Unless run as part of a {@link ServletContextHandler} or derivative, the {@link #initialize()}
* method must be called manually after start().
*/
/* ------------------------------------------------------------ */
/**
*/
@ManagedObject("Servlet Handler")
public class ServletHandler extends ScopedHandler
{
@ -107,6 +111,7 @@ public class ServletHandler extends ScopedHandler
private boolean _filterChainsCached=true;
private int _maxFilterChainsCacheSize=512;
private boolean _startWithUnavailable=false;
private boolean _ensureDefaultServlet=true;
private IdentityService _identityService;
private ServletHolder[] _servlets=new ServletHolder[0];
@ -153,7 +158,7 @@ public class ServletHandler extends ScopedHandler
updateNameMappings();
updateMappings();
if (getServletMapping("/")==null)
if (getServletMapping("/")==null && _ensureDefaultServlet)
{
LOG.debug("Adding Default404Servlet to {}",this);
addServletWithMapping(Default404Servlet.class,"/");
@ -183,6 +188,26 @@ public class ServletHandler extends ScopedHandler
}
/* ------------------------------------------------------------ */
/**
* @return true if ServletHandler always has a default servlet, using {@link Default404Servlet} if no other
* default servlet is configured.
*/
public boolean isEnsureDefaultServlet()
{
return _ensureDefaultServlet;
}
/* ------------------------------------------------------------ */
/**
* @param ensureDefaultServlet true if ServletHandler always has a default servlet, using {@link Default404Servlet} if no other
* default servlet is configured.
*/
public void setEnsureDefaultServlet(boolean ensureDefaultServlet)
{
_ensureDefaultServlet=ensureDefaultServlet;
}
/* ----------------------------------------------------------------- */
@Override
protected void start(LifeCycle l) throws Exception
@ -379,8 +404,6 @@ public class ServletHandler extends ScopedHandler
{
return _servletMappings;
}
/* ------------------------------------------------------------ */
/**
@ -397,9 +420,6 @@ public class ServletHandler extends ScopedHandler
return _servletPathMappings.get(pathSpec);
}
/* ------------------------------------------------------------ */
/** Get Servlets.
* @return Array of defined servlets
@ -528,12 +548,7 @@ public class ServletHandler extends ScopedHandler
try
{
if (servlet_holder==null)
{
if (getHandler()==null)
notFound(request, response);
else
nextHandle(target,baseRequest,request,response);
}
notFound(baseRequest,request, response);
else
{
// unwrap any tunnelling of base Servlet request/responses
@ -1511,11 +1526,11 @@ public class ServletHandler extends ScopedHandler
}
/* ------------------------------------------------------------ */
protected void notFound(HttpServletRequest request, HttpServletResponse response) throws IOException
protected void notFound(Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
if(LOG.isDebugEnabled())
LOG.debug("Not Found "+request.getRequestURI());
//Override to send an error back, eg with: response.sendError(HttpServletResponse.SC_NOT_FOUND);
LOG.debug("Not Found {}",request.getRequestURI());
if (getHandler()!=null)
nextHandle(URIUtil.addPaths(request.getServletPath(),request.getPathInfo()),baseRequest,request,response);
}
/* ------------------------------------------------------------ */
@ -1615,8 +1630,7 @@ public class ServletHandler extends ScopedHandler
// pass to next filter
if (_filterHolder!=null)
{
if (LOG.isDebugEnabled())
LOG.debug("call filter " + _filterHolder);
LOG.debug("call filter {}", _filterHolder);
Filter filter= _filterHolder.getFilter();
if (_filterHolder.isAsyncSupported())
filter.doFilter(request, response, _next);
@ -1642,20 +1656,15 @@ public class ServletHandler extends ScopedHandler
}
// Call servlet
HttpServletRequest srequest = (HttpServletRequest)request;
if (_servletHolder != null)
if (_servletHolder == null)
notFound(baseRequest, srequest, (HttpServletResponse)response);
else
{
if (LOG.isDebugEnabled())
LOG.debug("call servlet " + _servletHolder);
_servletHolder.handle(baseRequest,request, response);
}
else if (getHandler()==null)
notFound(srequest, (HttpServletResponse)response);
else
nextHandle(URIUtil.addPaths(srequest.getServletPath(),srequest.getPathInfo()),
baseRequest,srequest,(HttpServletResponse)response);
}
@Override
@ -1724,20 +1733,13 @@ public class ServletHandler extends ScopedHandler
// Call servlet
HttpServletRequest srequest = (HttpServletRequest)request;
if (_servletHolder != null)
{
if (LOG.isDebugEnabled())
LOG.debug("call servlet " + _servletHolder);
_servletHolder.handle(_baseRequest,request, response);
}
else if (getHandler()==null)
notFound(srequest, (HttpServletResponse)response);
if (_servletHolder == null)
notFound((request instanceof Request)?((Request)request):HttpChannel.getCurrentHttpChannel().getRequest(), srequest, (HttpServletResponse)response);
else
{
Request baseRequest=(request instanceof Request)?((Request)request):HttpChannel.getCurrentHttpChannel().getRequest();
nextHandle(URIUtil.addPaths(srequest.getServletPath(),srequest.getPathInfo()),
baseRequest,srequest,(HttpServletResponse)response);
}
LOG.debug("call servlet {}", _servletHolder);
_servletHolder.handle(_baseRequest,request, response);
}
}
/* ------------------------------------------------------------ */
@ -1795,6 +1797,7 @@ public class ServletHandler extends ScopedHandler
/* ------------------------------------------------------------ */
public static class Default404Servlet extends HttpServlet
{
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException
{

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

@ -40,13 +40,18 @@ import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.SecurityHandler;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.AbstractHandlerContainer;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.util.component.LifeCycle.Listener;
import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Assert;
@ -276,7 +281,37 @@ public class ServletContextHandlerTest
assertTrue(contextDestroy.get());
}
@Test
public void testFallThrough() throws Exception
{
HandlerList list = new HandlerList();
_server.setHandler(list);
ServletContextHandler root = new ServletContextHandler(list,"/",ServletContextHandler.SESSIONS);
ServletHandler servlet = root.getServletHandler();
servlet.setEnsureDefaultServlet(false);
servlet.addServletWithMapping(HelloServlet.class, "/hello/*");
list.addHandler(new AbstractHandler()
{
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
response.sendError(404, "Fell Through");
}
});
_server.start();
String response= _connector.getResponses("GET /hello HTTP/1.0\r\n\r\n");
Assert.assertThat(response, Matchers.containsString("200 OK"));
response= _connector.getResponses("GET /other HTTP/1.0\r\n\r\n");
Assert.assertThat(response, Matchers.containsString("404 Fell Through"));
}
private int assertResponseContains(String expected, String response)
{