From 6afb0d9b92133774138f426c7acbe08a671ea4ff Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sat, 31 Mar 2012 00:23:22 -0500 Subject: [PATCH] Add webchat-permissions setting, fix bPerms, PermissionsBukkit --- .../java/org/dynmap/bukkit/DynmapPlugin.java | 4 +- .../bukkit/permissions/BukkitPermissions.java | 24 +++++++---- .../permissions/NijikokunPermissions.java | 4 ++ .../permissions/PermBukkitPermissions.java | 41 ++++--------------- .../bukkit/permissions/bPermPermissions.java | 20 +-------- src/main/resources/configuration.txt | 5 ++- 6 files changed, 37 insertions(+), 61 deletions(-) diff --git a/src/main/java/org/dynmap/bukkit/DynmapPlugin.java b/src/main/java/org/dynmap/bukkit/DynmapPlugin.java index d1074bfc..762b94d7 100644 --- a/src/main/java/org/dynmap/bukkit/DynmapPlugin.java +++ b/src/main/java/org/dynmap/bukkit/DynmapPlugin.java @@ -457,11 +457,11 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI { if (permissions == null) permissions = bPermPermissions.create(getServer(), "dynmap", perdefs); if (permissions == null) - permissions = PermBukkitPermissions.create(getServer(), "dynmap"); + permissions = PermBukkitPermissions.create(getServer(), "dynmap", perdefs); if (permissions == null) permissions = NijikokunPermissions.create(getServer(), "dynmap"); if (permissions == null) - permissions = BukkitPermissions.create("dynmap"); + permissions = BukkitPermissions.create("dynmap", perdefs); if (permissions == null) permissions = new OpPermissions(new String[] { "fullrender", "cancelrender", "radiusrender", "resetstats", "reload", "purgequeue", "pause", "ips-for-id", "ids-for-ip", "add-id-for-ip", "del-id-for-ip" }); /* Get and initialize data folder */ diff --git a/src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java b/src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java index 0ccec8e2..f0646b97 100644 --- a/src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java +++ b/src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java @@ -1,6 +1,7 @@ package org.dynmap.bukkit.permissions; import java.util.HashSet; +import java.util.Map; import java.util.Set; import org.bukkit.Bukkit; @@ -10,20 +11,23 @@ import org.bukkit.entity.Player; import org.dynmap.Log; public class BukkitPermissions implements PermissionProvider { - String name; + protected String name; + protected Map pd; - public static BukkitPermissions create(String name) { + public static BukkitPermissions create(String name, Map pd) { try { Class.forName("org.bukkit.permissions.PermissibleBase"); /* See if class exists */ } catch (ClassNotFoundException cnfx) { return null; } Log.info("Using Bukkit Permissions (superperms) for access control"); - return new BukkitPermissions(name); + Log.info("Web interface perms only available for online users"); + return new BukkitPermissions(name, pd); } - public BukkitPermissions(String name) { + public BukkitPermissions(String name, Map pd) { this.name = name; + this.pd = pd; } @Override @@ -50,10 +54,16 @@ public class BukkitPermissions implements PermissionProvider { @Override public boolean hasOfflinePermission(String player, String perm) { - Player p = Bukkit.getPlayerExact(name); - if (p != null) + Player p = Bukkit.getPlayerExact(player); + if (p != null) { return p.hasPermission(name + "." + perm); - else + } + else { + OfflinePlayer op = Bukkit.getOfflinePlayer(player); + if((op != null) && op.isOp()) { + return true; + } return false; + } } } diff --git a/src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java b/src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java index 4a73b944..2a0dfc81 100644 --- a/src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java +++ b/src/main/java/org/dynmap/bukkit/permissions/NijikokunPermissions.java @@ -47,6 +47,8 @@ public class NijikokunPermissions implements PermissionProvider { @Override public Set hasOfflinePermissions(String player, Set perms) { + if(permissions == null) + permissions = ((Permissions)plugin).getHandler(); HashSet hasperms = new HashSet(); for (String pp : perms) { if (permissions.has(defworld, player, name + "." + pp)) { @@ -58,6 +60,8 @@ public class NijikokunPermissions implements PermissionProvider { @Override public boolean hasOfflinePermission(String player, String perm) { + if(permissions == null) + permissions = ((Permissions)plugin).getHandler(); return permissions.has(defworld, player, name + "." + perm); } diff --git a/src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java b/src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java index b0a870bf..6e7522db 100644 --- a/src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java +++ b/src/main/java/org/dynmap/bukkit/permissions/PermBukkitPermissions.java @@ -11,55 +11,30 @@ import org.bukkit.plugin.Plugin; import org.dynmap.Log; import com.nijiko.permissions.PermissionHandler; +import com.platymuus.bukkit.permissions.PermissionInfo; import com.platymuus.bukkit.permissions.PermissionsPlugin; import de.bananaco.bpermissions.api.ApiLayer; import de.bananaco.bpermissions.api.util.CalculableType; import de.bananaco.bpermissions.api.util.Permission; -public class PermBukkitPermissions implements PermissionProvider { - String name; +public class PermBukkitPermissions extends BukkitPermissions { PermissionsPlugin plugin; + Map pd; - public static PermBukkitPermissions create(Server server, String name) { + public static PermBukkitPermissions create(Server server, String name, Map pd) { Plugin permissionsPlugin = server.getPluginManager().getPlugin("PermissionsBukkit"); if (permissionsPlugin == null) return null; server.getPluginManager().enablePlugin(permissionsPlugin); Log.info("Using PermissionsBukkit " + permissionsPlugin.getDescription().getVersion() + " for access control"); - return new PermBukkitPermissions(permissionsPlugin, name); + return new PermBukkitPermissions(permissionsPlugin, name, pd); } - public PermBukkitPermissions(Plugin permissionsPlugin, String name) { - this.name = name; + public PermBukkitPermissions(Plugin permissionsPlugin, String name, Map pd) { + super(name, pd); plugin = (PermissionsPlugin) permissionsPlugin; - } - - @Override - public boolean has(CommandSender sender, String permission) { - Player player = sender instanceof Player ? (Player) sender : null; - return (player != null) ? plugin.getPlayerInfo(player.getName()).getPermissions().containsKey(name + "." + permission) : true; - } - - @Override - public Set hasOfflinePermissions(String player, Set perms) { - Map prm = plugin.getPlayerInfo(player).getPermissions(); - HashSet hasperms = new HashSet(); - for (String pp : perms) { - Boolean pb = prm.get(name + "." + pp); - if ((pb != null) && pb.booleanValue()) { - hasperms.add(pp); - } - } - return hasperms; - } - @Override - public boolean hasOfflinePermission(String player, String perm) { - Boolean b = plugin.getPlayerInfo(player).getPermissions().get(name + "." + perm); - if (b != null) - return b; - else - return false; + this.pd = pd; } } diff --git a/src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java b/src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java index 95283131..b85b220f 100644 --- a/src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java +++ b/src/main/java/org/dynmap/bukkit/permissions/bPermPermissions.java @@ -20,11 +20,8 @@ import de.bananaco.bpermissions.api.WorldManager; import de.bananaco.bpermissions.api.util.CalculableType; import de.bananaco.bpermissions.api.util.Permission; -public class bPermPermissions implements PermissionProvider { - String name; - String defworld; +public class bPermPermissions extends BukkitPermissions { WorldManager wm; - Map pd; public static bPermPermissions create(Server server, String name, Map pd) { Plugin permissionsPlugin = server.getPluginManager().getPlugin("bPermissions"); @@ -36,23 +33,10 @@ public class bPermPermissions implements PermissionProvider { } public bPermPermissions(String name, Map pd) { - this.name = name; - defworld = Bukkit.getServer().getWorlds().get(0).getName(); + super(name, pd); wm = WorldManager.getInstance(); - this.pd = pd; } - @Override - public boolean has(CommandSender sender, String permission) { - Player player = sender instanceof Player ? (Player) sender : null; - boolean rslt = true; - if(player != null) { - rslt = hasOfflinePermission(player.getName(), permission); - } - return rslt; - } - - @Override public Set hasOfflinePermissions(String player, Set perms) { HashSet hasperms = new HashSet(); diff --git a/src/main/resources/configuration.txt b/src/main/resources/configuration.txt index 06071784..f1746ad6 100644 --- a/src/main/resources/configuration.txt +++ b/src/main/resources/configuration.txt @@ -30,7 +30,8 @@ components: block-banned-player-chat: true # Require login for web-to-server chat (requires login-enabled: true) webchat-requires-login: false - + # If set to true, users must have dynmap.webchat permission in order to chat + webchat-permissions: false # # Optional - make players hidden when they are inside/underground/in shadows (#=light level: 0=full shadow,15=sky) # hideifshadow: 4 # # Optional - make player hidden when they are under cover (#=sky light level,0=underground,15=open to sky) @@ -53,6 +54,8 @@ components: # hideifsneaking: false # # Require login for web-to-server chat (requires login-enabled: true) # webchat-requires-login: false + # # If set to true, users must have dynmap.webchat permission in order to chat + # webchat-permissions: false - class: org.dynmap.SimpleWebChatComponent allowchat: true