X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=128d46a33eb1a6fdc05dfe75946ac3113d7357b1;hp=7b3663f9ee94e49bdabe4e1a72e4d21a69841ce8;hb=a47643aed43d118ca68044f95451bb5374cdb332;hpb=c35b60c40e2278302049a801edaa0065883fac98

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index 7b3663f..128d46a 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -1,5 +1,5 @@
 /*
- * Sone - FcpInterface.java - Copyright © 2011 David Roden
+ * Sone - FcpInterface.java - Copyright © 2011–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
@@ -24,12 +24,12 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core;
-import net.pterodactylus.sone.freenet.fcp.Command;
 import net.pterodactylus.sone.freenet.fcp.Command.AccessType;
 import net.pterodactylus.sone.freenet.fcp.Command.ErrorResponse;
 import net.pterodactylus.sone.freenet.fcp.Command.Response;
 import net.pterodactylus.sone.freenet.fcp.FcpException;
 import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.validation.Validation;
 import freenet.pluginmanager.FredPluginFCP;
 import freenet.pluginmanager.PluginNotFoundException;
 import freenet.pluginmanager.PluginReplySender;
@@ -44,14 +44,35 @@ import freenet.support.api.Bucket;
  */
 public class FcpInterface {
 
+	/**
+	 * The action level that full access for the FCP connection is required.
+	 *
+	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+	 */
+	public enum FullAccessRequired {
+
+		/** No action requires full access. */
+		NO,
+
+		/** All writing actions require full access. */
+		WRITING,
+
+		/** All actions require full access. */
+		ALWAYS,
+
+	}
+
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(FcpInterface.class);
 
 	/** Whether the FCP interface is currently active. */
 	private volatile boolean active;
 
+	/** What function full access is required for. */
+	private volatile FullAccessRequired fullAccessRequired = FullAccessRequired.ALWAYS;
+
 	/** All available FCP commands. */
-	private final Map<String, Command> commands = Collections.synchronizedMap(new HashMap<String, Command>());
+	private final Map<String, AbstractSoneCommand> commands = Collections.synchronizedMap(new HashMap<String, AbstractSoneCommand>());
 
 	/**
 	 * Creates a new FCP interface.
@@ -60,13 +81,19 @@ public class FcpInterface {
 	 *            The core
 	 */
 	public FcpInterface(Core core) {
-		commands.put("Version", new VersionCommand());
+		commands.put("Version", new VersionCommand(core));
 		commands.put("GetLocalSones", new GetLocalSonesCommand(core));
+		commands.put("GetSones", new GetSonesCommand(core));
+		commands.put("GetSone", new GetSoneCommand(core));
 		commands.put("GetPost", new GetPostCommand(core));
 		commands.put("GetPosts", new GetPostsCommand(core));
 		commands.put("GetPostFeed", new GetPostFeedCommand(core));
 		commands.put("LikePost", new LikePostCommand(core));
 		commands.put("LikeReply", new LikeReplyCommand(core));
+		commands.put("CreatePost", new CreatePostCommand(core));
+		commands.put("CreateReply", new CreateReplyCommand(core));
+		commands.put("DeletePost", new DeletePostCommand(core));
+		commands.put("DeleteReply", new DeleteReplyCommand(core));
 	}
 
 	//
@@ -85,6 +112,17 @@ public class FcpInterface {
 		this.active = active;
 	}
 
+	/**
+	 * Sets the action level for which full FCP access is required.
+	 *
+	 * @param fullAccessRequired
+	 *            The action level for which full FCP access is required
+	 */
+	public void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
+		Validation.begin().isNotNull("FullAccessRequired", fullAccessRequired).check();
+		this.fullAccessRequired = fullAccessRequired;
+	}
+
 	//
 	// ACTIONS
 	//
@@ -112,7 +150,15 @@ public class FcpInterface {
 			}
 			return;
 		}
-		Command command = commands.get(parameters.get("Message"));
+		AbstractSoneCommand command = commands.get(parameters.get("Message"));
+		if ((accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED) && (((fullAccessRequired == FullAccessRequired.WRITING) && command.requiresWriteAccess()) || (fullAccessRequired == FullAccessRequired.ALWAYS))) {
+			try {
+				sendReply(pluginReplySender, null, new ErrorResponse(401, "Not authorized"));
+			} catch (PluginNotFoundException pnfe1) {
+				logger.log(Level.FINE, "Could not set error to plugin.", pnfe1);
+			}
+			return;
+		}
 		try {
 			if (command == null) {
 				sendReply(pluginReplySender, null, new ErrorResponse("Unrecognized Message: " + parameters.get("Message")));
@@ -127,6 +173,7 @@ public class FcpInterface {
 				Response response = command.execute(parameters, data, AccessType.values()[accessType]);
 				sendReply(pluginReplySender, identifier, response);
 			} catch (FcpException fe1) {
+				logger.log(Level.WARNING, "Could not process FCP command “%s”.", command);
 				sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + fe1.getMessage()));
 			}
 		} catch (PluginNotFoundException pnfe1) {