X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=c71fd82a003b37cc2f4a0897d077911237f3f312;hb=b343a185e8b89ea5973bf57ec74217652834f5ea;hp=4e8ecc4fd24714ed25779bf22921c33036f15b3c;hpb=317730570a54d7f95a22a59320ea503b9cad2571;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 4e8ecc4..c71fd82 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â2013 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,6 +17,8 @@
package net.pterodactylus.sone.fcp;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -24,18 +26,22 @@ 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.core.Options.Option;
+import net.pterodactylus.sone.core.Options.OptionWatcher;
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 freenet.pluginmanager.FredPluginFCP;
import freenet.pluginmanager.PluginNotFoundException;
import freenet.pluginmanager.PluginReplySender;
import freenet.support.SimpleFieldSet;
import freenet.support.api.Bucket;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.Inject;
+
/**
* Implementation of an FCP interface for other clients or plugins to
* communicate with Sone.
@@ -44,14 +50,35 @@ import freenet.support.api.Bucket;
*/
public class FcpInterface {
+ /**
+ * The action level that full access for the FCP connection is required.
+ *
+ * @author David âBombeâ Roden
+ */
+ 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 commands = Collections.synchronizedMap(new HashMap());
+ private final Map commands = Collections.synchronizedMap(new HashMap());
/**
* Creates a new FCP interface.
@@ -59,21 +86,34 @@ public class FcpInterface {
* @param core
* The core
*/
+ @Inject
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("LockSone", new LockSoneCommand(core));
+ commands.put("UnlockSone", new UnlockSoneCommand(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
//
+ @VisibleForTesting
+ boolean isActive() {
+ return active;
+ }
+
/**
* Sets whether the FCP interface should handle requests. If {@code active}
* is {@code false}, all requests are answered with an error.
@@ -86,6 +126,16 @@ 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) {
+ this.fullAccessRequired = checkNotNull(fullAccessRequired, "fullAccessRequired must not be null");
+ }
+
//
// ACTIONS
//
@@ -113,7 +163,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,8 +185,9 @@ public class FcpInterface {
try {
Response response = command.execute(parameters, data, AccessType.values()[accessType]);
sendReply(pluginReplySender, identifier, response);
- } catch (FcpException fe1) {
- sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + fe1.getMessage()));
+ } catch (Exception e1) {
+ logger.log(Level.WARNING, "Could not process FCP command â%sâ.", command);
+ sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + e1.getMessage()));
}
} catch (PluginNotFoundException pnfe1) {
logger.log(Level.WARNING, "Could not find destination plugin: " + pluginReplySender);
@@ -151,7 +210,7 @@ public class FcpInterface {
* @throws PluginNotFoundException
* if the plugin can not be found
*/
- private void sendReply(PluginReplySender pluginReplySender, String identifier, Response response) throws PluginNotFoundException {
+ private static void sendReply(PluginReplySender pluginReplySender, String identifier, Response response) throws PluginNotFoundException {
SimpleFieldSet replyParameters = response.getReplyParameters();
if (identifier != null) {
replyParameters.putOverwrite("Identifier", identifier);
@@ -165,4 +224,13 @@ public class FcpInterface {
}
}
+ public class SetActive implements OptionWatcher {
+
+ @Override
+ public void optionChanged(Option option, Boolean oldValue, Boolean newValue) {
+ setActive(newValue);
+ }
+
+ }
+
}