X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=70ecb2bcc9ca886a37b370688264ad1eff49e3fc;hb=972ca0e1490124c9da45a12ee9a079d91d62d6dc;hp=1e5e8ed8e1fd26125508c69e006eff7684a40c95;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2;p=Sone.git
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 1e5e8ed..70ecb2b 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -1,5 +1,5 @@
/*
- * Sone - JsonPage.java - Copyright © 2010 David Roden
+ * Sone - JsonPage.java - Copyright © 2010â2016 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,15 +17,27 @@
package net.pterodactylus.sone.web.ajax;
+import static java.util.logging.Logger.getLogger;
+
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.annotation.Nonnull;
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.json.JsonObject;
-import net.pterodactylus.util.json.JsonUtils;
+import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.web.Page;
import net.pterodactylus.util.web.Response;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
import freenet.clients.http.SessionManager.Session;
import freenet.clients.http.ToadletContext;
@@ -35,7 +47,13 @@ import freenet.clients.http.ToadletContext;
*
* @author David âBombeâ Roden
*/
-public abstract class JsonPage implements Page {
+public abstract class JsonPage implements FreenetPage {
+
+ /** The logger. */
+ private static final Logger logger = getLogger(JsonPage.class.getName());
+
+ /** The JSON serializer. */
+ private static final ObjectMapper objectMapper = new ObjectMapper();
/** The path of the page. */
private final String path;
@@ -61,35 +79,6 @@ public abstract class JsonPage implements Page {
//
/**
- * Returns the current session, creating a new session if there is no
- * current session.
- *
- * @param toadletContenxt
- * The toadlet context
- * @return The current session, or {@code null} if there is no current
- * session
- */
- protected Session getCurrentSession(ToadletContext toadletContenxt) {
- return webInterface.getCurrentSession(toadletContenxt);
- }
-
- /**
- * Returns the current session, creating a new session if there is no
- * current session and {@code create} is {@code true}.
- *
- * @param toadletContenxt
- * The toadlet context
- * @param create
- * {@code true} to create a new session if there is no current
- * session, {@code false} otherwise
- * @return The current session, or {@code null} if there is no current
- * session
- */
- protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
- return webInterface.getCurrentSession(toadletContenxt, create);
- }
-
- /**
* Returns the currently logged in Sone.
*
* @param toadletContext
@@ -98,22 +87,11 @@ public abstract class JsonPage implements Page {
* currently logged in
*/
protected Sone getCurrentSone(ToadletContext toadletContext) {
- return webInterface.getCurrentSone(toadletContext);
+ return webInterface.getCurrentSoneCreatingSession(toadletContext);
}
- /**
- * Returns the currently logged in Sone.
- *
- * @param toadletContext
- * The toadlet context
- * @param create
- * {@code true} to create a new session if no session exists,
- * {@code false} to not create a new session
- * @return The currently logged in Sone, or {@code null} if no Sone is
- * currently logged in
- */
- protected Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
- return webInterface.getCurrentSone(toadletContext, create);
+ protected Sone getCurrentSoneWithoutCreatingSession(ToadletContext toadletContext) {
+ return webInterface.getCurrentSoneWithoutCreatingSession(toadletContext);
}
//
@@ -128,7 +106,7 @@ public abstract class JsonPage implements Page {
* The request to handle
* @return The created JSON object
*/
- protected abstract JsonObject createJsonObject(FreenetRequest request);
+ protected abstract JsonReturnObject createJsonObject(FreenetRequest request);
/**
* Returns whether this command needs the form password for authentication
@@ -137,6 +115,7 @@ public abstract class JsonPage implements Page {
* @return {@code true} if the form password (given as âformPasswordâ) is
* required, {@code false} otherwise
*/
+ @SuppressWarnings("static-method")
protected boolean needsFormPassword() {
return true;
}
@@ -147,6 +126,7 @@ public abstract class JsonPage implements Page {
* @return {@code true} if the user needs to be logged in to use this page,
* {@code false} otherwise
*/
+ @SuppressWarnings("static-method")
protected boolean requiresLogin() {
return true;
}
@@ -160,8 +140,9 @@ public abstract class JsonPage implements Page {
*
* @return A reply signaling success
*/
- protected JsonObject createSuccessJsonObject() {
- return new JsonObject().put("success", true);
+ @Nonnull
+ protected static JsonReturnObject createSuccessJsonObject() {
+ return new JsonReturnObject(true);
}
/**
@@ -171,8 +152,9 @@ public abstract class JsonPage implements Page {
* The error that has occured
* @return The JSON object, signalling failure and the error code
*/
- protected JsonObject createErrorJsonObject(String error) {
- return new JsonObject().put("success", false).put("error", error);
+ @Nonnull
+ protected static JsonReturnObject createErrorJsonObject(String error) {
+ return new JsonErrorReturnObject(error);
}
//
@@ -201,21 +183,66 @@ public abstract class JsonPage implements Page {
@Override
public Response handleRequest(FreenetRequest request, Response response) throws IOException {
if (webInterface.getCore().getPreferences().isRequireFullAccess() && !request.getToadletContext().isAllowedFullAccess()) {
- return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
+ return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(objectMapper.writeValueAsString(new JsonErrorReturnObject("auth-required")));
}
if (needsFormPassword()) {
String formPassword = request.getHttpRequest().getParam("formPassword");
if (!webInterface.getFormPassword().equals(formPassword)) {
- return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
+ return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(objectMapper.writeValueAsString(new JsonErrorReturnObject("auth-required")));
}
}
if (requiresLogin()) {
- if (getCurrentSone(request.getToadletContext(), false) == null) {
- return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
+ if (getCurrentSoneWithoutCreatingSession(request.getToadletContext()) == null) {
+ return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(objectMapper.writeValueAsString(new JsonErrorReturnObject("auth-required")));
}
}
- JsonObject jsonObject = createJsonObject(request);
- return response.setStatusCode(200).setStatusText("OK").setContentType("application/json").write(JsonUtils.format(jsonObject));
+ try {
+ JsonReturnObject jsonObject = createJsonObject(request);
+ return response.setStatusCode(200).setStatusText("OK").setContentType("application/json").write(objectMapper.writeValueAsString(jsonObject));
+ } catch (Exception e1) {
+ logger.log(Level.WARNING, "Error executing JSON page!", e1);
+ return response.setStatusCode(500).setStatusText(e1.getMessage()).setContentType("text/plain").write(dumpStackTrace(e1));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isLinkExcepted(URI link) {
+ 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);
+ }
}
}