From b2a072c45cc61ecdd43f8908376af7763d2633a8 Mon Sep 17 00:00:00 2001 From: PssbleTrngle Date: Fri, 6 May 2022 19:55:28 +0200 Subject: [PATCH] LuckPerms permission provider for offline support --- fabric-1.18.2/build.gradle | 2 + .../dynmap/fabric_1_18_2/DynmapPlugin.java | 11 +- .../permissions/FabricPermissions.java | 5 +- .../permissions/LuckPermissions.java | 105 ++++++++++++++++++ 4 files changed, 116 insertions(+), 7 deletions(-) create mode 100644 fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/permissions/LuckPermissions.java diff --git a/fabric-1.18.2/build.gradle b/fabric-1.18.2/build.gradle index ed2622e5..c5e0e773 100644 --- a/fabric-1.18.2/build.gradle +++ b/fabric-1.18.2/build.gradle @@ -18,6 +18,7 @@ configurations { } repositories { + mavenCentral() maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } @@ -32,6 +33,7 @@ dependencies { shadow project(path: ':DynmapCore', configuration: 'shadow') modCompileOnly "me.lucko:fabric-permissions-api:0.1-SNAPSHOT" + compileOnly 'net.luckperms:api:5.4' } processResources { diff --git a/fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/DynmapPlugin.java b/fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/DynmapPlugin.java index 818e9ed9..f75589c0 100644 --- a/fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/DynmapPlugin.java +++ b/fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/DynmapPlugin.java @@ -49,10 +49,7 @@ import org.dynmap.fabric_1_18_2.event.CustomServerChunkEvents; import org.dynmap.fabric_1_18_2.event.CustomServerLifecycleEvents; import org.dynmap.fabric_1_18_2.event.PlayerEvents; import org.dynmap.fabric_1_18_2.mixin.BiomeEffectsAccessor; -import org.dynmap.fabric_1_18_2.permissions.FabricPermissions; -import org.dynmap.fabric_1_18_2.permissions.FilePermissions; -import org.dynmap.fabric_1_18_2.permissions.OpPermissions; -import org.dynmap.fabric_1_18_2.permissions.PermissionProvider; +import org.dynmap.fabric_1_18_2.permissions.*; import org.dynmap.permissions.PermissionsHandler; import org.dynmap.renderer.DynmapBlockState; @@ -405,7 +402,11 @@ public class DynmapPlugin { /* Set up player login/quit event handler */ registerPlayerLoginListener(); - if (FabricLoader.getInstance().isModLoaded("fabric-permissions-api-v0")) { + if (FabricLoader.getInstance().isModLoaded("luckperms")) { + Log.info("Using luckperms for access control"); + permissions = new LuckPermissions(); + } + else if (FabricLoader.getInstance().isModLoaded("fabric-permissions-api-v0")) { Log.info("Using fabric-permissions-api for access control"); permissions = new FabricPermissions(); } else { diff --git a/fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/permissions/FabricPermissions.java b/fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/permissions/FabricPermissions.java index 8cd65ece..feb58ac2 100644 --- a/fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/permissions/FabricPermissions.java +++ b/fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/permissions/FabricPermissions.java @@ -2,16 +2,17 @@ package org.dynmap.fabric_1_18_2.permissions; import me.lucko.fabric.api.permissions.v0.Permissions; import net.minecraft.entity.player.PlayerEntity; -import org.dynmap.DynmapCore; import org.dynmap.Log; -import org.dynmap.fabric_1_18_2.DynmapMod; import org.dynmap.fabric_1_18_2.DynmapPlugin; +import org.dynmap.json.simple.parser.JSONParser; import java.util.Set; import java.util.stream.Collectors; public class FabricPermissions implements PermissionProvider { + private final JSONParser parser = new JSONParser(); + private String permissionKey(String perm) { return "dynmap." + perm; } diff --git a/fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/permissions/LuckPermissions.java b/fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/permissions/LuckPermissions.java new file mode 100644 index 00000000..f98fd208 --- /dev/null +++ b/fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/permissions/LuckPermissions.java @@ -0,0 +1,105 @@ +package org.dynmap.fabric_1_18_2.permissions; + +import me.lucko.fabric.api.permissions.v0.Permissions; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.cacheddata.CachedPermissionData; +import net.luckperms.api.model.user.User; +import net.luckperms.api.util.Tristate; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.server.MinecraftServer; +import org.dynmap.Log; +import org.dynmap.fabric_1_18_2.DynmapPlugin; +import org.dynmap.json.simple.JSONArray; +import org.dynmap.json.simple.JSONObject; +import org.dynmap.json.simple.parser.JSONParser; +import org.dynmap.json.simple.parser.ParseException; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + +public class LuckPermissions implements PermissionProvider { + + private final JSONParser parser = new JSONParser(); + private LuckPerms api = null; + + private Optional getApi() { + if (api != null) return Optional.of(api); + try { + api = LuckPermsProvider.get(); + return Optional.of(api); + } catch (Exception ex) { + Log.warning("Trying to access LuckPerms before it has loaded"); + return Optional.empty(); + } + } + + private Optional cachedUUID(String username) { + try { + BufferedReader reader = new BufferedReader(new FileReader(MinecraftServer.USER_CACHE_FILE)); + JSONArray cache = (JSONArray) parser.parse(reader); + for (Object it : cache) { + JSONObject user = (JSONObject) it; + if (user.get("name").toString().equalsIgnoreCase(username)) { + String uuid = user.get("uuid").toString(); + Log.info("Found cached UUID for " + username + ": " + uuid); + return Optional.of(UUID.fromString(uuid)); + } + } + + reader.close(); + } catch (IOException | ParseException ex) { + Log.warning("Unable to read usercache.json"); + } + + return Optional.empty(); + } + + private String permissionKey(String perm) { + return "dynmap." + perm; + } + + @Override + public Set hasOfflinePermissions(String player, Set perms) { + Log.info("Requesting offline permissions: " + String.join(",", perms) + " for " + player); + return perms.stream() + .filter(perm -> hasOfflinePermission(player, perm)) + .collect(Collectors.toSet()); + } + + @Override + public boolean hasOfflinePermission(String player, String perm) { + Log.info("Requesting offline permission: " + perm + " for " + player); + if (DynmapPlugin.plugin.isOp(player.toLowerCase())) return true; + Optional api = getApi(); + Optional uuid = cachedUUID(player); + if (!uuid.isPresent() || !api.isPresent()) return false; + User user = api.get().getUserManager().loadUser(uuid.get()).join(); + CachedPermissionData permissions = user.getCachedData().getPermissionData(); + Tristate state = permissions.checkPermission(permissionKey(perm)); + return state.asBoolean(); + } + + @Override + public boolean has(PlayerEntity player, String permission) { + Log.info("Requesting privilege: " + permission); + return player != null && Permissions.check(player, permissionKey(permission)); + } + + @Override + public boolean hasPermissionNode(PlayerEntity player, String permission) { + if (player != null) { + String name = player.getName().getString().toLowerCase(); + Log.info("Requesting permission node: " + permission + " for " + name); + return DynmapPlugin.plugin.isOp(name); + } + Log.info("Requesting permission node: " + permission); + return false; + } + +}