X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=22eeec8ec855eda36cca525a5aef137efbd25594;hp=8d48bcee09dbcc9658e745f7d451098fa3320019;hb=8fb7349579c0c82d7143601c2007cad6f4cfb000;hpb=2b30e0060ba28dda9be8f85f2198d8daee9e153a

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 8d48bce..22eeec8 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–2012 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,11 +17,17 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import java.io.IOException;
+import java.net.URI;
+
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.sone.web.page.Page;
+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.web.Page;
+import net.pterodactylus.util.web.Response;
 import freenet.clients.http.SessionManager.Session;
 import freenet.clients.http.ToadletContext;
 
@@ -31,7 +37,7 @@ import freenet.clients.http.ToadletContext;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public abstract class JsonPage implements Page {
+public abstract class JsonPage implements FreenetPage {
 
 	/** The path of the page. */
 	private final String path;
@@ -124,7 +130,7 @@ public abstract class JsonPage implements Page {
 	 *            The request to handle
 	 * @return The created JSON object
 	 */
-	protected abstract JsonObject createJsonObject(Request request);
+	protected abstract JsonObject createJsonObject(FreenetRequest request);
 
 	/**
 	 * Returns whether this command needs the form password for authentication
@@ -133,6 +139,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;
 	}
@@ -143,6 +150,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;
 	}
@@ -156,7 +164,7 @@ public abstract class JsonPage implements Page {
 	 *
 	 * @return A reply signaling success
 	 */
-	protected JsonObject createSuccessJsonObject() {
+	protected static JsonObject createSuccessJsonObject() {
 		return new JsonObject().put("success", true);
 	}
 
@@ -167,7 +175,7 @@ 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) {
+	protected static JsonObject createErrorJsonObject(String error) {
 		return new JsonObject().put("success", false).put("error", error);
 	}
 
@@ -187,20 +195,39 @@ public abstract class JsonPage implements Page {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Response handleRequest(Request request) {
+	public boolean isPrefixPage() {
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@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")));
+		}
 		if (needsFormPassword()) {
 			String formPassword = request.getHttpRequest().getParam("formPassword");
 			if (!webInterface.getFormPassword().equals(formPassword)) {
-				return new Response(401, "Not authorized", "application/json", JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
+				return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
 			}
 		}
 		if (requiresLogin()) {
 			if (getCurrentSone(request.getToadletContext(), false) == null) {
-				return new Response(401, "Not authorized", "application/json", JsonUtils.format(createErrorJsonObject("auth-required")));
+				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 new Response(200, "OK", "application/json", JsonUtils.format(jsonObject));
+		return response.setStatusCode(200).setStatusText("OK").setContentType("application/json").write(JsonUtils.format(jsonObject));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isLinkExcepted(URI link) {
+		return false;
 	}
 
 }