X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=65d0d87bc899bade6e2fca3e31ce4fea6087c400;hb=8a43c22e3bfc31de0ae43209275f0311e2f875d5;hp=e66bb8d8293b354eead3f3180a5306e33429211e;hpb=c2233cceb10f4403a7dd63dfc42fe8d1e4bdb07f;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 e66bb8d..65d0d87 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -29,6 +29,7 @@ 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;
@@ -43,14 +44,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());
@@ -65,6 +84,7 @@ public class FcpInterface {
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));
@@ -93,14 +113,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;
}
//
@@ -131,9 +151,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);
}
@@ -153,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) {