X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=c2a7cfae50cfe33402d9e6cf5efb7b6c98160a4e;hp=e49537bb84bfde30c50b05592e53cc8192dfd31d;hb=fdbdc26c744865a7200017cb117943d48df498ad;hpb=5378059868b6681028a0e3dd3b58bff09fe8211a

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index e49537b..c2a7cfa 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -23,12 +23,16 @@ 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.fcp.event.FullAccessRequiredChanged;
 import net.pterodactylus.sone.freenet.fcp.Command.AccessType;
 import net.pterodactylus.sone.freenet.fcp.Command.ErrorResponse;
 import net.pterodactylus.sone.freenet.fcp.Command.Response;
@@ -41,6 +45,7 @@ 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;
 
@@ -78,7 +83,7 @@ public class FcpInterface {
 	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>());
@@ -117,31 +122,17 @@ public class FcpInterface {
 		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) {
+	private void setActive(boolean active) {
 		this.active.set(active);
 	}
 
 	@VisibleForTesting
 	FullAccessRequired getFullAccessRequired() {
-		return fullAccessRequired;
+		return fullAccessRequired.get();
 	}
 
-	/**
-	 * Sets the action level for which full FCP access is required.
-	 *
-	 * @param fullAccessRequired
-	 *            The action level for which full FCP access is required
-	 */
-	public void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
-		this.fullAccessRequired = checkNotNull(fullAccessRequired, "fullAccessRequired must not be null");
+	private void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
+		this.fullAccessRequired.set(checkNotNull(fullAccessRequired, "fullAccessRequired must not be null"));
 	}
 
 	//
@@ -172,7 +163,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) {
@@ -232,22 +223,19 @@ public class FcpInterface {
 		}
 	}
 
-	public class SetActive implements OptionWatcher<Boolean> {
-
-		@Override
-		public void optionChanged(Option<Boolean> option, Boolean oldValue, Boolean newValue) {
-			setActive(newValue);
-		}
-
+	@Subscribe
+	public void fcpInterfaceActivated(FcpInterfaceActivatedEvent fcpInterfaceActivatedEvent) {
+		setActive(true);
 	}
 
-	public class SetFullAccessRequired implements OptionWatcher<Integer> {
-
-		@Override
-		public void optionChanged(Option<Integer> option, Integer oldValue, Integer newValue) {
-			setFullAccessRequired(FullAccessRequired.values()[newValue]);
-		}
+	@Subscribe
+	public void fcpInterfaceDeactivated(FcpInterfaceDeactivatedEvent fcpInterfaceDeactivatedEvent) {
+		setActive(false);
+	}
 
+	@Subscribe
+	public void fullAccessRequiredChanged(FullAccessRequiredChanged fullAccessRequiredChanged) {
+		setFullAccessRequired(fullAccessRequiredChanged.getFullAccessRequired());
 	}
 
 }