Sponge 7.0 permissions for 1.12.2 Forge

This commit is contained in:
Mike Primm 2020-06-27 19:59:49 -05:00
parent 6efaa8187b
commit c258c5efa4
3 changed files with 96 additions and 1 deletions

View file

@ -17,6 +17,7 @@ dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
compile 'com.googlecode.json-simple:json-simple:1.1.1'
compile 'org.yaml:snakeyaml:1.23'
compile 'org.spongepowered:spongeapi:7.0.0'
}
sourceCompatibility = 1.8
@ -28,6 +29,10 @@ repositories {
name = 'forge'
url = 'http://files.minecraftforge.net/maven'
}
maven {
name = 'sponge'
url = 'https://repo.spongepowered.org/maven'
}
}
minecraft {
version = "1.12.2-14.23.4.2705"

View file

@ -102,6 +102,7 @@ import org.dynmap.forge_1_12_2.DynmapMod;
import org.dynmap.forge_1_12_2.permissions.FilePermissions;
import org.dynmap.forge_1_12_2.permissions.OpPermissions;
import org.dynmap.forge_1_12_2.permissions.PermissionProvider;
import org.dynmap.forge_1_12_2.permissions.Sponge7Permissions;
import org.dynmap.permissions.PermissionsHandler;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.utils.DynIntHashMap;
@ -1474,7 +1475,10 @@ public class DynmapPlugin
/* Set up player login/quit event handler */
registerPlayerLoginListener();
/* Initialize permissions handler */
permissions = FilePermissions.create();
permissions = Sponge7Permissions.create();
if (permissions == null) {
permissions = FilePermissions.create();
}
if(permissions == null) {
permissions = new OpPermissions(new String[] { "webchat", "marker.icons", "marker.list", "webregister", "stats", "hide.self", "show.self" });
}

View file

@ -0,0 +1,86 @@
package org.dynmap.forge_1_12_2.permissions;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import org.dynmap.Log;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.entity.living.player.Player;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
public class Sponge7Permissions implements PermissionProvider {
public static Sponge7Permissions create() {
try {
Class.forName("org.spongepowered.api.Sponge"); /* See if class exists */
} catch (ClassNotFoundException cnfx) {
return null;
}
Log.info("Using Sponge Permissions for access control");
Log.info("Web interface permissions only available for online users");
return new Sponge7Permissions();
}
private Sponge7Permissions() {
}
@Override
public boolean has(ICommandSender sender, String permission) {
if(sender instanceof EntityPlayerMP) {
boolean rc = false;
EntityPlayerMP player = (EntityPlayerMP) sender;
Optional<Player> p = Sponge.getServer().getPlayer(player.getUniqueID());
if (p.isPresent()) {
rc = p.get().hasPermission("dynmap." + permission);
}
return rc;
}
return true;
}
@Override
public boolean hasPermissionNode(ICommandSender sender, String permission) {
if(sender instanceof EntityPlayerMP) {
boolean rc = false;
EntityPlayerMP player = (EntityPlayerMP) sender;
Optional<Player> p = Sponge.getServer().getPlayer(player.getUniqueID());
if (p.isPresent()) {
rc = p.get().hasPermission("dynmap." + permission);
}
return rc;
}
return true;
}
@Override
public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
HashSet<String> rslt = new HashSet<String>();
Optional<Player> p = Sponge.getServer().getPlayer(player);
if (p.isPresent()) {
Player plyr = p.get();
for (String perm : perms) {
if (plyr.hasPermission("dynmap." + perm)) {
rslt.add(perm);
}
}
}
return rslt;
}
@Override
public boolean hasOfflinePermission(String player, String perm) {
Optional<Player> p = Sponge.getServer().getPlayer(player);
if (p.isPresent()) {
Player plyr = p.get();
return plyr.hasPermission("dynmap." + perm);
}
return false;
}
}