X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=94d1602c5bf636144ba4c656820517e138366b04;hb=8b624d6a20adab83f419605d9facfcfe677359ad;hp=6b5d614d6ca3027cb635757b25d5fdf9c3014437;hpb=896463c592837b09794fa9368accf105c0bb05be;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 6b5d614..94d1602 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -17,10 +17,15 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import java.util.UUID;
+
+import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.Page;
 import net.pterodactylus.util.json.JsonObject;
 import net.pterodactylus.util.json.JsonUtils;
+import freenet.clients.http.SessionManager.Session;
+import freenet.clients.http.ToadletContext;
 
 /**
  * A JSON page is a specialized {@link Page} that will always return a JSON
@@ -50,6 +55,72 @@ public abstract class JsonPage implements Page {
 	}
 
 	//
+	// ACCESSORS
+	//
+
+	/**
+	 * 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 getCurrentSession(toadletContenxt, true);
+	}
+
+	/**
+	 * 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) {
+		try {
+			Session session = webInterface.getSessionManager().useSession(toadletContenxt);
+			if (create && (session == null)) {
+				session = webInterface.getSessionManager().createSession(UUID.randomUUID().toString(), toadletContenxt);
+			}
+			return session;
+		} catch (freenet.clients.http.RedirectException re1) {
+			return null;
+		}
+	}
+
+	/**
+	 * Returns the currently logged in Sone.
+	 *
+	 * @param toadletContext
+	 *            The toadlet context
+	 * @return The currently logged in Sone, or {@code null} if no Sone is
+	 *         currently logged in
+	 */
+	protected Sone getCurrentSone(ToadletContext toadletContext) {
+		Session session = getCurrentSession(toadletContext);
+		if (session == null) {
+			return null;
+		}
+		String soneId = (String) session.getAttribute("Sone.CurrentSone");
+		if (soneId == null) {
+			return null;
+		}
+		for (Sone sone : webInterface.core().getSones()) {
+			if (sone.getId().equals(soneId)) {
+				return sone;
+			}
+		}
+		return null;
+	}
+
+	//
 	// METHODS FOR SUBCLASSES TO OVERRIDE
 	//
 
@@ -93,8 +164,8 @@ public abstract class JsonPage implements Page {
 	public Response handleRequest(Request request) {
 		if (needsFormPassword()) {
 			String formPassword = request.getHttpRequest().getParam("formPassword");
-			if (!webInterface.formPassword().equals(formPassword)) {
-				return new Response(401, "Not authorized", "application/json", JsonUtils.format(new JsonObject().put("success", false)));
+			if (!webInterface.getFormPassword().equals(formPassword)) {
+				return new Response(401, "Not authorized", "application/json", JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
 			}
 		}
 		JsonObject jsonObject = createJsonObject(request);