X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=763a06e8818f6000373af96cac7db521610573ff;hb=3233fad6a7cf276d13286f3ab7b5836fcabcf668;hp=c71fd82a003b37cc2f4a0897d077911237f3f312;hpb=b343a185e8b89ea5973bf57ec74217652834f5ea;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 c71fd82..763a06e 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -22,12 +22,16 @@ 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.concurrent.atomic.AtomicReference;
 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.fcp.event.FcpInterfaceActivatedEvent;
+import net.pterodactylus.sone.fcp.event.FcpInterfaceDeactivatedEvent;
 import net.pterodactylus.sone.freenet.fcp.Command.AccessType;
 import net.pterodactylus.sone.freenet.fcp.Command.ErrorResponse;
 import net.pterodactylus.sone.freenet.fcp.Command.Response;
@@ -40,7 +44,9 @@ import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 /**
  * Implementation of an FCP interface for other clients or plugins to
@@ -48,6 +54,7 @@ import com.google.inject.Inject;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class FcpInterface {
 
 	/**
@@ -72,10 +79,10 @@ 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;
+	private final AtomicReference<FullAccessRequired> fullAccessRequired = new AtomicReference<FullAccessRequired>(FullAccessRequired.ALWAYS);
 
 	/** All available FCP commands. */
 	private final Map<String, AbstractSoneCommand> commands = Collections.synchronizedMap(new HashMap<String, AbstractSoneCommand>());
@@ -111,19 +118,16 @@ public class FcpInterface {
 
 	@VisibleForTesting
 	boolean isActive() {
-		return active;
+		return active.get();
 	}
 
-	/**
-	 * Sets whether the FCP interface should handle requests. If {@code active}
-	 * is {@code false}, all requests are answered with an error.
-	 *
-	 * @param active
-	 *            {@code true} to activate the FCP interface, {@code false} to
-	 *            deactivate the FCP interface
-	 */
-	public void setActive(boolean active) {
-		this.active = active;
+	private void setActive(boolean active) {
+		this.active.set(active);
+	}
+
+	@VisibleForTesting
+	FullAccessRequired getFullAccessRequired() {
+		return fullAccessRequired.get();
 	}
 
 	/**
@@ -133,7 +137,7 @@ public class FcpInterface {
 	 *            The action level for which full FCP access is required
 	 */
 	public void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
-		this.fullAccessRequired = checkNotNull(fullAccessRequired, "fullAccessRequired must not be null");
+		this.fullAccessRequired.set(checkNotNull(fullAccessRequired, "fullAccessRequired must not be null"));
 	}
 
 	//
@@ -155,7 +159,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) {
@@ -164,7 +168,7 @@ public class FcpInterface {
 			return;
 		}
 		AbstractSoneCommand command = commands.get(parameters.get("Message"));
-		if ((accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED) && (((fullAccessRequired == FullAccessRequired.WRITING) && command.requiresWriteAccess()) || (fullAccessRequired == FullAccessRequired.ALWAYS))) {
+		if ((accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED) && (((fullAccessRequired.get() == FullAccessRequired.WRITING) && command.requiresWriteAccess()) || (fullAccessRequired.get() == FullAccessRequired.ALWAYS))) {
 			try {
 				sendReply(pluginReplySender, null, new ErrorResponse(401, "Not authorized"));
 			} catch (PluginNotFoundException pnfe1) {
@@ -224,11 +228,21 @@ public class FcpInterface {
 		}
 	}
 
-	public class SetActive implements OptionWatcher<Boolean> {
+	@Subscribe
+	public void fcpInterfaceActivated(FcpInterfaceActivatedEvent fcpInterfaceActivatedEvent) {
+		setActive(true);
+	}
+
+	@Subscribe
+	public void fcpInterfaceDeactivated(FcpInterfaceDeactivatedEvent fcpInterfaceDeactivatedEvent) {
+		setActive(false);
+	}
+
+	public class SetFullAccessRequired implements OptionWatcher<Integer> {
 
 		@Override
-		public void optionChanged(Option<Boolean> option, Boolean oldValue, Boolean newValue) {
-			setActive(newValue);
+		public void optionChanged(Option<Integer> option, Integer oldValue, Integer newValue) {
+			setFullAccessRequired(FullAccessRequired.values()[newValue]);
 		}
 
 	}