feat: re-implement permissions

emortalmc · Nov 30, 2024 · fdd1be7 · fdd1be7
1 parent bf190ce
commit fdd1be7
Show file tree

Hide file tree

Showing 12 changed files with 149 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,8 +20,10 @@ repositories {
 
 dependencies {
     // Minestom
-    api("net.minestom:minestom-snapshots:c148954a47")
+    api("net.minestom:minestom-snapshots:1_21_2-0b0a3aba23")
     api("net.kyori:adventure-text-minimessage:4.15.0")
+    compileOnly("com.github.TogAr2:MinestomPvP:04180ddf9a") // MinestomPvP - Used for PvP Player impl
+
     implementation("io.pyroscope:agent:0.14.0")
 
     // Logger

diff --git a/src/main/java/dev/emortal/minestom/core/EntrypointTest.java b/src/main/java/dev/emortal/minestom/core/EntrypointTest.java
@@ -1,6 +1,7 @@
 package dev.emortal.minestom.core;
 
 import dev.emortal.minestom.core.module.monitoring.MonitoringModule;
+import dev.emortal.minestom.core.module.permissions.PermissionHolder;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.command.CommandManager;
 import net.minestom.server.command.builder.Command;
@@ -51,7 +52,11 @@ public static void main(String[] args) {
         command.addSyntax((sender, context) -> sender.sendMessage("Hello world 2!"), required, optional);
 
         Command testPermsCmd = new Command("testperms");
-        testPermsCmd.setCondition((sender, commandName) -> sender.hasPermission("command.testperms"));
+        testPermsCmd.setCondition((sender, commandName) -> {
+            if (!(sender instanceof PermissionHolder permHolder)) return false;
+
+            return permHolder.hasPermission("command.testperms");
+        });
         testPermsCmd.setDefaultExecutor((sender, context) -> sender.sendMessage("works :)"));
 
         CommandManager commandManager = MinecraftServer.getCommandManager();

diff --git a/src/main/java/dev/emortal/minestom/core/module/chat/ChatModule.java b/src/main/java/dev/emortal/minestom/core/module/chat/ChatModule.java
@@ -48,7 +48,7 @@ public boolean onLoad() {
 
             Player player = event.getPlayer();
             var message = ChatMessage.newBuilder()
-                    .setMessage(event.getMessage())
+                    .setMessage(event.getRawMessage())
                     .setSenderId(player.getUuid().toString())
                     .setSenderUsername(player.getUsername())
                     .build();

diff --git a/src/main/java/dev/emortal/minestom/core/module/core/CoreModule.java b/src/main/java/dev/emortal/minestom/core/module/core/CoreModule.java
@@ -7,6 +7,7 @@
 import dev.emortal.minestom.core.module.MinestomModule;
 import dev.emortal.minestom.core.module.core.badge.BadgeCommand;
 import dev.emortal.minestom.core.module.core.performance.PerformanceCommand;
+import dev.emortal.minestom.core.module.core.playerprovider.EmortalPlayerImpl;
 import dev.emortal.minestom.core.utils.resolver.PlayerResolver;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.command.CommandManager;
@@ -21,6 +22,8 @@ public CoreModule(@NotNull ModuleEnvironment environment) {
 
     @Override
     public boolean onLoad() {
+        MinecraftServer.getConnectionManager().setPlayerProvider(EmortalPlayerImpl::new);
+
         McPlayerService playerService = GrpcStubCollection.getPlayerService().orElse(null);
         PlayerResolver playerResolver = new PlayerResolver(playerService, MinecraftServer.getConnectionManager());
 

diff --git a/src/main/java/dev/emortal/minestom/core/module/core/playerprovider/EmortalCombatPlayer.java b/src/main/java/dev/emortal/minestom/core/module/core/playerprovider/EmortalCombatPlayer.java
@@ -0,0 +1,25 @@
+package dev.emortal.minestom.core.module.core.playerprovider;
+
+import dev.emortal.minestom.core.module.permissions.Permission;
+import io.github.togar2.pvp.player.CombatPlayerImpl;
+import net.minestom.server.network.player.PlayerConnection;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+// This class should be instantiated instead of CombatPlayerImpl by any games that use the Emortal API
+@SuppressWarnings("unused")
+public class EmortalCombatPlayer extends CombatPlayerImpl implements EmortalPlayer {
+    private final @NotNull Set<Permission> permissions = new CopyOnWriteArraySet<>();
+
+    public EmortalCombatPlayer(@NotNull UUID uuid, @NotNull String username, @NotNull PlayerConnection playerConnection) {
+        super(uuid, username, playerConnection);
+    }
+
+    @Override
+    public @NotNull Set<Permission> getPermissions() {
+        return this.permissions;
+    }
+}
diff --git a/src/main/java/dev/emortal/minestom/core/module/core/playerprovider/EmortalPlayer.java b/src/main/java/dev/emortal/minestom/core/module/core/playerprovider/EmortalPlayer.java
@@ -0,0 +1,8 @@
+package dev.emortal.minestom.core.module.core.playerprovider;
+
+import dev.emortal.minestom.core.module.permissions.PermissionHolder;
+
+public interface EmortalPlayer extends PermissionHolder {
+
+
+}
diff --git a/src/main/java/dev/emortal/minestom/core/module/core/playerprovider/EmortalPlayerImpl.java b/src/main/java/dev/emortal/minestom/core/module/core/playerprovider/EmortalPlayerImpl.java
@@ -0,0 +1,24 @@
+package dev.emortal.minestom.core.module.core.playerprovider;
+
+import dev.emortal.minestom.core.module.permissions.Permission;
+import dev.emortal.minestom.core.module.permissions.PermissionHolder;
+import net.minestom.server.entity.Player;
+import net.minestom.server.network.player.GameProfile;
+import net.minestom.server.network.player.PlayerConnection;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+public class EmortalPlayerImpl extends Player implements EmortalPlayer {
+    private final @NotNull Set<Permission> permissions = new CopyOnWriteArraySet<>();
+
+    public EmortalPlayerImpl(@NotNull PlayerConnection playerConnection, @NotNull GameProfile gameProfile) {
+        super(playerConnection, gameProfile);
+    }
+
+    @Override
+    public @NotNull Set<Permission> getPermissions() {
+        return this.permissions;
+    }
+}
diff --git a/src/main/java/dev/emortal/minestom/core/module/permissions/Permission.java b/src/main/java/dev/emortal/minestom/core/module/permissions/Permission.java
@@ -0,0 +1,11 @@
+package dev.emortal.minestom.core.module.permissions;
+
+import org.jetbrains.annotations.NotNull;
+
+public record Permission(@NotNull String permission, boolean state) {
+
+    public Permission(@NotNull String permission) {
+        this(permission, true);
+    }
+
+}
diff --git a/src/main/java/dev/emortal/minestom/core/module/permissions/PermissionCache.java b/src/main/java/dev/emortal/minestom/core/module/permissions/PermissionCache.java
@@ -12,7 +12,6 @@
 import net.minestom.server.event.EventNode;
 import net.minestom.server.event.player.AsyncPlayerConfigurationEvent;
 import net.minestom.server.event.player.PlayerDisconnectEvent;
-import net.minestom.server.permission.Permission;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65,6 +64,8 @@ private void loadRoles() {
      * @param player the player to load
      */
     private void loadUser(@NotNull Player player) {
+        PermissionHolder permHolder = (PermissionHolder) player;
+
         PlayerRolesResponse response;
         try {
             response = this.permissionService.getPlayerRoles(player.getUuid());
@@ -85,8 +86,8 @@ private void loadUser(@NotNull Player player) {
             permissions.addAll(role.permissions());
         }
 
-        player.getAllPermissions().clear();
-        player.getAllPermissions().addAll(permissions);
+        permHolder.getPermissions().clear();
+        permHolder.getPermissions().addAll(permissions);
     }
 
     private void updateUserPermissions(@NotNull User user) {
@@ -95,11 +96,12 @@ private void updateUserPermissions(@NotNull User user) {
             LOGGER.error("Couldn't find player with id {}", user.id());
             return;
         }
+        PermissionHolder permHolder = (PermissionHolder) player;
 
         Set<Permission> permissions = this.calculatePerms(user.roleIds());
         this.userCache.put(user.id(), user);
-        player.getAllPermissions().clear();
-        player.getAllPermissions().addAll(permissions);
+        permHolder.getPermissions().clear();
+        permHolder.getPermissions().addAll(permissions);
 
         player.refreshCommands();
     }

diff --git a/src/main/java/dev/emortal/minestom/core/module/permissions/PermissionHolder.java b/src/main/java/dev/emortal/minestom/core/module/permissions/PermissionHolder.java
@@ -0,0 +1,55 @@
+package dev.emortal.minestom.core.module.permissions;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+import java.util.regex.Pattern;
+
+public interface PermissionHolder {
+
+    @NotNull Set<Permission> getPermissions();
+
+    default void addPermission(@NotNull Permission permission) {
+        this.getPermissions().add(permission);
+    }
+
+    default void removePermission(@NotNull Permission permission) {
+        this.getPermissions().remove(permission);
+    }
+
+    default void removePermission(@NotNull String permission) {
+        this.getPermissions().removeIf(p -> p.permission().equals(permission));
+    }
+
+    default boolean hasPermission(@NotNull Permission permission) {
+        for (Permission permissionLoop : this.getPermissions()) {
+            if (permissionLoop.equals(permission)) {
+                return true;
+            }
+            String permissionLoopName = permissionLoop.permission();
+            if (permissionLoopName.contains("*")) {
+                // Sanitize permissionLoopName
+                String regexSanitized = Pattern.quote(permissionLoopName).replace("*", "\\E(.*)\\Q"); // Replace * with regex
+                // pattern matching for wildcards, where foo.b*r.baz matches foo.baaaar.baz or foo.bar.baz
+                if (permission.permission().matches(regexSanitized)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    default boolean hasPermission(@NotNull String permission) {
+        return this.hasPermission(new Permission(permission, true));
+    }
+
+    default Permission getPermission(@NotNull String permission) {
+        for (Permission permissionLoop : this.getPermissions()) {
+            if (permissionLoop.permission().equals(permission)) {
+                return permissionLoop;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/main/java/dev/emortal/minestom/core/module/permissions/PermissionModule.java b/src/main/java/dev/emortal/minestom/core/module/permissions/PermissionModule.java
@@ -9,7 +9,6 @@
 import dev.emortal.minestom.core.module.MinestomModule;
 import dev.emortal.minestom.core.module.messaging.MessagingModule;
 import net.minestom.server.event.player.AsyncPlayerConfigurationEvent;
-import net.minestom.server.permission.Permission;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -34,7 +33,7 @@ public boolean onLoad() {
         if (!ENABLED) {
             if (GRANT_ALL_PERMISSIONS) {
                 LOGGER.warn("Permission service is not available, granting all permissions");
-                this.eventNode.addListener(AsyncPlayerConfigurationEvent.class, event -> event.getPlayer().addPermission(new Permission("*")));
+                this.eventNode.addListener(AsyncPlayerConfigurationEvent.class, event -> ((PermissionHolder) event.getPlayer()).addPermission(new Permission("*")));
             } else {
                 LOGGER.warn("Permission service is not available, denying all permissions");
             }

diff --git a/src/main/java/dev/emortal/minestom/core/utils/command/ExtraConditions.java b/src/main/java/dev/emortal/minestom/core/utils/command/ExtraConditions.java
@@ -1,12 +1,16 @@
 package dev.emortal.minestom.core.utils.command;
 
+import dev.emortal.minestom.core.module.permissions.PermissionHolder;
 import net.minestom.server.command.builder.condition.CommandCondition;
 import org.jetbrains.annotations.NotNull;
 
 public final class ExtraConditions {
 
     public static @NotNull CommandCondition hasPermission(@NotNull String permission) {
-        return (sender, commandName) -> sender.hasPermission(permission);
+        return (sender, commandName) -> {
+            if (!(sender instanceof PermissionHolder permHolder)) return false;
+            return permHolder.hasPermission(permission);
+        };
     }
 
     private ExtraConditions() {