diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java index d8a464efc5b..d1e90a23f39 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java @@ -334,8 +334,10 @@ public class Response implements HttpServletResponse setStatus(code); _reason=message; + Request request = _channel.getRequest(); + Throwable cause = (Throwable)request.getAttribute(Dispatcher.ERROR_EXCEPTION); if (message==null) - message=HttpStatus.getMessage(code); + message=cause==null?HttpStatus.getMessage(code):cause.toString(); // If we are allowed to have a body if (code!=SC_NO_CONTENT && @@ -343,7 +345,6 @@ public class Response implements HttpServletResponse code!=SC_PARTIAL_CONTENT && code>=SC_OK) { - Request request = _channel.getRequest(); ErrorHandler error_handler = null; ContextHandler.Context context = request.getContext(); @@ -383,7 +384,6 @@ public class Response implements HttpServletResponse writer.write(Integer.toString(code)); writer.write(' '); if (message==null) - message=HttpStatus.getMessage(code); writer.write(message); writer.write("\n\n\n

HTTP ERROR: "); writer.write(Integer.toString(code)); diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index c837248177e..a413cab28b1 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -518,12 +518,12 @@ public class ServletHandler extends ScopedHandler { UnavailableException ue = (UnavailableException)th; if (ue.isPermanent()) - response.sendError(HttpServletResponse.SC_NOT_FOUND,th.getMessage()); + response.sendError(HttpServletResponse.SC_NOT_FOUND); else - response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,th.getMessage()); + response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); } else - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,th.getMessage()); + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } else LOG.debug("Response already committed for handling "+th); @@ -542,7 +542,7 @@ public class ServletHandler extends ScopedHandler { request.setAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE,e.getClass()); request.setAttribute(RequestDispatcher.ERROR_EXCEPTION,e); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,e.getMessage()); + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } else LOG.debug("Response already committed for handling ",e); diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java new file mode 100644 index 00000000000..f0759a7b336 --- /dev/null +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java @@ -0,0 +1,163 @@ +// +// ======================================================================== +// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.servlet; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; + +import java.io.IOException; + +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.server.Dispatcher; +import org.eclipse.jetty.server.LocalConnector; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.StdErrLog; +import org.hamcrest.Matchers; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * + */ +public class ErrorPageTest +{ + private Server _server; + private LocalConnector _connector; + + @Before + public void init() throws Exception + { + _server = new Server(); + _connector = new LocalConnector(_server); + ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SECURITY|ServletContextHandler.NO_SESSIONS); + + _server.addConnector(_connector); + _server.setHandler(context); + + context.setContextPath("/"); + + context.addServlet(DefaultServlet.class, "/"); + context.addServlet(FailServlet.class, "/fail/*"); + context.addServlet(ErrorServlet.class, "/error/*"); + + ErrorPageErrorHandler error = new ErrorPageErrorHandler(); + context.setErrorHandler(error); + error.addErrorPage(599,"/error/599"); + error.addErrorPage(IllegalStateException.class.getCanonicalName(),"/error/TestException"); + error.addErrorPage(ErrorPageErrorHandler.GLOBAL_ERROR_PAGE,"/error/GlobalErrorPage"); + + _server.start(); + ((StdErrLog)Log.getLogger(ServletHandler.class)).setHideStacks(true); + } + + @After + public void destroy() throws Exception + { + ((StdErrLog)Log.getLogger(ServletHandler.class)).setHideStacks(false); + _server.stop(); + _server.join(); + } + + @Test + public void testErrorCode() throws Exception + { + String response = _connector.getResponses("GET /fail/code?code=599 HTTP/1.0\r\n\r\n"); + assertThat(response,Matchers.containsString("HTTP/1.1 599 599")); + assertThat(response,Matchers.containsString("ERROR_PAGE: /599")); + assertThat(response,Matchers.containsString("ERROR_CODE: 599")); + assertThat(response,Matchers.containsString("ERROR_EXCEPTION: null")); + assertThat(response,Matchers.containsString("ERROR_EXCEPTION_TYPE: null")); + assertThat(response,Matchers.containsString("ERROR_SERVLET: org.eclipse.jetty.servlet.ErrorPageTest$FailServlet-1")); + assertThat(response,Matchers.containsString("ERROR_REQUEST_URI: /fail/code")); + } + + @Test + public void testErrorException() throws Exception + { + String response = _connector.getResponses("GET /fail/exception HTTP/1.0\r\n\r\n"); + assertThat(response,Matchers.containsString("HTTP/1.1 500 Server Error")); + assertThat(response,Matchers.containsString("ERROR_PAGE: /TestException")); + assertThat(response,Matchers.containsString("ERROR_CODE: 500")); + assertThat(response,Matchers.containsString("ERROR_EXCEPTION: java.lang.IllegalStateException")); + assertThat(response,Matchers.containsString("ERROR_EXCEPTION_TYPE: class java.lang.IllegalStateException")); + assertThat(response,Matchers.containsString("ERROR_SERVLET: org.eclipse.jetty.servlet.ErrorPageTest$FailServlet-1")); + assertThat(response,Matchers.containsString("ERROR_REQUEST_URI: /fail/exception")); + } + + @Test + public void testGlobalErrorCode() throws Exception + { + String response = _connector.getResponses("GET /fail/global?code=598 HTTP/1.0\r\n\r\n"); + assertThat(response,Matchers.containsString("HTTP/1.1 598 598")); + assertThat(response,Matchers.containsString("ERROR_PAGE: /GlobalErrorPage")); + assertThat(response,Matchers.containsString("ERROR_CODE: 598")); + assertThat(response,Matchers.containsString("ERROR_EXCEPTION: null")); + assertThat(response,Matchers.containsString("ERROR_EXCEPTION_TYPE: null")); + assertThat(response,Matchers.containsString("ERROR_SERVLET: org.eclipse.jetty.servlet.ErrorPageTest$FailServlet-1")); + assertThat(response,Matchers.containsString("ERROR_REQUEST_URI: /fail/global")); + } + + @Test + public void testGlobalErrorException() throws Exception + { + String response = _connector.getResponses("GET /fail/global?code=NAN HTTP/1.0\r\n\r\n"); + assertThat(response,Matchers.containsString("HTTP/1.1 500 Server Error")); + assertThat(response,Matchers.containsString("ERROR_PAGE: /GlobalErrorPage")); + assertThat(response,Matchers.containsString("ERROR_CODE: 500")); + assertThat(response,Matchers.containsString("ERROR_EXCEPTION: java.lang.NumberFormatException: For input string: \"NAN\"")); + assertThat(response,Matchers.containsString("ERROR_EXCEPTION_TYPE: class java.lang.NumberFormatException")); + assertThat(response,Matchers.containsString("ERROR_SERVLET: org.eclipse.jetty.servlet.ErrorPageTest$FailServlet-1")); + assertThat(response,Matchers.containsString("ERROR_REQUEST_URI: /fail/global")); + } + + public static class FailServlet extends HttpServlet implements Servlet + { + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException + { + String code=request.getParameter("code"); + if (code!=null) + response.sendError(Integer.parseInt(code)); + else + throw new ServletException(new IllegalStateException()); + } + } + + public static class ErrorServlet extends HttpServlet implements Servlet + { + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException + { + response.getWriter().println("ERROR_PAGE: "+request.getPathInfo()); + response.getWriter().println("ERROR_MESSAGE: "+request.getAttribute(Dispatcher.ERROR_MESSAGE)); + response.getWriter().println("ERROR_CODE: "+request.getAttribute(Dispatcher.ERROR_STATUS_CODE)); + response.getWriter().println("ERROR_EXCEPTION: "+request.getAttribute(Dispatcher.ERROR_EXCEPTION)); + response.getWriter().println("ERROR_EXCEPTION_TYPE: "+request.getAttribute(Dispatcher.ERROR_EXCEPTION_TYPE)); + response.getWriter().println("ERROR_SERVLET: "+request.getAttribute(Dispatcher.ERROR_SERVLET_NAME)); + response.getWriter().println("ERROR_REQUEST_URI: "+request.getAttribute(Dispatcher.ERROR_REQUEST_URI)); + } + } + +} diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java index abce4e4ea26..7a18afdc756 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java @@ -568,8 +568,6 @@ public class MultipartFilterTest response = HttpTester.parseResponse(tester.getResponses(request.generate())); assertEquals(HttpServletResponse.SC_OK,response.getStatus()); } - - @Test public void testNoBody() @@ -588,7 +586,7 @@ public class MultipartFilterTest response = HttpTester.parseResponse(tester.getResponses(request.generate())); assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, response.getStatus()); - assertTrue(response.getReason().startsWith("Missing content")); + assertTrue(response.getContent().indexOf("Missing content")>=0); } @Test @@ -610,7 +608,7 @@ public class MultipartFilterTest response = HttpTester.parseResponse(tester.getResponses(request.generate())); assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, response.getStatus()); - assertTrue(response.getReason().startsWith("Missing initial")); + assertTrue(response.getContent().indexOf("Missing initial")>=0); } @@ -633,7 +631,7 @@ public class MultipartFilterTest response = HttpTester.parseResponse(tester.getResponses(request.generate())); assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, response.getStatus()); - assertTrue(response.getReason().startsWith("Missing initial")); + assertTrue(response.getContent().indexOf("Missing initial")>=0); } @Test