X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=25cf4ae63f34b6c9a9197a7a10bdf485692d1388;hp=18c017bdf2dcabd77460688368b5ab0cf1df2a3e;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=6282ab82c0e14ae7dea70ada2fa5e08570280f1a

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index 18c017b..25cf4ae 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–2013 David Roden
+ * Sone - FcpInterface.java - Copyright © 2011–2015 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
@@ -18,20 +18,23 @@
 package net.pterodactylus.sone.fcp;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.logging.Logger.getLogger;
 
 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;
-import net.pterodactylus.util.logging.Logging;
 
 import freenet.pluginmanager.FredPluginFCP;
 import freenet.pluginmanager.PluginNotFoundException;
@@ -40,7 +43,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 +53,7 @@ import com.google.inject.Inject;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class FcpInterface {
 
 	/**
@@ -69,13 +75,13 @@ public class FcpInterface {
 	}
 
 	/** The logger. */
-	private static final Logger logger = Logging.getLogger(FcpInterface.class);
+	private static final Logger logger = getLogger(FcpInterface.class.getName());
 
 	/** 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,34 +117,20 @@ 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;
+		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"));
 	}
 
 	//
@@ -160,7 +152,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) {
@@ -169,7 +161,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) {
@@ -229,22 +221,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());
 	}
 
 }