mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-12-16 17:05:20 +01:00
add negative permission check
This commit is contained in:
@@ -144,12 +144,20 @@ public class Account {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasPermission(String permission) {
|
public boolean hasPermission(String permission) {
|
||||||
if (this.permissions.contains(permission) || this.permissions.contains("*")) {
|
if (this.permissions.contains(permission)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
if(this.permissions.contains("*") && this.permissions.contains("-"+permission)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
String[] permissionParts = permission.split("\\.");
|
String[] permissionParts = permission.split("\\.");
|
||||||
for (String p : this.permissions) {
|
for (String p : this.permissions) {
|
||||||
|
if (p.startsWith("-") && permissionMatchesWildcard(p.substring(1), permissionParts)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if (permissionMatchesWildcard(p, permissionParts)) {
|
if (permissionMatchesWildcard(p, permissionParts)) {
|
||||||
|
Grasscutter.getLogger().info("Permission " + p + " matches " + permission);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user