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

Fix user group issues

Browse Source
This commit is contained in:
Luck 2016-06-22 17:24:30 +01:00
parent 60f6bac903
commit 10a58e372c
1 changed files with 59 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
common/src/main/java/me/lucko/luckperms/users/User.java
View File

@ -8,9 +8,8 @@ import me.lucko.luckperms.exceptions.ObjectLacksPermissionException;
import me.lucko.luckperms.groups.Group; import me.lucko.luckperms.groups.Group;
import me.lucko.luckperms.utils.PermissionObject; import me.lucko.luckperms.utils.PermissionObject;
import java.util.ArrayList; import java.util.*;
import java.util.List; import java.util.stream.Collectors;
import java.util.UUID;
public abstract class User extends PermissionObject { public abstract class User extends PermissionObject {
@ -60,7 +59,7 @@ public abstract class User extends PermissionObject {
* @return true if the user is a member of the group * @return true if the user is a member of the group
*/ */
public boolean isInGroup(Group group, String server) { public boolean isInGroup(Group group, String server) {
return getLocalGroups(server).contains(group.getName()); return hasPermission("luckperms.group." + group.getName(), true, server);
} }
/** /**
@ -83,15 +82,7 @@ public abstract class User extends PermissionObject {
server = "global"; server = "global";
} }
if (isInGroup(group, server)) { setPermission("luckperms.group." + group.getName(), true, server);
throw new ObjectAlreadyHasException();
}
if (server.equalsIgnoreCase("global")) {
getNodes().put("luckperms.group." + group.getName(), true);
} else {
getNodes().put(server + "/luckperms.group." + group.getName(), true);
}
} }
/** /**
@ -114,15 +105,7 @@ public abstract class User extends PermissionObject {
server = "global"; server = "global";
} }
if (!getLocalGroups(server).contains(group.getName())) { unsetPermission("luckperms.group." + group.getName(), server);
throw new ObjectLacksPermissionException();
}
if (server.equalsIgnoreCase("global")) {
getNodes().remove("luckperms.group." + group.getName());
} else {
getNodes().remove(server + "/luckperms.group." + group.getName());
}
} }
/** /**
@ -139,7 +122,7 @@ public abstract class User extends PermissionObject {
* @return a {@link List} of group names * @return a {@link List} of group names
*/ */
public List<String> getGroupNames() { public List<String> getGroupNames() {
return getGroups(null, true, true); return getGroups(null, null, true);
} }
/** /**
@ -148,45 +131,81 @@ public abstract class User extends PermissionObject {
* @return a {@link List} of group names * @return a {@link List} of group names
*/ */
public List<String> getLocalGroups(String server) { public List<String> getLocalGroups(String server) {
return getGroups(server, false, false); return getGroups(server, null, false);
} }
/** /**
* Get a {@link List} of the groups the user is a member of on a specific server with the option to include global groups or all groups * Get a {@link List} of the groups the user is a member of on a specific server with the option to include global groups or all groups
* @param server Which server to check on * @param server Which server to check on
* @param excludedGroups groups to exclude (prevents circular inheritance issues)
* @param includeGlobal Whether to include global groups * @param includeGlobal Whether to include global groups
* @param includeAll Whether to get all groups
* @return a {@link List} of group names * @return a {@link List} of group names
*/ */
public List<String> getGroups(String server, boolean includeGlobal, boolean includeAll) { private List<String> getGroups(String server, List<String> excludedGroups, boolean includeGlobal) {
if (excludedGroups == null) {
excludedGroups = new ArrayList<>();
}
excludedGroups.add(getObjectName());
List<String> groups = new ArrayList<>(); List<String> groups = new ArrayList<>();
if (server == null || server.equals("")) { if (server == null || server.equals("")) {
server = "global"; server = "global";
} }
for (String node : getNodes().keySet()) { /*
String originalNode = node; Priority:
// Has a defined server
if (node.contains("/")) { 1. server specific group nodes
String[] parts = node.split("\\/", 2); 2. group nodes
if (!parts[0].equalsIgnoreCase(server) && !includeAll) { */
continue;
} final Map<String, Boolean> serverSpecificGroups = new HashMap<>();
node = parts[1]; final Map<String, Boolean> groupNodes = new HashMap<>();
} else {
if (!includeGlobal) { // Sorts the permissions and puts them into a priority order
continue; for (Map.Entry<String, Boolean> node : getNodes().entrySet()) {
} serverSpecific:
if (node.getKey().contains("/")) {
String[] parts = node.getKey().split("\\/", 2);
if (parts[0].equalsIgnoreCase("global")) {
// REGULAR
break serverSpecific;
} }
if (node.matches("luckperms\\.group\\..*")) { if (!parts[0].equalsIgnoreCase(server)) {
if (getNodes().get(originalNode)) { // SERVER SPECIFIC BUT DOES NOT APPLY
String groupName = node.split("\\.", 3)[2]; continue;
groups.add(groupName);
} }
if (parts[1].matches("luckperms\\.group\\..*")) {
// SERVER SPECIFIC AND GROUP
serverSpecificGroups.put(node.getKey(), node.getValue());
continue;
} }
continue;
} }
// Skip adding global permissions if they are not requested
if (!includeGlobal) continue;
if (node.getKey().matches("luckperms\\.group\\..*")) {
// GROUP
groupNodes.put(node.getKey(), node.getValue());
}
}
// If a group is negated at a higher priority, the group should not then be applied at a lower priority
serverSpecificGroups.entrySet().stream().filter(node -> !node.getValue()).forEach(node -> {
groupNodes.remove(node.getKey());
groupNodes.remove(node.getKey().split("\\/", 2)[1]);
});
groups.addAll(serverSpecificGroups.entrySet().stream().filter(Map.Entry::getValue).map(e -> e.getKey().split("\\.", 3)[2]).collect(Collectors.toList()));
groups.addAll(groupNodes.entrySet().stream().filter(Map.Entry::getValue).map(e -> e.getKey().split("\\.", 3)[2]).collect(Collectors.toList()));
return groups; return groups;
} }