mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-08-21 19:01:55 +00:00
Change to use LinkedHashSets to preserve ordering. Fixes an issue with populating bukkit perms in the wrong order. Fix wildcard negation in parent groups.
This commit is contained in:
parent
ff3ec84b0d
commit
9d7a2043f7
|
@ -167,6 +167,7 @@ public abstract class DataUnit {
|
||||||
* @return a copy of the permission list
|
* @return a copy of the permission list
|
||||||
*/
|
*/
|
||||||
public List<String> getPermissionList() {
|
public List<String> getPermissionList() {
|
||||||
|
sortPermissions();
|
||||||
return permissions;
|
return permissions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
package org.anjocaido.groupmanager.permissions;
|
package org.anjocaido.groupmanager.permissions;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashSet;
|
import java.util.LinkedHashSet;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -120,7 +120,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
|
||||||
@Override
|
@Override
|
||||||
public Set<String> getAllPlayersPermissions(String userName, Boolean includeChildren) {
|
public Set<String> getAllPlayersPermissions(String userName, Boolean includeChildren) {
|
||||||
|
|
||||||
Set<String> playerPermArray = new HashSet<String>();
|
Set<String> playerPermArray = new LinkedHashSet<String>();
|
||||||
|
|
||||||
// Add the players own permissions.
|
// Add the players own permissions.
|
||||||
playerPermArray.addAll(populatePerms(ph.getUser(userName).getPermissionList(), includeChildren));
|
playerPermArray.addAll(populatePerms(ph.getUser(userName).getPermissionList(), includeChildren));
|
||||||
|
@ -133,7 +133,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
|
||||||
if (!alreadyProcessed.contains(group)) {
|
if (!alreadyProcessed.contains(group)) {
|
||||||
alreadyProcessed.add(group);
|
alreadyProcessed.add(group);
|
||||||
|
|
||||||
Set<String> groupPermArray = new HashSet<String>();
|
Set<String> groupPermArray = new LinkedHashSet<String>();
|
||||||
|
|
||||||
if (group.startsWith("g:") && GroupManager.getGlobalGroups().hasGroup(group)) {
|
if (group.startsWith("g:") && GroupManager.getGlobalGroups().hasGroup(group)) {
|
||||||
// GlobalGroups
|
// GlobalGroups
|
||||||
|
@ -149,7 +149,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
|
||||||
boolean negated = (perm.startsWith("-"));
|
boolean negated = (perm.startsWith("-"));
|
||||||
// Perm doesn't already exists and there is no negation for it
|
// Perm doesn't already exists and there is no negation for it
|
||||||
// or It's a negated perm where a normal perm doesn't exists (don't allow inheritance to negate higher perms)
|
// or It's a negated perm where a normal perm doesn't exists (don't allow inheritance to negate higher perms)
|
||||||
if ((!negated && !playerPermArray.contains(perm) && !playerPermArray.contains("-" + perm)) || (negated && !playerPermArray.contains(perm.substring(1)) && !playerPermArray.contains("-" + perm)))
|
if ((!negated && !playerPermArray.contains(perm) && !wildcardNegation(playerPermArray, perm)) || (negated && !playerPermArray.contains(perm.substring(1)) && !wildcardNegation(playerPermArray, perm.substring(1))))
|
||||||
playerPermArray.add(perm);
|
playerPermArray.add(perm);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -160,11 +160,48 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
|
||||||
return playerPermArray;
|
return playerPermArray;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is there a direct or wildcard negation in the list which covers this permission node.
|
||||||
|
*
|
||||||
|
* @param playerPermArray
|
||||||
|
* @param node
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private boolean wildcardNegation(Set<String> playerPermArray, String node) {
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check for a negated parent with a wildcard or negated permission
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (playerPermArray.contains("-" + node))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
final String[] parts = node.split("\\.");
|
||||||
|
final StringBuilder builder = new StringBuilder(node.length());
|
||||||
|
for (String part : parts) {
|
||||||
|
builder.append('*');
|
||||||
|
if (playerPermArray.contains("-" + builder.toString())) {
|
||||||
|
GroupManager.logger.fine("Wildcard Negation found for " + node);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
builder.deleteCharAt(builder.length() - 1);
|
||||||
|
builder.append(part).append('.');
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* No negated parent found so return false.
|
||||||
|
*/
|
||||||
|
GroupManager.logger.fine("No Negation found for " + node);
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private Set<String> populatePerms(List<String> permsList, boolean includeChildren) {
|
private Set<String> populatePerms(List<String> permsList, boolean includeChildren) {
|
||||||
|
|
||||||
// Create a new array so it's modifiable.
|
// Create a new array so it's modifiable.
|
||||||
List<String> perms = new ArrayList<String>(permsList);
|
List<String> perms = new ArrayList<String>(permsList);
|
||||||
Set<String> permArray = new HashSet<String>();
|
Set<String> permArray = new LinkedHashSet<String>();
|
||||||
Boolean allPerms = false;
|
Boolean allPerms = false;
|
||||||
|
|
||||||
// Allow * node to populate ALL permissions to Bukkit.
|
// Allow * node to populate ALL permissions to Bukkit.
|
||||||
|
@ -177,7 +214,6 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
|
||||||
}
|
}
|
||||||
|
|
||||||
for (String perm : perms) {
|
for (String perm : perms) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* all permission sets are passed here pre-sorted, alphabetically.
|
* all permission sets are passed here pre-sorted, alphabetically.
|
||||||
* This means negated nodes will be processed before all permissions
|
* This means negated nodes will be processed before all permissions
|
||||||
|
@ -199,7 +235,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
|
||||||
*/
|
*/
|
||||||
if ((includeChildren) || (negated && allPerms)) {
|
if ((includeChildren) || (negated && allPerms)) {
|
||||||
|
|
||||||
Map<String, Boolean> children = GroupManager.BukkitPermissions.getAllChildren((negated ? perm.substring(1) : perm), new HashSet<String>());
|
Map<String, Boolean> children = GroupManager.BukkitPermissions.getAllChildren((negated ? perm.substring(1) : perm), new LinkedHashSet<String>());
|
||||||
|
|
||||||
if (children != null) {
|
if (children != null) {
|
||||||
if (negated)
|
if (negated)
|
||||||
|
|
Loading…
Reference in a new issue