Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-24 03:25:19 +01:00
Code Issues Projects Releases Wiki Activity

Ensure child permissions are handled as lowercase when resolving (#2761)

Browse Source
This commit is contained in:
Luck 2020-12-14 15:22:41 +00:00
parent e6a5cb06af
commit 16fbf566f3
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsPermissionMap.java
View File

@ -180,16 +180,18 @@ public final class LuckPermsPermissionMap extends ForwardingMap<String, Permissi
continue; continue;
} }
if (accumulator.containsKey(e.getKey())) { String key = e.getKey().toLowerCase();
if (accumulator.containsKey(key)) {
continue; // Prevent infinite loops continue; // Prevent infinite loops
} }
// xor the value using the parent (bukkit logic, not mine) // xor the value using the parent (bukkit logic, not mine)
boolean value = e.getValue() ^ invert; boolean value = e.getValue() ^ invert;
accumulator.put(e.getKey().toLowerCase(), value); accumulator.put(key, value);
// lookup any deeper children & resolve if present // lookup any deeper children & resolve if present
Permission perm = this.delegate.get(e.getKey()); Permission perm = this.delegate.get(key);
if (perm != null) { if (perm != null) {
resolveChildren(accumulator, perm.getChildren(), !value); resolveChildren(accumulator, perm.getChildren(), !value);
} }

8
nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsPermissionMap.java
View File

@ -180,16 +180,18 @@ public final class LuckPermsPermissionMap extends ForwardingMap<String, Permissi
continue; continue;
} }
if (accumulator.containsKey(e.getKey())) { String key = e.getKey().toLowerCase();
if (accumulator.containsKey(key)) {
continue; // Prevent infinite loops continue; // Prevent infinite loops
} }
// xor the value using the parent (nukkit logic, not mine) // xor the value using the parent (nukkit logic, not mine)
boolean value = e.getValue() ^ invert; boolean value = e.getValue() ^ invert;
accumulator.put(e.getKey().toLowerCase(), value); accumulator.put(key, value);
// lookup any deeper children & resolve if present // lookup any deeper children & resolve if present
Permission perm = this.delegate.get(e.getKey()); Permission perm = this.delegate.get(key);
if (perm != null) { if (perm != null) {
resolveChildren(accumulator, perm.getChildren(), !value); resolveChildren(accumulator, perm.getChildren(), !value);
} }