Support for POST + authkey and add a debug config

Author: Chew

src/main/java/pw/chew/jsonrestapi/JSONRestAPI.java

@@ -5,14 +5,13 @@
 import pw.chew.jsonrestapi.commands.ReloadCommand;
 
 public final class JSONRestAPI extends JavaPlugin {
-    // Files
-    private static FileConfiguration config;
 
     @Override
     public void onEnable() {
         // Get and save config
-        config = this.getConfig();
+        FileConfiguration config = this.getConfig();
         config.addDefault("port", 6548);
+        config.addDefault("debug", false);
         config.addDefault("authkey", "CHANGE_ME_PLEASE");
         config.options().copyDefaults(true);
         saveDefaultConfig();
@@ -22,7 +21,7 @@ public void onEnable() {
         server.setDaemon(true);
         server.start();
 
-        this.getCommand("jrareload").setExecutor(new ReloadCommand(config, this));
+        this.getCommand("jrareload").setExecutor(new ReloadCommand(this));
 
         this.getLogger().info("Listening on port " + config.getInt("port"));
     }

src/main/java/pw/chew/jsonrestapi/RestServer.java

@@ -2,6 +2,7 @@
 
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.file.FileConfiguration;
 
 import java.io.BufferedReader;
@@ -12,8 +13,10 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Logger;
 
@@ -103,32 +106,86 @@ public void run() {
                     return;
                 }
 
+                // Debug message
+                if (config.getBoolean("debug")) {
+                    logger.info("Received request: " + request);
+                }
+
+                // Get parameters and route
                 String route = request.substring(initialSplit + 1, routeSplit);
+                Map<String, String> params = new HashMap<>();
                 int routeQuerySplit = route.indexOf('?');
                 if (routeQuerySplit != -1) {
                     route = route.substring(0, routeQuerySplit);
+                    String paramString = request.split(" ")[1].split("\\?")[1];
+                    String[] paramSplit = paramString.split("&");
+                    for (String param : paramSplit) {
+                        String key = param.split("=")[0];
+                        String value = param.split("=")[1];
+
+                        // Debug message
+                        if (config.getBoolean("debug")) {
+                            logger.info("Added parameter " + key + " with value " + value);
+                        }
+                        params.put(key, value);
+                    }
                 }
 
                 // Remove initial slash
                 route = route.replaceFirst("/", "");
 
-                logger.info("Received request with route: " + route);
+                // Debug message
+                if (config.getBoolean("debug")) {
+                    logger.info("Route: " + route);
+                }
 
                 // Check if route exists
                 if (config.contains("routes." + route)) {
+                    // Initialize some parameters
                     String key = "routes." + route + ".";
                     String configMethod = config.getString(key + "method");
+                    String authkey = config.getString("authkey");
+                    boolean keyRequired = method.equals("POST");
 
+                    // Ensure the method matches the route itself
                     if (!method.equals(configMethod)) {
                         respondNotAllowed(printWriter);
                         return;
                     }
 
-                    String response = PlaceholderAPI.setPlaceholders(Bukkit.getOfflinePlayer(UUID.randomUUID()), config.getString(key + "response"));
+                    // If auth key is specified, override keyRequired.
+                    if (config.contains(key + ".authkey")) {
+                        keyRequired = config.getBoolean(key + ".authkey");
+                    }
+
+                    // Check if a key is required, and if the key is specified
+                    if (keyRequired && !authkey.equals(params.getOrDefault("key", ""))) {
+                        respondUnauthorized(printWriter);
+                        return;
+                    }
+
+                    // Set the player, depending on the request.
+                    OfflinePlayer player;
+                    if (method.equals("POST")) {
+                        if (params.containsKey("uuid")) {
+                            player = Bukkit.getOfflinePlayer(UUID.fromString(params.get("uuid")));
+                        } else if (params.containsKey("username")) {
+                            player = Bukkit.getPlayer(params.get("username"));
+                        } else {
+                            respondBadRequest(printWriter);
+                            return;
+                        }
+                    } else {
+                        player = Bukkit.getOfflinePlayer(UUID.randomUUID());
+                    }
+
+                    // Build the response by letting PAPI parse the placeholders
+                    String response = PlaceholderAPI.setPlaceholders(player, config.getString(key + "response"));
 
                     // Wrap the response
                     String json = "{\"success\": true, \"response\": " + response + "}";
 
+                    // Send it off!
                     respondOk(printWriter, json);
                 } else {
                     respondNotFound(printWriter);
@@ -165,6 +222,15 @@ private void respondNotFound(PrintWriter writer) {
             writer.printf("HTTP/1.2 404 Not Found%n%n");
         }
 
+        /**
+         * Responds to the HTTP request with a not found header.
+         *
+         * @param writer The {@link PrintWriter} to print the response to.
+         */
+        private void respondUnauthorized(PrintWriter writer) {
+            writer.printf("HTTP/1.2 401 Unauthorized%n%n");
+        }
+
         /**
          * Responds to the HTTP request with an OK header.
          *

src/main/java/pw/chew/jsonrestapi/commands/ReloadCommand.java

@@ -9,21 +9,18 @@
 import pw.chew.jsonrestapi.RestServer;
 
 public class ReloadCommand implements CommandExecutor {
-    public static FileConfiguration config;
     public final JSONRestAPI plugin;
 
-    public ReloadCommand(FileConfiguration baseConfig, JSONRestAPI plugin) {
-        config = baseConfig;
+    public ReloadCommand(JSONRestAPI plugin) {
         this.plugin = plugin;
     }
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
         sender.sendMessage("Reloading the config.");
         plugin.reloadConfig();
-        config = plugin.getConfig();
         // Tell the server about the new config.
-        RestServer.updateConfig(config);
+        RestServer.updateConfig(plugin.getConfig());
         sender.sendMessage("Configuration reloaded!");
         return true;
     }

src/main/resources/config.yml

@@ -17,6 +17,12 @@ port: 6548
 ## Only takes effect if authkey: true in the routes below, plus the root route.
 authkey: CHANGE_ME_PLEASE
 
+# Debug mode
+## Adds some useful debug output for developing.
+## Includes the full request string, parameters, and route itself.
+## Most of the time no one cares about this, but you might.
+debug: false
+
 # Route setup
 ## By default, the root route accept a raw POST value for any info not provided here.
 ## You can set up specific routes below.