Full permission system rewrite, you can now control boolean permissions with Bukkit

Author: JustRed23

patches/minecraft/net/minecraft/commands/CommandSourceStack.java.patch

@@ -24,8 +24,8 @@
     public boolean hasPermission(int p_81370_) {
 +      // CraftBukkit start
 +      com.mojang.brigadier.tree.CommandNode currentCommand = this.currentCommand;
-+      if (currentCommand != null && !org.kettingpowered.ketting.command.ForgeCommand.checkIfForgeCommand(currentCommand)) { //Ketting - skip if forge command
-+         return hasPermission(p_81370_, org.bukkit.craftbukkit.v1_20_R1.command.VanillaCommandWrapper.getPermission(currentCommand));
++      if (currentCommand != null) {
++          return org.kettingpowered.ketting.utils.PermissionHelper.handleSourceStackPermission(this, currentCommand, p_81370_);
 +      }
 +      // CraftBukkit end
 +

src/main/java/org/bukkit/craftbukkit/v1_20_R1/entity/CraftHumanEntity.java

@@ -234,12 +234,6 @@ public void setOp(boolean value) {
         perm.recalculatePermissions();
     }
 
-    //Ketting start
-    public boolean isPermissibleInjected() {
-        return !perm.getClass().getSimpleName().equals(PermissibleBase.class.getSimpleName());
-    }
-    //Ketting end
-
     @Override
     public Set<PermissionAttachmentInfo> getEffectivePermissions() {
         return perm.getEffectivePermissions();

src/main/java/org/bukkit/craftbukkit/v1_20_R1/entity/CraftPlayer.java

@@ -134,13 +134,15 @@
 import org.bukkit.map.MapCursor;
 import org.bukkit.map.MapView;
 import org.bukkit.metadata.MetadataValue;
+import org.bukkit.permissions.Permission;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.messaging.StandardMessenger;
 import org.bukkit.profile.PlayerProfile;
 import org.bukkit.scoreboard.Scoreboard;
 import org.jetbrains.annotations.NotNull;
 
 import net.md_5.bungee.api.chat.BaseComponent; // Spigot
+import org.kettingpowered.ketting.utils.PermissionHelper;
 
 @DelegateDeserialization(CraftOfflinePlayer.class)
 public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2202,4 +2204,16 @@ public Player.Spigot spigot()
         return spigot;
     }
     // Spigot end
+
+    //Ketting start - permission handler
+    @Override
+    public boolean hasPermission(@NotNull String name) {
+        return PermissionHelper.handlePermission(this, name, () -> super.hasPermission(name));
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull Permission perm) {
+        return PermissionHelper.handlePermission(this, perm, () -> super.hasPermission(perm));
+    }
+    //Ketting end
 }

src/main/java/org/bukkit/permissions/PermissionDefault.java

@@ -12,7 +12,8 @@ public enum PermissionDefault {
     TRUE("true"),
     FALSE("false"),
     OP("op", "isop", "operator", "isoperator", "admin", "isadmin"),
-    NOT_OP("!op", "notop", "!operator", "notoperator", "!admin", "notadmin");
+    NOT_OP("!op", "notop", "!operator", "notoperator", "!admin", "notadmin"),
+    MODDED("ketting-modded"); //Ketting - permission handler
 
     private final String[] names;
     private static final Map<String, PermissionDefault> lookup = new HashMap<String, PermissionDefault>();
@@ -61,6 +62,7 @@ public String toString() {
 
     static {
         for (PermissionDefault value : values()) {
+            if (value == MODDED) continue; //Ketting
             for (String name : value.names) {
                 lookup.put(name, value);
             }

src/main/java/org/kettingpowered/ketting/command/ForgeCommandWrapper.java

@@ -28,22 +28,7 @@ public ForgeCommandWrapper(Commands dispatcher, CommandNode<CommandSourceStack>
 
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
         final CommandSourceStack listener = getListener(sender);
-        if (KettingConfig.getInstance().OVERWRITE_FORGE_PERMISSIONS.getValue()) {
-            //If we detect that the CraftPlayer permissible was injected into (ex. LuckPerms), we will use their permissions
-            //instead of the Forge permissions defined in 'Commands.literal(...).requires(s -> s.hasPermission(..))'.
-            //This will cause a problem though, as the Forge permissions will not be checked.
-            //So you will have to manually set the Forge permissions by allowing ex. "forge.command.coolmodcommand" in LuckPerms.
-            boolean permissibleInjected = false;
-            if (sender instanceof CraftPlayer player)
-                permissibleInjected = player.isPermissibleInjected();
-
-            if ((permissibleInjected && !testPermission(sender)) ||
-                    (!permissibleInjected && !forgeCommand.getRequirement().test(listener)))
-                return true;
-        } else {
-            if (!forgeCommand.getRequirement().test(listener)) return true;
-        }
-
+        if (!forgeCommand.getRequirement().test(listener)) return true;
         dispatcher.setForgeCommand(true);
         dispatcher.performPrefixedCommand(listener, "/"+toDispatcher(args, getName()), "/"+toDispatcher(args, commandLabel));
         dispatcher.setForgeCommand(false);

src/main/java/org/kettingpowered/ketting/command/KettingForwardingHandler.java

@@ -8,6 +8,7 @@
 import net.minecraftforge.server.permission.nodes.PermissionTypes;
 import org.bukkit.Bukkit;
 import org.kettingpowered.ketting.internal.KettingConstants;
+import org.kettingpowered.ketting.utils.PermissionHelper;
 
 import java.util.Set;
 import java.util.UUID;
@@ -18,6 +19,7 @@ public class KettingForwardingHandler implements IPermissionHandler {
 
     public KettingForwardingHandler(IPermissionHandler delegate) {
         this.delegate = delegate;
+        PermissionHelper.injectPermissions(getRegisteredNodes());
     }
 
     public ResourceLocation getIdentifier() {
@@ -29,19 +31,29 @@ public Set<PermissionNode<?>> getRegisteredNodes() {
     }
 
     public <T> T getPermission(ServerPlayer player, PermissionNode<T> node, PermissionDynamicContext<?>... context) {
-        if (node.getType() == PermissionTypes.BOOLEAN) {
-            return (T) (Object) player.getBukkitEntity().hasPermission(node.getNodeName());
-        } else {
-            return delegate.getPermission(player, node, context);
+        try {
+            if (node.getType() == PermissionTypes.BOOLEAN) {
+                PermissionHelper.MODDED_CONTEXT = context;
+                return (T) (Object) player.getBukkitEntity().hasPermission(node.getNodeName());
+            } else {
+                return delegate.getPermission(player, node, context);
+            }
+        } finally {
+            PermissionHelper.MODDED_CONTEXT = PermissionHelper.MODDED_CONTEXT_EMPTY;
         }
     }
 
     public <T> T getOfflinePermission(UUID uuid, PermissionNode<T> node, PermissionDynamicContext<?>... context) {
-        var player = Bukkit.getPlayer(uuid);
-        if (player != null && node.getType() == PermissionTypes.BOOLEAN) {
-            return (T) (Object) player.hasPermission(node.getNodeName());
-        } else {
-            return delegate.getOfflinePermission(uuid, node, context);
+        try {
+            var player = Bukkit.getPlayer(uuid);
+            if (player != null && node.getType() == PermissionTypes.BOOLEAN) {
+                PermissionHelper.MODDED_CONTEXT = context;
+                return (T) (Object) player.hasPermission(node.getNodeName());
+            } else {
+                return delegate.getOfflinePermission(uuid, node, context);
+            }
+        } finally {
+            PermissionHelper.MODDED_CONTEXT = PermissionHelper.MODDED_CONTEXT_EMPTY;
         }
     }
 }

src/main/java/org/kettingpowered/ketting/config/KettingConfig.java

@@ -23,7 +23,7 @@ public KettingConfig(@NotNull String fileName) {
                 "Github: https://github.com/kettingpowered/",
                 "Discord: https://discord.kettingpowered.org/",
                 ""
-        }, fileName, 3);
+        }, fileName, 4);
         load();
     }
 
@@ -33,7 +33,7 @@ public KettingConfig(@NotNull String fileName) {
     public final BooleanValue WARN_ON_NULL_NBT = new BooleanValue("debug.warn_on_null_nbt", true, "Print a warning to the console when something tries to set a null NBT tag.");
     public final BooleanValue WARN_ON_UNKNOWN_STRUCTURE_TYPE = new BooleanValue("debug.warn_on_unknown_structure_type", true, "Print a warning to the console when a structure type is unknown to Bukkit.");
 
-    public final BooleanValue OVERWRITE_FORGE_PERMISSIONS = new BooleanValue("forge.overwrite_forge_permissions", false, "--- WARNING - THIS WILL COMPLETELY DISABLE FORGE PERMISSION CHECKS ---  Overwrite Forge permissions with Bukkit permissions, makes it possible to use a permission manager plugin for modded commands. If true, Forge permissions will be set to 'forge.command.MODDEDCOMMAND' where MODDEDCOMMAND is the name of the modded command.");
+    public final BooleanValue REROUTE_FORGE_COMMAND_PERMISSIONS = new BooleanValue("ketting.reroute_forge_command_permissions", false, "If true, Ketting will reroute Forge command permissions to Bukkit permissions. This is useful if you want to use a permission plugin like LuckPerms with Forge commands.");
     public final BooleanValue SILENCE_PARSING_ERRORS = new BooleanValue("forge.silence_parsing_errors", true, "If true, this will minimize some general parsing errors from appearing in the console");
 
     public final BooleanValue MERGE_WORLD_SYSTEMS = new BooleanValue("ketting.merge_world_systems", false, "If true, this will attempt to merge both the Forge and Bukkit world system into one, making dimensions exist in the world folder, and Bukkit worlds in their own folder.");

src/main/java/org/kettingpowered/ketting/utils/PermissionHelper.java

@@ -0,0 +1,69 @@
+package org.kettingpowered.ketting.utils;
+
+import com.mojang.brigadier.tree.CommandNode;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraftforge.server.permission.nodes.PermissionDynamicContext;
+import net.minecraftforge.server.permission.nodes.PermissionNode;
+import net.minecraftforge.server.permission.nodes.PermissionTypes;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_20_R1.command.VanillaCommandWrapper;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
+import org.kettingpowered.ketting.command.ForgeCommand;
+import org.kettingpowered.ketting.command.ForgeCommandWrapper;
+import org.kettingpowered.ketting.config.KettingConfig;
+import org.kettingpowered.ketting.inject.ForgeInject;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+
+public final class PermissionHelper {
+
+    public static final Map<String, PermissionNode.PermissionResolver<Boolean>> MODDED_RESOLVERS = new HashMap<>();
+
+    public static final PermissionDynamicContext<?>[] MODDED_CONTEXT_EMPTY = new PermissionDynamicContext[0];
+    public static PermissionDynamicContext<?>[] MODDED_CONTEXT = MODDED_CONTEXT_EMPTY;
+
+    public static boolean getModdedValue(String name, ServerPlayer player) {
+        if (player == null)
+            throw new IllegalArgumentException("Player cannot be null");
+
+        PermissionNode.PermissionResolver<Boolean> resolver = MODDED_RESOLVERS.get(name);
+        return resolver != null && resolver.resolve(player, player.getUUID(), MODDED_CONTEXT);
+    }
+
+    public static void injectPermissions(Set<PermissionNode<?>> nodes) {
+        nodes.forEach(node -> {
+            if (node.getType() != PermissionTypes.BOOLEAN) return;
+
+            String name = node.getNodeName();
+            String description = node.getDescription() == null ? "" : node.getDescription().getString();
+            Bukkit.getServer().getPluginManager().addPermission(new Permission(name, description, PermissionDefault.MODDED));
+            ForgeInject.debug("Registering boolean permission {} to Bukkit", name);
+            MODDED_RESOLVERS.put(name, (PermissionNode.PermissionResolver<Boolean>) node.getDefaultResolver());
+        });
+    }
+
+    public static boolean handlePermission(CraftPlayer player, String permission, Supplier<Boolean> delegate) {
+        Permission perm = Bukkit.getServer().getPluginManager().getPermission(permission);
+        return perm == null ? delegate.get() : handlePermission(player, perm, delegate);
+    }
+
+    public static boolean handlePermission(CraftPlayer player, Permission permission, Supplier<Boolean> delegate) {
+        if (!player.isPermissionSet(permission) && permission.getDefault() == PermissionDefault.MODDED)
+            return getModdedValue(permission.getName(), player.getHandle());
+        return delegate.get();
+    }
+
+    public static boolean handleSourceStackPermission(CommandSourceStack stack, CommandNode node, int permissionLevel) {
+        if (ForgeCommand.checkIfForgeCommand(node))
+            return KettingConfig.getInstance().REROUTE_FORGE_COMMAND_PERMISSIONS.getValue()
+                    ? ((stack.getLevel() == null) && stack.permissionLevel >= permissionLevel) || stack.getBukkitSender().hasPermission(ForgeCommandWrapper.getPermission(node))
+                    : stack.permissionLevel >= permissionLevel;
+        return stack.hasPermission(permissionLevel, VanillaCommandWrapper.getPermission(node));
+    }
+}

src/main/resources/META-INF/accesstransformer.cfg

@@ -469,6 +469,8 @@ private-f net.minecraft.world.level.storage.loot.LootPool f_79028_ # rolls
 private-f net.minecraft.world.level.storage.loot.LootPool f_79029_ # bonusRolls
 
 #group KETTING
+public net.minecraft.commands.CommandSourceStack f_81291_ # permissionLevel
+
 public net.minecraft.world.entity.projectile.ThrownTrident f_37555_ # tridentItem
 public net.minecraft.world.level.block.entity.SkullBlockEntity m_292605_(Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture; # fillProfileTextures
 public net.minecraft.world.level.Level m_142646_()Lnet/minecraft/world/level/entity/LevelEntityGetter; # getEntities