This is an automated email from the ASF dual-hosted git repository. mmerli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push: new b5b518182b Fix error stack track may expose to external user (#4223) b5b518182b is described below commit b5b518182b7cea448273dbfad1e307460d782423 Author: Hang Chen <chenh...@apache.org> AuthorDate: Tue Mar 5 00:13:05 2024 +0800 Fix error stack track may expose to external user (#4223) * fix error stack track may expose to external user * update code * fix check style --- .../apache/bookkeeper/http/servlet/BookieHttpServiceServlet.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/bookkeeper-http/servlet-http-server/src/main/java/org/apache/bookkeeper/http/servlet/BookieHttpServiceServlet.java b/bookkeeper-http/servlet-http-server/src/main/java/org/apache/bookkeeper/http/servlet/BookieHttpServiceServlet.java index 10f7b11914..30fe063786 100644 --- a/bookkeeper-http/servlet-http-server/src/main/java/org/apache/bookkeeper/http/servlet/BookieHttpServiceServlet.java +++ b/bookkeeper-http/servlet-http-server/src/main/java/org/apache/bookkeeper/http/servlet/BookieHttpServiceServlet.java @@ -35,7 +35,6 @@ import org.apache.bookkeeper.http.HttpRouter; import org.apache.bookkeeper.http.HttpServer; import org.apache.bookkeeper.http.HttpServer.ApiType; import org.apache.bookkeeper.http.HttpServiceProvider; -import org.apache.bookkeeper.http.service.ErrorHttpService; import org.apache.bookkeeper.http.service.HttpEndpointService; import org.apache.bookkeeper.http.service.HttpServiceRequest; import org.apache.bookkeeper.http.service.HttpServiceResponse; @@ -91,16 +90,12 @@ public class BookieHttpServiceServlet extends HttpServlet { return; } response = httpEndpointService.handle(request); - } catch (Throwable e) { - LOG.error("Error while service Bookie API request " + uri, e); - response = new ErrorHttpService().handle(request); - } - if (response != null) { httpResponse.setStatus(response.getStatusCode()); try (Writer out = httpResponse.getWriter()) { out.write(response.getBody()); } - } else { + } catch (Throwable e) { + LOG.error("Error while service Bookie API request {}", uri, e); httpResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } }