🔀 Merge branch 'release/v82'

[Sone.git] / src / main / java / net / pterodactylus / sone / fcp / FcpInterface.java

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index 7fb4462..3bb8777 100644 (file)
--- 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–2016 David Roden
+ * Sone - FcpInterface.java - Copyright © 2011–2020 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
@@ -19,6 +19,9 @@ 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.HashMap;
 import java.util.Map;
@@ -27,6 +30,7 @@ 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;
@@ -50,16 +54,12 @@ import com.google.inject.Inject;
 /**
  * Implementation of an FCP interface for other clients or plugins to
  * communicate with Sone.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 @Singleton
 public class FcpInterface {
 
        /**
         * The action level that full access for the FCP connection is required.
-        *
-        * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
         */
        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> fullAccessRequired = new AtomicReference<FullAccessRequired>(FullAccessRequired.ALWAYS);
+       private final AtomicReference<FullAccessRequired> fullAccessRequired = new AtomicReference<>(FullAccessRequired.ALWAYS);
 
        /** All available FCP commands. */
        private final Map<String, AbstractSoneCommand> commands;
+       private final AccessAuthorizer accessAuthorizer;
 
        /**
         * Creates a new FCP interface.
@@ -93,8 +94,9 @@ public class FcpInterface {
         *            The core
         */
        @Inject
-       public FcpInterface(Core core, CommandSupplier commandSupplier) {
+       public FcpInterface(Core core, CommandSupplier commandSupplier, AccessAuthorizer accessAuthorizer) {
                commands = commandSupplier.supplyCommands(core);
+               this.accessAuthorizer = accessAuthorizer;
        }
 
        //
@@ -138,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);
@@ -194,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
@@ -243,4 +239,13 @@ public class FcpInterface {
 
        }
 
+       @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);
+               }
+
+       }
+
 }