X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FFcpInterface.java;h=e190aef74e6999da7d1f48d0ea7eb9e48d6eb6bf;hp=36e18e65ea4251d8497def0c0a5da4a17d2c59d4;hb=2bacfa78f3191fd9847574a6c8b218a4882844a4;hpb=0747ce52deab6ed6e4c3118959cf76827c2ce495 diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java index 36e18e6..e190aef 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java +++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java @@ -19,8 +19,10 @@ package net.pterodactylus.sone.fcp; import static com.google.common.base.Preconditions.checkNotNull; import static java.util.logging.Logger.getLogger; +import static net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.NO; +import static net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.WRITING; +import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.RESTRICTED_FCP; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; @@ -28,6 +30,9 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Level; import java.util.logging.Logger; +import javax.annotation.Nonnull; +import javax.inject.Singleton; + import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.fcp.event.FcpInterfaceActivatedEvent; import net.pterodactylus.sone.fcp.event.FcpInterfaceDeactivatedEvent; @@ -45,21 +50,16 @@ 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 * communicate with Sone. - * - * @author David ‘Bombe’ Roden */ @Singleton public class FcpInterface { /** * The action level that full access for the FCP connection is required. - * - * @author David ‘Bombe’ Roden */ public enum FullAccessRequired { @@ -81,10 +81,11 @@ public class FcpInterface { private final AtomicBoolean active = new AtomicBoolean(); /** What function full access is required for. */ - private final AtomicReference fullAccessRequired = new AtomicReference(FullAccessRequired.ALWAYS); + private final AtomicReference fullAccessRequired = new AtomicReference<>(FullAccessRequired.ALWAYS); /** All available FCP commands. */ - private final Map commands = Collections.synchronizedMap(new HashMap()); + private final Map commands; + private final AccessAuthorizer accessAuthorizer; /** * Creates a new FCP interface. @@ -93,22 +94,9 @@ public class FcpInterface { * The core */ @Inject - public FcpInterface(Core core) { - commands.put("Version", new VersionCommand(core)); - commands.put("GetLocalSones", new GetLocalSonesCommand(core)); - commands.put("GetSones", new GetSonesCommand(core)); - commands.put("GetSone", new GetSoneCommand(core)); - commands.put("GetPost", new GetPostCommand(core)); - commands.put("GetPosts", new GetPostsCommand(core)); - commands.put("GetPostFeed", new GetPostFeedCommand(core)); - commands.put("LockSone", new LockSoneCommand(core)); - commands.put("UnlockSone", new UnlockSoneCommand(core)); - commands.put("LikePost", new LikePostCommand(core)); - commands.put("LikeReply", new LikeReplyCommand(core)); - commands.put("CreatePost", new CreatePostCommand(core)); - commands.put("CreateReply", new CreateReplyCommand(core)); - commands.put("DeletePost", new DeletePostCommand(core)); - commands.put("DeleteReply", new DeleteReplyCommand(core)); + public FcpInterface(Core core, CommandSupplier commandSupplier, AccessAuthorizer accessAuthorizer) { + commands = commandSupplier.supplyCommands(core); + this.accessAuthorizer = accessAuthorizer; } // @@ -152,26 +140,26 @@ public class FcpInterface { * {@link FredPluginFCP#ACCESS_FCP_RESTRICTED} */ public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) { - if (!active.get()) { - sendErrorReply(pluginReplySender, null, 503, "FCP Interface deactivated"); + String identifier = parameters.get("Identifier"); + if ((identifier == null) || (identifier.length() == 0)) { + sendErrorReply(pluginReplySender, null, 400, "Missing Identifier."); return; } - AbstractSoneCommand command = commands.get(parameters.get("Message")); - if ((accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED) && (((fullAccessRequired.get() == FullAccessRequired.WRITING) && command.requiresWriteAccess()) || (fullAccessRequired.get() == FullAccessRequired.ALWAYS))) { - sendErrorReply(pluginReplySender, null, 401, "Not authorized"); + if (!active.get()) { + sendErrorReply(pluginReplySender, identifier, 503, "FCP Interface deactivated"); return; } + AbstractSoneCommand command = commands.get(parameters.get("Message")); if (command == null) { - sendErrorReply(pluginReplySender, null, 404, "Unrecognized Message: " + parameters.get("Message")); + sendErrorReply(pluginReplySender, identifier, 404, "Unrecognized Message: " + parameters.get("Message")); return; } - String identifier = parameters.get("Identifier"); - if ((identifier == null) || (identifier.length() == 0)) { - sendErrorReply(pluginReplySender, null, 400, "Missing Identifier."); + if (!accessAuthorizer.authorized(AccessType.values()[accessType], fullAccessRequired.get(), command.requiresWriteAccess())) { + sendErrorReply(pluginReplySender, identifier, 401, "Not authorized"); return; } try { - Response response = command.execute(parameters, data, AccessType.values()[accessType]); + Response response = command.execute(parameters); sendReply(pluginReplySender, identifier, response); } catch (Exception e1) { logger.log(Level.WARNING, "Could not process FCP command “%s”.", command); @@ -208,13 +196,7 @@ public class FcpInterface { if (identifier != null) { replyParameters.putOverwrite("Identifier", identifier); } - if (response.hasData()) { - pluginReplySender.send(replyParameters, response.getData()); - } else if (response.hasBucket()) { - pluginReplySender.send(replyParameters, response.getBucket()); - } else { - pluginReplySender.send(replyParameters); - } + pluginReplySender.send(replyParameters); } @Subscribe @@ -232,4 +214,38 @@ public class FcpInterface { setFullAccessRequired(fullAccessRequiredChanged.getFullAccessRequired()); } + @Singleton + public static class CommandSupplier { + + public Map supplyCommands(Core core) { + Map commands = new HashMap<>(); + commands.put("Version", new VersionCommand(core)); + commands.put("GetLocalSones", new GetLocalSonesCommand(core)); + commands.put("GetSones", new GetSonesCommand(core)); + commands.put("GetSone", new GetSoneCommand(core)); + commands.put("GetPost", new GetPostCommand(core)); + commands.put("GetPosts", new GetPostsCommand(core)); + commands.put("GetPostFeed", new GetPostFeedCommand(core)); + commands.put("LockSone", new LockSoneCommand(core)); + commands.put("UnlockSone", new UnlockSoneCommand(core)); + commands.put("LikePost", new LikePostCommand(core)); + commands.put("LikeReply", new LikeReplyCommand(core)); + commands.put("CreatePost", new CreatePostCommand(core)); + commands.put("CreateReply", new CreateReplyCommand(core)); + commands.put("DeletePost", new DeletePostCommand(core)); + commands.put("DeleteReply", new DeleteReplyCommand(core)); + return commands; + } + + } + + @Singleton + public static class AccessAuthorizer { + + public boolean authorized(@Nonnull AccessType accessType, @Nonnull FullAccessRequired fullAccessRequired, boolean commandRequiresWriteAccess) { + return (accessType != RESTRICTED_FCP) || (fullAccessRequired == NO) || ((fullAccessRequired == WRITING) && !commandRequiresWriteAccess); + } + + } + }