X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=e49537bb84bfde30c50b05592e53cc8192dfd31d;hb=5378059868b6681028a0e3dd3b58bff09fe8211a;hp=65d0d87bc899bade6e2fca3e31ce4fea6087c400;hpb=ccf2a279d0c8261508968c9fb38dfec9c1c8bcc1;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 65d0d87..e49537b 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,31 +17,40 @@
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;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.pterodactylus.sone.core.Core;
+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 net.pterodactylus.util.validation.Validation;
+
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;
+import com.google.inject.Singleton;
+
/**
* Implementation of an FCP interface for other clients or plugins to
* communicate with Sone.
*
* @author David âBombeâ Roden
*/
+@Singleton
public class FcpInterface {
/**
@@ -66,7 +75,7 @@ public class FcpInterface {
private static final Logger logger = Logging.getLogger(FcpInterface.class);
/** Whether the FCP interface is currently active. */
- private volatile boolean active;
+ private final AtomicBoolean active = new AtomicBoolean();
/** What function full access is required for. */
private volatile FullAccessRequired fullAccessRequired = FullAccessRequired.ALWAYS;
@@ -80,6 +89,7 @@ public class FcpInterface {
* @param core
* The core
*/
+ @Inject
public FcpInterface(Core core) {
commands.put("Version", new VersionCommand(core));
commands.put("GetLocalSones", new GetLocalSonesCommand(core));
@@ -88,6 +98,8 @@ public class FcpInterface {
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));
@@ -100,6 +112,11 @@ public class FcpInterface {
// ACCESSORS
//
+ @VisibleForTesting
+ boolean isActive() {
+ return active.get();
+ }
+
/**
* Sets whether the FCP interface should handle requests. If {@code active}
* is {@code false}, all requests are answered with an error.
@@ -109,7 +126,12 @@ public class FcpInterface {
* deactivate the FCP interface
*/
public void setActive(boolean active) {
- this.active = active;
+ this.active.set(active);
+ }
+
+ @VisibleForTesting
+ FullAccessRequired getFullAccessRequired() {
+ return fullAccessRequired;
}
/**
@@ -119,8 +141,7 @@ public class FcpInterface {
* The action level for which full FCP access is required
*/
public void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
- Validation.begin().isNotNull("FullAccessRequired", fullAccessRequired).check();
- this.fullAccessRequired = fullAccessRequired;
+ this.fullAccessRequired = checkNotNull(fullAccessRequired, "fullAccessRequired must not be null");
}
//
@@ -142,7 +163,7 @@ public class FcpInterface {
* {@link FredPluginFCP#ACCESS_FCP_RESTRICTED}
*/
public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) {
- if (!active) {
+ if (!active.get()) {
try {
sendReply(pluginReplySender, null, new ErrorResponse(400, "FCP Interface deactivated"));
} catch (PluginNotFoundException pnfe1) {
@@ -172,9 +193,9 @@ public class FcpInterface {
try {
Response response = command.execute(parameters, data, AccessType.values()[accessType]);
sendReply(pluginReplySender, identifier, response);
- } catch (FcpException fe1) {
+ } catch (Exception e1) {
logger.log(Level.WARNING, "Could not process FCP command â%sâ.", command);
- sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + fe1.getMessage()));
+ sendReply(pluginReplySender, identifier, new ErrorResponse("Error executing command: " + e1.getMessage()));
}
} catch (PluginNotFoundException pnfe1) {
logger.log(Level.WARNING, "Could not find destination plugin: " + pluginReplySender);
@@ -197,7 +218,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);
@@ -211,4 +232,22 @@ public class FcpInterface {
}
}
+ public class SetActive implements OptionWatcher {
+
+ @Override
+ public void optionChanged(Option option, Boolean oldValue, Boolean newValue) {
+ setActive(newValue);
+ }
+
+ }
+
+ public class SetFullAccessRequired implements OptionWatcher {
+
+ @Override
+ public void optionChanged(Option option, Integer oldValue, Integer newValue) {
+ setFullAccessRequired(FullAccessRequired.values()[newValue]);
+ }
+
+ }
+
}