From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 11 Apr 2011 09:23:19 +0000 (+0200)
Subject: Deny commands that change data when FCP connection is restricted.
X-Git-Tag: 0.6.5^2~39^2~4
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=d2a84d3d722e9c3df68cd5b7f86d8bf9372d7e2b;p=Sone.git

Deny commands that change data when FCP connection is restricted.
---

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index 01fae78..46ee5c2 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;
@@ -50,8 +49,11 @@ public class FcpInterface {
 	/** 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.
@@ -60,7 +62,7 @@ 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("GetPost", new GetPostCommand(core));
 		commands.put("GetPosts", new GetPostsCommand(core));
@@ -89,6 +91,17 @@ public class FcpInterface {
 		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
 	//
@@ -116,7 +129,15 @@ public class FcpInterface {
 			}
 			return;
 		}
-		Command command = commands.get(parameters.get("Message"));
+		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")));