X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=e66bb8d8293b354eead3f3180a5306e33429211e;hb=c2233cceb10f4403a7dd63dfc42fe8d1e4bdb07f;hp=6145a36c56f8d5ac54957b0534254f279f60b9dd;hpb=1c77f2137a33efdba31f9892562a67ab487f9918;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index 6145a36..e66bb8d 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -24,7 +24,6 @@ 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;
@@ -47,8 +46,14 @@ public class FcpInterface {
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(FcpInterface.class);
 
+	/** Whether the FCP interface is currently active. */
+	private volatile boolean active;
+
+	/** Whether to allow write access from full access hosts only. */
+	private volatile boolean allowWriteFromFullAccessOnly;
+
 	/** 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.
@@ -57,12 +62,51 @@ 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("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));
+	}
+
+	//
+	// ACCESSORS
+	//
+
+	/**
+	 * Sets whether the FCP interface should handle requests. If {@code active}
+	 * is {@code false}, all requests are answered with an error.
+	 *
+	 * @param active
+	 *            {@code true} to activate the FCP interface, {@code false} to
+	 *            deactivate the FCP interface
+	 */
+	public void setActive(boolean active) {
+		this.active = active;
+	}
+
+	/**
+	 * Sets whether write access is only allowed from full access hosts.
+	 *
+	 * @param allowWriteFromFullAccessOnly
+	 *            {@code true} to allow write access only from full access
+	 *            hosts, {@code false} to always allow write access
+	 */
+	public void setAllowWriteFromFullAccessOnly(boolean allowWriteFromFullAccessOnly) {
+		this.allowWriteFromFullAccessOnly = allowWriteFromFullAccessOnly;
 	}
 
+	//
+	// ACTIONS
+	//
+
 	/**
 	 * Handles a plugin FCP request.
 	 *
@@ -78,7 +122,23 @@ public class FcpInterface {
 	 *            {@link FredPluginFCP#ACCESS_FCP_RESTRICTED}
 	 */
 	public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) {
-		Command command = commands.get(parameters.get("Message"));
+		if (!active) {
+			try {
+				sendReply(pluginReplySender, null, new ErrorResponse(400, "FCP Interface deactivated"));
+			} catch (PluginNotFoundException pnfe1) {
+				logger.log(Level.FINE, "Could not set error to plugin.", pnfe1);
+			}
+			return;
+		}
+		AbstractSoneCommand command = commands.get(parameters.get("Message"));
+		if (allowWriteFromFullAccessOnly && command.requiresWriteAccess() && (accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED)) {
+			try {
+				sendReply(pluginReplySender, null, new ErrorResponse(401, "No Write Access"));
+			} 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")));
@@ -93,7 +153,7 @@ public class FcpInterface {
 				Response response = command.execute(parameters, data, AccessType.values()[accessType]);
 				sendReply(pluginReplySender, identifier, response);
 			} catch (FcpException fe1) {
-				sendReply(pluginReplySender, null, new ErrorResponse("Error executing command: " + fe1.getMessage()));
+				sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + fe1.getMessage()));
 			}
 		} catch (PluginNotFoundException pnfe1) {
 			logger.log(Level.WARNING, "Could not find destination plugin: " + pluginReplySender);