X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=a0e3c40371a041deddc4b56757c7a6446eb63454;hb=26dbc1f7ba2c4243d8cc07986b0e943a2238ea08;hp=46ee5c2ee4e5d025e33f79976a133179269911d9;hpb=d2a84d3d722e9c3df68cd5b7f86d8bf9372d7e2b;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 46ee5c2..a0e3c40 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
@@ -27,8 +27,11 @@ import net.pterodactylus.sone.core.Core;
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 com.google.inject.Inject;
+
import freenet.pluginmanager.FredPluginFCP;
import freenet.pluginmanager.PluginNotFoundException;
import freenet.pluginmanager.PluginReplySender;
@@ -43,14 +46,32 @@ 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;
- /** Whether to allow write access from full access hosts only. */
- private volatile boolean allowWriteFromFullAccessOnly;
+ /** 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());
@@ -61,9 +82,12 @@ public class FcpInterface {
* @param core
* The core
*/
+ @Inject
public FcpInterface(Core core) {
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));
@@ -92,14 +116,14 @@ public class FcpInterface {
}
/**
- * Sets whether write access is only allowed from full access hosts.
+ * Sets the action level for which full FCP access is required.
*
- * @param allowWriteFromFullAccessOnly
- * {@code true} to allow write access only from full access
- * hosts, {@code false} to always allow write access
+ * @param fullAccessRequired
+ * The action level for which full FCP access is required
*/
- public void setAllowWriteFromFullAccessOnly(boolean allowWriteFromFullAccessOnly) {
- this.allowWriteFromFullAccessOnly = allowWriteFromFullAccessOnly;
+ public void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
+ Validation.begin().isNotNull("FullAccessRequired", fullAccessRequired).check();
+ this.fullAccessRequired = fullAccessRequired;
}
//
@@ -130,9 +154,9 @@ public class FcpInterface {
return;
}
AbstractSoneCommand command = commands.get(parameters.get("Message"));
- if (allowWriteFromFullAccessOnly && command.requiresWriteAccess() && (accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED)) {
+ if ((accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED) && (((fullAccessRequired == FullAccessRequired.WRITING) && command.requiresWriteAccess()) || (fullAccessRequired == FullAccessRequired.ALWAYS))) {
try {
- sendReply(pluginReplySender, null, new ErrorResponse(401, "No Write Access"));
+ sendReply(pluginReplySender, null, new ErrorResponse(401, "Not authorized"));
} catch (PluginNotFoundException pnfe1) {
logger.log(Level.FINE, "Could not set error to plugin.", pnfe1);
}
@@ -151,8 +175,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);
@@ -175,7 +200,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);