X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=1860473c51599225a1cfebd5c7b446480cc14e3a;hb=922af0c6ccb37071d1928d12e40aedd15511769a;hp=93caddd64a17ef6a715a3a7b4ad115aabc6f7f56;hpb=e3395d9dd51f56240e4cb9509ccd403bf5f9e343;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 93caddd..1860473 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -37,6 +37,7 @@ import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Profile.Field;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.fcp.FcpInterface;
 import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.IdentityListener;
 import net.pterodactylus.sone.freenet.wot.IdentityManager;
@@ -109,6 +110,9 @@ public class Core implements IdentityListener, UpdateListener {
 	/** The update checker. */
 	private final UpdateChecker updateChecker;
 
+	/** The FCP interface. */
+	private volatile FcpInterface fcpInterface;
+
 	/** Whether the core has been stopped. */
 	private volatile boolean stopped;
 
@@ -251,6 +255,16 @@ public class Core implements IdentityListener, UpdateListener {
 	}
 
 	/**
+	 * Sets the FCP interface to use.
+	 *
+	 * @param fcpInterface
+	 *            The FCP interface to use
+	 */
+	public void setFcpInterface(FcpInterface fcpInterface) {
+		this.fcpInterface = fcpInterface;
+	}
+
+	/**
 	 * Returns the status of the given Sone.
 	 *
 	 * @param sone
@@ -1493,6 +1507,10 @@ public class Core implements IdentityListener, UpdateListener {
 		synchronized (posts) {
 			posts.remove(post.getId());
 		}
+		synchronized (newPosts) {
+			markPostKnown(post);
+			knownPosts.remove(post.getId());
+		}
 		saveSone(post.getSone());
 	}
 
@@ -1618,6 +1636,10 @@ public class Core implements IdentityListener, UpdateListener {
 		synchronized (replies) {
 			replies.remove(reply.getId());
 		}
+		synchronized (newReplies) {
+			markReplyKnown(reply);
+			knownReplies.remove(reply.getId());
+		}
 		sone.removeReply(reply);
 		saveSone(sone);
 	}
@@ -1684,6 +1706,8 @@ public class Core implements IdentityListener, UpdateListener {
 			configuration.getIntValue("Option/PositiveTrust").setValue(options.getIntegerOption("PositiveTrust").getReal());
 			configuration.getIntValue("Option/NegativeTrust").setValue(options.getIntegerOption("NegativeTrust").getReal());
 			configuration.getStringValue("Option/TrustComment").setValue(options.getStringOption("TrustComment").getReal());
+			configuration.getBooleanValue("Option/ActivateFcpInterface").setValue(options.getBooleanOption("ActivateFcpInterface").getReal());
+			configuration.getBooleanValue("Option/FcpWriteFromFullAccessOnly").setValue(options.getBooleanOption("FcpWriteFromFullAccessOnly").getReal());
 			configuration.getBooleanValue("Option/SoneRescueMode").setValue(options.getBooleanOption("SoneRescueMode").getReal());
 			configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
 			configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal());
@@ -1758,6 +1782,23 @@ public class Core implements IdentityListener, UpdateListener {
 		options.addIntegerOption("PositiveTrust", new DefaultOption<Integer>(75));
 		options.addIntegerOption("NegativeTrust", new DefaultOption<Integer>(-25));
 		options.addStringOption("TrustComment", new DefaultOption<String>("Set from Sone Web Interface"));
+		options.addBooleanOption("ActivateFcpInterface", new DefaultOption<Boolean>(false, new OptionWatcher<Boolean>() {
+
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void optionChanged(Option<Boolean> option, Boolean oldValue, Boolean newValue) {
+				fcpInterface.setActive(newValue);
+			}
+		}));
+		options.addBooleanOption("FcpWriteFromFullAccessOnly", new DefaultOption<Boolean>(true, new OptionWatcher<Boolean>() {
+
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void optionChanged(Option<Boolean> option, Boolean oldValue, Boolean newValue) {
+				fcpInterface.setAllowWriteFromFullAccessOnly(newValue);
+			}
+
+		}));
 		options.addBooleanOption("SoneRescueMode", new DefaultOption<Boolean>(false));
 		options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false));
 		options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false));
@@ -1778,6 +1819,8 @@ public class Core implements IdentityListener, UpdateListener {
 		options.getIntegerOption("PositiveTrust").set(configuration.getIntValue("Option/PositiveTrust").getValue(null));
 		options.getIntegerOption("NegativeTrust").set(configuration.getIntValue("Option/NegativeTrust").getValue(null));
 		options.getStringOption("TrustComment").set(configuration.getStringValue("Option/TrustComment").getValue(null));
+		options.getBooleanOption("ActivateFcpInterface").set(configuration.getBooleanValue("Option/ActivateFcpInterface").getValue(null));
+		options.getBooleanOption("FcpWriteFromFullAccessOnly").set(configuration.getBooleanValue("Option/FcpWriteFromFullAccessOnly").getValue(null));
 		options.getBooleanOption("SoneRescueMode").set(configuration.getBooleanValue("Option/SoneRescueMode").getValue(null));
 
 		/* load known Sones. */
@@ -2052,6 +2095,60 @@ public class Core implements IdentityListener, UpdateListener {
 		}
 
 		/**
+		 * Returns whether the {@link FcpInterface FCP interface} is currently
+		 * active.
+		 *
+		 * @see FcpInterface#setActive(boolean)
+		 * @return {@code true} if the FCP interface is currently active,
+		 *         {@code false} otherwise
+		 */
+		public boolean isFcpInterfaceActive() {
+			return options.getBooleanOption("ActivateFcpInterface").get();
+		}
+
+		/**
+		 * Sets whether the {@link FcpInterface FCP interface} is currently
+		 * active.
+		 *
+		 * @see FcpInterface#setActive(boolean)
+		 * @param fcpInterfaceActive
+		 *            {@code true} to activate the FCP interface, {@code false}
+		 *            to deactivate the FCP interface
+		 * @return This preferences object
+		 */
+		public Preferences setFcpInterfaceActive(boolean fcpInterfaceActive) {
+			options.getBooleanOption("ActivateFcpInterface").set(fcpInterfaceActive);
+			return this;
+		}
+
+		/**
+		 * Returns whether write access to the FCP interface is only allowed
+		 * from the allowed FCP hosts of the node configuration.
+		 *
+		 * @return {@code true} if only allowed hosts are allowed to change data
+		 *         using the FCP interface, {@code false} if everybody can
+		 *         change data using the FCP interface
+		 */
+		public boolean isFcpWriteFromFullAccessOnly() {
+			return options.getBooleanOption("FcpWriteFromFullAccessOnly").get();
+		}
+
+		/**
+		 * Sets whether write access to the FCP interface is only allowed from
+		 * the allowed FCP hosts of the node configuration.
+		 *
+		 * @param fcpWriteFromFullAccessOnly
+		 *            {@code true} if only allowed hosts should be allowed to
+		 *            change data using the FCP interface, {@code false} if
+		 *            everybody can change data using the FCP interface
+		 * @return This preferences object
+		 */
+		public Preferences setFcpWriteFromFullAccessOnly(boolean fcpWriteFromFullAccessOnly) {
+			options.getBooleanOption("FcpWriteFromFullAccessOnly").set(fcpWriteFromFullAccessOnly);
+			return this;
+		}
+
+		/**
 		 * Returns whether the rescue mode is active.
 		 *
 		 * @return {@code true} if the rescue mode is active, {@code false}