Handle explicitly denied permissions with no perms plugin (#3419)

to finally end the `/hat` saga, hopefully for good
This commit is contained in:
zml 2020-07-06 11:40:47 -07:00 committed by GitHub
parent 01b9ec4a42
commit 016a1b3421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 1 deletions

View File

@ -3,7 +3,9 @@ package com.earth2me.essentials.perm.impl;
import com.earth2me.essentials.perm.IPermissionsHandler;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.permissions.Permission;
import org.bukkit.plugin.Plugin;
import org.bukkit.scheduler.BukkitRunnable;
import java.util.Arrays;
import java.util.List;
@ -36,6 +38,41 @@ public class SuperpermsHandler implements IPermissionsHandler {
return hasPermission(base, "group." + group);
}
/**
* Return whether a permission is registered and denied to ops.
*
* <p>The default permission value is {@link org.bukkit.permissions.PermissionDefault#OP}, so for a permission
* to be denied to ops it has to be both explicitly registered and have its default evaluate to false for an operator</p>
*
* @param node node to check
* @return whether an op would, in absense of other permissions being set, have
*/
private boolean isDeniedToOps(final String node) {
final Permission perm = Bukkit.getServer().getPluginManager().getPermission(node);
return perm != null && !perm.getDefault().getValue(true);
}
/**
* Perform a permissions check on {@code base}.
*
* <p>Unless {@link #emulateWildcards()} is overridden to disable wildcard emulation,
* wildcard assignments will be checked for permissions. This has a few subtleties in order
* to respect default-false assignments. {@link org.bukkit.permissions.Permissible#isPermissionSet(String)}
* will only return true for permissions that are set on an attachment, or that are a default that evaluates to true.
* When resolving wildcards, we also want to detect permissions that are not in an attachment, but also won't evaluate
* to true for operators &em; since these are ones we've explicitly set to {@code false} in the {@code plugin.yml}</p>
*
* <p>For the resolution itself, we check whether the permission is either set on the permissible or explicitly not
* granted to ops (i.e. deviating from the default). If so, the permission's value is returned. Otherwise, the portion
* of the permission from the beginning to the last occurrence of {@code .} followed by a {@code *} is taken and the process is repeated.</p>
*
* <p>Once a string without dots has been checked, if no result has been found the literal permission {@code *} is
* checked and the result of that check is returned.</p>
*
* @param base Player to check permissions on
* @param node permission to check
* @return calculated value
*/
@Override
public boolean hasPermission(final Player base, String node) {
if (!emulateWildcards()) {
@ -45,7 +82,9 @@ public class SuperpermsHandler implements IPermissionsHandler {
String permCheck = node;
int index;
while (true) {
if (base.isPermissionSet(permCheck)) {
// Either explicitly set on the subject, or globally set to not be automatically granted
// by declaring in `plugin.yml` with a `default: false` value (as opposed to the default default value of OP)
if (base.isPermissionSet(permCheck) || isDeniedToOps(node)) {
return base.hasPermission(permCheck);
}