From d76711afc838778db8baee679ec432540385cb4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Wed, 21 Nov 2012 22:37:59 +0100 Subject: [PATCH] Catch all exceptions when processing AJAX requests. --- .../net/pterodactylus/sone/web/ajax/JsonPage.java | 44 +++++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java index 22eeec8..910abd5 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java @@ -17,13 +17,17 @@ package net.pterodactylus.sone.web.ajax; +import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; import java.net.URI; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetPage; import net.pterodactylus.sone.web.page.FreenetRequest; +import net.pterodactylus.util.io.Closer; import net.pterodactylus.util.json.JsonObject; import net.pterodactylus.util.json.JsonUtils; import net.pterodactylus.util.web.Page; @@ -218,8 +222,12 @@ public abstract class JsonPage implements FreenetPage { return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required"))); } } - JsonObject jsonObject = createJsonObject(request); - return response.setStatusCode(200).setStatusText("OK").setContentType("application/json").write(JsonUtils.format(jsonObject)); + try { + JsonObject jsonObject = createJsonObject(request); + return response.setStatusCode(200).setStatusText("OK").setContentType("application/json").write(JsonUtils.format(jsonObject)); + } catch (Exception e1) { + return response.setStatusCode(500).setStatusText(e1.getMessage()).setContentType("text/plain").write(dumpStackTrace(e1)); + } } /** @@ -230,4 +238,36 @@ public abstract class JsonPage implements FreenetPage { return false; } + // + // PRIVATE METHODS + // + + /** + * Returns a byte array containing the stack trace of the given throwable. + * + * @param t + * The throwable whose stack trace to dump into an array + * @return The array with the stack trace, or an empty array if the stack + * trace could not be dumped + */ + private static byte[] dumpStackTrace(Throwable t) { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + OutputStreamWriter writer = null; + PrintWriter printWriter = null; + try { + writer = new OutputStreamWriter(byteArrayOutputStream, "uTF-8"); + printWriter = new PrintWriter(writer); + t.printStackTrace(printWriter); + byteArrayOutputStream.flush(); + return byteArrayOutputStream.toByteArray(); + } catch (IOException ioe1) { + /* quite not possible. */ + return new byte[0]; + } finally { + Closer.close(printWriter); + Closer.close(writer); + Closer.close(byteArrayOutputStream); + } + } + } -- 2.7.4