worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue with Bukkit attachment permissions never being removed (#991)

Browse Source
This commit is contained in:
Luck 2018-05-13 14:06:05 +01:00
parent 5d34661a15
commit a0be1c7c48
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
6 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/src/main/java/me/lucko/luckperms/api/LocalizedNode.java
View File

@ -25,6 +25,8 @@
package me.lucko.luckperms.api;
import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.Immutable;
@ -36,6 +38,18 @@ import javax.annotation.concurrent.Immutable;
@Immutable
public interface LocalizedNode extends Node {
/**
* Returns a predicate which unwraps the localised node parameter before delegating
* the handling to the provided predicate.
*
* @param delegate the delegate predicate.
* @return the composed predicate
* @since 4.3
*/
static Predicate<? super LocalizedNode> composedPredicate(Predicate<Node> delegate) {
return localizedNode -> delegate.test(localizedNode.getNode());
}
/**
* Gets the delegate node
*

6
bukkit/src/main/java/me/lucko/luckperms/bukkit/model/permissible/LPPermissionAttachment.java
View File

@ -27,6 +27,7 @@ package me.lucko.luckperms.bukkit.model.permissible;
import com.google.common.base.Preconditions;
import me.lucko.luckperms.api.LocalizedNode;
import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.bukkit.model.dummy.DummyPlugin;
import me.lucko.luckperms.common.config.ConfigKeys;
@ -188,13 +189,14 @@ public class LPPermissionAttachment extends PermissionAttachment {
// remove transient permissions from the holder which were added by this attachment & equal the permission
User user = this.permissible.getUser();
user.removeIfTransient(n -> n instanceof ImmutableTransientNode && ((ImmutableTransientNode) n).getOwner() == this && n.getPermission().equals(name));
user.removeIfTransient(LocalizedNode.composedPredicate(n -> n instanceof ImmutableTransientNode && ((ImmutableTransientNode) n).getOwner() == this && n.getPermission().equals(name)));
}
private void clearInternal() {
// remove all transient permissions added by this attachment
User user = this.permissible.getUser();
user.removeIfTransient(n -> n instanceof ImmutableTransientNode && ((ImmutableTransientNode) n).getOwner() == this);
user.removeIfTransient(LocalizedNode.composedPredicate(n -> n instanceof ImmutableTransientNode && ((ImmutableTransientNode) n).getOwner() == this));
}
@Override

10
common/src/main/java/me/lucko/luckperms/common/model/NodeMap.java
View File

@ -227,13 +227,13 @@ public final class NodeMap {
setContent(multimap.values());
}
boolean removeIf(Predicate<? super Node> predicate) {
boolean removeIf(Predicate<? super LocalizedNode> predicate) {
boolean ret = this.map.values().removeIf(predicate);
this.inheritanceMap.values().removeIf(predicate);
return ret;
}
boolean removeIf(ContextSet contextSet, Predicate<? super Node> predicate) {
boolean removeIf(ContextSet contextSet, Predicate<? super LocalizedNode> predicate) {
ImmutableContextSet context = contextSet.makeImmutable();
SortedSet<LocalizedNode> nodes = this.map.get(context);
boolean ret = nodes.removeIf(predicate);
@ -241,12 +241,12 @@ public final class NodeMap {
return ret;
}
boolean auditTemporaryNodes(@Nullable Set<Node> removed) {
boolean auditTemporaryNodes(@Nullable Set<? super LocalizedNode> removed) {
boolean work = false;
Iterator<? extends Node> it = this.map.values().iterator();
Iterator<? extends LocalizedNode> it = this.map.values().iterator();
while (it.hasNext()) {
Node entry = it.next();
LocalizedNode entry = it.next();
if (entry.hasExpired()) {
if (removed != null) {
removed.add(entry);

12
common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java
View File

@ -261,11 +261,11 @@ public abstract class PermissionHolder {
return ret;
}
public boolean removeIf(Predicate<? super Node> predicate) {
public boolean removeIf(Predicate<? super LocalizedNode> predicate) {
return removeIf(predicate, null);
}
public boolean removeIf(Predicate<? super Node> predicate, Runnable taskIfSuccess) {
public boolean removeIf(Predicate<? super LocalizedNode> predicate, Runnable taskIfSuccess) {
ImmutableCollection<? extends Node> before = enduringData().immutable().values();
if (!this.enduringNodes.removeIf(predicate)) {
return false;
@ -280,11 +280,11 @@ public abstract class PermissionHolder {
return true;
}
public boolean removeIf(ContextSet contextSet, Predicate<? super Node> predicate) {
public boolean removeIf(ContextSet contextSet, Predicate<? super LocalizedNode> predicate) {
return removeIf(contextSet, predicate, null);
}
public boolean removeIf(ContextSet contextSet, Predicate<? super Node> predicate, Runnable taskIfSuccess) {
public boolean removeIf(ContextSet contextSet, Predicate<? super LocalizedNode> predicate, Runnable taskIfSuccess) {
ImmutableCollection<? extends Node> before = enduringData().immutable().values();
if (!this.enduringNodes.removeIf(contextSet, predicate)) {
return false;
@ -299,7 +299,7 @@ public abstract class PermissionHolder {
return true;
}
public boolean removeIfTransient(Predicate<? super Node> predicate) {
public boolean removeIfTransient(Predicate<? super LocalizedNode> predicate) {
boolean result = this.transientNodes.removeIf(predicate);
if (result) {
invalidateCache();
@ -455,7 +455,7 @@ public abstract class PermissionHolder {
// we don't call events for transient nodes
boolean transientWork = this.transientNodes.auditTemporaryNodes(null);
ImmutableCollection<? extends Node> before = enduringData().immutable().values();
ImmutableCollection<? extends LocalizedNode> before = enduringData().immutable().values();
Set<Node> removed = new HashSet<>();
boolean enduringWork = this.enduringNodes.auditTemporaryNodes(removed);

5
common/src/main/java/me/lucko/luckperms/common/node/model/ImmutableLocalizedNode.java
View File

@ -40,11 +40,6 @@ public final class ImmutableLocalizedNode extends ForwardingNode implements Loca
Objects.requireNonNull(node, "node");
Objects.requireNonNull(location, "location");
// unwrap
while (node instanceof LocalizedNode) {
node = ((LocalizedNode) node).getNode();
}
return new ImmutableLocalizedNode(node, location);
}

5
nukkit/src/main/java/me/lucko/luckperms/nukkit/model/permissible/LPPermissionAttachment.java
View File

@ -27,6 +27,7 @@ package me.lucko.luckperms.nukkit.model.permissible;
import com.google.common.base.Preconditions;
import me.lucko.luckperms.api.LocalizedNode;
import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.model.User;
@ -189,13 +190,13 @@ public class LPPermissionAttachment extends PermissionAttachment {
// remove transient permissions from the holder which were added by this attachment & equal the permission
User user = this.permissible.getUser();
user.removeIfTransient(n -> n instanceof ImmutableTransientNode && ((ImmutableTransientNode) n).getOwner() == this && n.getPermission().equals(name));
user.removeIfTransient(LocalizedNode.composedPredicate(n -> n instanceof ImmutableTransientNode && ((ImmutableTransientNode) n).getOwner() == this && n.getPermission().equals(name)));
}
private void clearInternal() {
// remove all transient permissions added by this attachment
User user = this.permissible.getUser();
user.removeIfTransient(n -> n instanceof ImmutableTransientNode && ((ImmutableTransientNode) n).getOwner() == this);
user.removeIfTransient(LocalizedNode.composedPredicate(n -> n instanceof ImmutableTransientNode && ((ImmutableTransientNode) n).getOwner() == this));
}
@Override