fix subcommand blocker

subcommandblocker broke when command included part of the subcommand, so for ex. /help he would remove "he" from the command and it would return as "/lp".

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: YouHaveTrouble
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/buildjar.yml

@@ -0,0 +1,36 @@
+name: Build CommandWhitelist Jar
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Git repo
+        uses: actions/checkout@v1
+      - name: Restore Maven cache
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Maven
+        run: mvn package --file pom.xml
+      - name: Copy artifacts
+        uses: actions/upload-artifact@master
+        with:
+          name: CommandWhitelist
+          path: target/CommandWhitelist*.jar

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>eu.endermite</groupId>
     <artifactId>CommandWhitelist</artifactId>
-    <version>1.6.0-BETA</version>
+    <version>1.7.8</version>
     <packaging>jar</packaging>
 
     <name>CommandWhitelist</name>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.16.3-R0.1-SNAPSHOT</version>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>4.5.0</version>
+            <version>4.6.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

readme.md

@@ -1,6 +1,9 @@
 Command  Whitelist is a plugin that allows you to control 
 precisely what commands players can see and use.
 
+<img src="https://img.shields.io/bstats/servers/8705?label=Spigot%20servers%20using%20CommandWhitelist&style=for-the-badge">
+<img src="https://img.shields.io/bstats/servers/8704?label=Proxy%20servers%20using%20CommandWhitelist&style=for-the-badge">
+
 <h3>Plugin Features</h3>
 
 <ul>

src/main/java/eu/endermite/commandwhitelist/api/CommandsList.java

@@ -63,4 +63,11 @@ public class CommandsList {
         return last;
     }
 
+    public static String getCommandLabel(String cmd) {
+        String[] parts = cmd.split(" ");
+        if (parts[0].startsWith("/"))
+            parts[0] = parts[0].substring(1);
+        return parts[0];
+    }
+
 }

src/main/java/eu/endermite/commandwhitelist/spigot/CommandWhitelist.java

@@ -2,15 +2,13 @@ package eu.endermite.commandwhitelist.spigot;
 
 import eu.endermite.commandwhitelist.spigot.command.MainCommand;
 import eu.endermite.commandwhitelist.spigot.config.ConfigCache;
-import eu.endermite.commandwhitelist.spigot.listeners.LegacyPlayerTabChatCompleteListener;
-import eu.endermite.commandwhitelist.spigot.listeners.PlayerCommandPreProcessListener;
-import eu.endermite.commandwhitelist.spigot.listeners.PlayerCommandSendListener;
-import eu.endermite.commandwhitelist.spigot.listeners.TabCompleteBlockerListener;
+import eu.endermite.commandwhitelist.spigot.listeners.*;
 import eu.endermite.commandwhitelist.spigot.metrics.BukkitMetrics;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class CommandWhitelist extends JavaPlugin {
@@ -28,20 +26,27 @@ public class CommandWhitelist extends JavaPlugin {
 
         reloadPluginConfig();
 
+        Plugin protocollib = getServer().getPluginManager().getPlugin("ProtocolLib");
+
         getServer().getPluginManager().registerEvents(new PlayerCommandPreProcessListener(), this);
         if (!isLegacy) {
+            if (!getConfigCache().isUseProtocolLib() || protocollib == null || !protocollib.isEnabled()) {
+
                 getServer().getPluginManager().registerEvents(new PlayerCommandSendListener(), this);
+            } else {
+                PacketCommandSendListener.protocol(this);
+                getLogger().info(ChatColor.AQUA+"Using ProtocolLib for command filter!");
+            }
+            getServer().getPluginManager().registerEvents(new TabCompleteBlockerListener(), this);
         } else {
             getLogger().info(ChatColor.AQUA+"Running in legacy mode...");
-            if (getServer().getPluginManager().getPlugin("ProtocolLib") != null) {
+            if (protocollib != null) {
                 LegacyPlayerTabChatCompleteListener.protocol(this);
             } else {
                 getLogger().info(ChatColor.YELLOW+"ProtocolLib is required for tab completion blocking!");
             }
         }
 
-        getServer().getPluginManager().registerEvents(new TabCompleteBlockerListener(), this);
-
         getCommand("commandwhitelist").setExecutor(new MainCommand());
         getCommand("commandwhitelist").setTabCompleter(new MainCommand());
 

src/main/java/eu/endermite/commandwhitelist/spigot/config/ConfigCache.java

@@ -17,6 +17,7 @@ public class ConfigCache {
     private final String prefix, commandDenied, noPermission, noSubCommand, configReloaded, whitelistedCommand,
             removedWhitelistedCommand, noSuchGroup, subCommandDenied;
     private final List<String> commandDeniedList;
+    private boolean useProtocolLib;
 
     public ConfigCache(FileConfiguration config) {
 
@@ -33,6 +34,8 @@ public class ConfigCache {
         removedWhitelistedCommand = config.getString("messages.removed-from-whitelist", "&eRemoved command &6%s &efrom permission &6%s");
         noSuchGroup = config.getString("messages.group-doesnt-exist", "&cGroup %s doesn't exist");
 
+        useProtocolLib = config.getBoolean("use-protocollib-to-detect-commands", false);
+
         Set<String> perms = config.getConfigurationSection("commands").getKeys(false);
         for (String s : perms) {
             this.permList.put(s, config.getStringList("commands."+s));
@@ -99,4 +102,7 @@ public class ConfigCache {
     public String getSubCommandDenied() {
         return subCommandDenied;
     }
+    public boolean isUseProtocolLib() {
+        return useProtocolLib;
+    }
 }

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java

@@ -19,6 +19,7 @@ public class LegacyPlayerTabChatCompleteListener {
     public static void protocol(CommandWhitelist plugin) {
         ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
         tabCompleteServerBound(protocolManager, plugin);
+        tabCompleteClientBound(protocolManager, plugin);
     }
 
     public static void tabCompleteServerBound(ProtocolManager protocolManager, Plugin plugin) {
@@ -52,4 +53,33 @@ public class LegacyPlayerTabChatCompleteListener {
             }
         });
     }
+
+    public static void tabCompleteClientBound(ProtocolManager protocolManager, Plugin plugin) {
+        protocolManager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.TAB_COMPLETE) {
+            @Override
+            public void onPacketReceiving(PacketEvent event) {
+                try {
+                    Player player = event.getPlayer();
+                    if (player.hasPermission("commandwhitelist.bypass")) {
+                        return;
+                    }
+                    PacketContainer packet = event.getPacket();
+                    String command = packet.getSpecificModifier(String.class).read(0);
+                    String label = CommandsList.getCommandLabel(command);
+                    List<String> commandList = CommandsList.getCommands(player);
+                    if (command.equals("/"))
+                        return;
+                    for (String cmd : commandList) {
+                        if (cmd.startsWith("/"+label+" "))
+                            return;
+                    }
+                    event.setCancelled(true);
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+            }
+        });
+    }
 }

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PacketCommandSendListener.java

@@ -0,0 +1,68 @@
+package eu.endermite.commandwhitelist.spigot.listeners;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.comphenix.protocol.ProtocolManager;
+import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.PacketAdapter;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.events.PacketEvent;
+import eu.endermite.commandwhitelist.api.CommandsList;
+import eu.endermite.commandwhitelist.api.RandomStuff;
+import eu.endermite.commandwhitelist.spigot.CommandWhitelist;
+import eu.endermite.commandwhitelist.spigot.config.ConfigCache;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import java.util.List;
+import java.util.Map;
+
+public class PacketCommandSendListener {
+
+    public static void protocol(CommandWhitelist plugin) {
+        ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
+        commandExecListener(protocolManager, plugin);
+    }
+
+    public static void commandExecListener(ProtocolManager protocolManager, Plugin plugin) {
+        protocolManager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.CHAT) {
+            @Override
+            public void onPacketReceiving(PacketEvent event) {
+                PacketContainer packet = event.getPacket();
+                String string = packet.getStrings().read(0);
+                if (!string.startsWith("/"))
+                    return;
+                Player player = event.getPlayer();
+                if (player.hasPermission("commandwhitelist.bypass"))
+                    return;
+                String cmd = string.replace("/", "");
+                String[] split = cmd.split("\\s+");
+                String command = split[0].toLowerCase();
+                for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) {
+                    if (!player.hasPermission("commandwhitelist.commands." + s.getKey()))
+                        continue;
+                    for (String comm : s.getValue()) {
+                        comm = comm.toLowerCase();
+                        if (command.equalsIgnoreCase(comm) || command.startsWith(comm + " ")) {
+                            List<String> bannedSubCommands = CommandsList.getSuggestions(player);
+                            for (String bannedSubCommand : bannedSubCommands) {
+                                if (cmd.startsWith(bannedSubCommand)) {
+                                    event.setCancelled(true);
+                                    ConfigCache config = CommandWhitelist.getConfigCache();
+                                    player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getSubCommandDenied())));
+                                    return;
+                                }
+                            }
+                            return;
+                        }
+                    }
+                }
+
+                event.setCancelled(true);
+                ConfigCache config = CommandWhitelist.getConfigCache();
+                player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getCommandDenied())));
+
+            }
+        });
+    }
+}

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java

@@ -13,22 +13,23 @@ import java.util.List;
 import java.util.Map;
 
 public class PlayerCommandPreProcessListener implements Listener {
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreprocessEvent event) {
         Player player = event.getPlayer();
         if (player.hasPermission("commandwhitelist.bypass"))
             return;
         String command = event.getMessage().toLowerCase();
+        if (command.startsWith("/"))
+            command = command.substring(1);
         for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) {
             if (!player.hasPermission("commandwhitelist.commands." + s.getKey()))
                 continue;
             for (String comm : s.getValue()) {
                 comm = comm.toLowerCase();
-                if (command.equalsIgnoreCase("/" + comm) || command.startsWith("/" + comm + " ")) {
-                    String rawCmd = event.getMessage();
+                if (command.equalsIgnoreCase(comm) || command.startsWith(comm + " ")) {
                     List<String> bannedSubCommands = CommandsList.getSuggestions(player);
                     for (String bannedSubCommand : bannedSubCommands) {
-                        if (rawCmd.startsWith("/"+bannedSubCommand)) {
+                        if (command.startsWith(bannedSubCommand)) {
                             event.setCancelled(true);
                             ConfigCache config = CommandWhitelist.getConfigCache();
                             player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getSubCommandDenied())));

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandSendListener.java

@@ -8,7 +8,7 @@ import org.bukkit.event.Listener;
 import java.util.*;
 
 public class PlayerCommandSendListener implements Listener {
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.NORMAL)
     public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) {
         Player player = event.getPlayer();
         if (player.hasPermission("commandwhitelist.bypass"))

src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java

@@ -14,20 +14,28 @@ public class TabCompleteBlockerListener implements Listener {
             return;
         Player player = (Player) event.getSender();
         String buffer = event.getBuffer();
-        String cmd = buffer.replace(CommandsList.getLastArgument(buffer), "");
+
         List<String> blockedCommands = CommandsList.getSuggestions(player);
         List<String> suggestions = event.getCompletions();
+
         for (String s : blockedCommands) {
             String slast = CommandsList.getLastArgument(s);
             String scommand = s.replace(slast, "");
-            cmd = cmd.replace(CommandsList.getLastArgument(cmd), "");
-            if (cmd.startsWith("/" + scommand + " ")) {
-                continue;
-            }
+            String[] cmdSplit = buffer.split(" ");
+            StringBuilder cmdBuilder = new StringBuilder();
+            for (int i = 0; i <= cmdSplit.length-1; i++)
+                cmdBuilder.append(cmdSplit[i]).append(" ");
+
+            String cmd = cmdBuilder.toString();
+            if (cmd.startsWith("/"+scommand)) {
+                // This sometimes throws exceptions. No clue why, it just does. try/catch is the only fix.
+                // Probably happening when plugin adds suggestions in this event on the same priority - not confirmed.
                 try {
+                    while (suggestions.contains(slast))
                         suggestions.remove(slast);
                 } catch (Exception ignored) {}
             }
+        }
         event.setCompletions(suggestions);
     }
 }

src/main/resources/config.yml

@@ -9,6 +9,11 @@ messages:
   removed-from-whitelist: "&eRemoved command &6%s &efrom permission &6%s"
   group-doesnt-exist: "&cGroup doesn't exist or error occured"
 
+# To cover the 1% of plugins that don't register their commands and/or aliases properly.
+# Do not enable if you don't have issues with aliased commands.
+# This requires server restart to take effect.
+use-protocollib-to-detect-commands: false
+
 commands:
   # Permissions that control what commands players can use
   # you can add unlimited amount of whitelists