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=02d84ccc2aad2cf1bdd377d269e5c6fa76706194;hpb=6e9a43ccd93ae125720547c0fe421dc81a54ba90;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 02d84cc..e49537b 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -22,29 +22,35 @@ 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.util.logging.Logging;
-import com.google.inject.Inject;
-
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 {
/**
@@ -69,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;
@@ -106,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.
@@ -115,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;
}
/**
@@ -147,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) {
@@ -216,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]);
+ }
+
+ }
+
}