Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-09 09:57:45 +01:00
Code Issues Projects Releases Wiki Activity

Null verifier wildcard fix (#1849)

Browse Source 
* fix hasPermission(String, PermissionVerifier) Behavior

* add test cases
This commit is contained in:
Hydrogen 2023-05-10 01:51:06 +03:00 committed by GitHub
parent 1d6ff874f8
commit 2c3e38b178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minestom/server/permission/PermissionHandler.java
View File

@ -112,15 +112,17 @@ public interface PermissionHandler {
* @return true if the handler has the permission, false otherwise * @return true if the handler has the permission, false otherwise
*/ */
default boolean hasPermission(@NotNull String permissionName, @Nullable PermissionVerifier permissionVerifier) { default boolean hasPermission(@NotNull String permissionName, @Nullable PermissionVerifier permissionVerifier) {
final Permission permission = getPermission(permissionName); Permission permission = getPermission(permissionName);
if (permission != null) { if (permission == null && permissionVerifier == null) {
permission = new Permission(permissionName, null);
} else if (permission == null) {
return false;
}
// If no permission verifier, hand off to no-verifier hasPermission for wildcard support // If no permission verifier, hand off to no-verifier hasPermission for wildcard support
if(permissionVerifier == null) { return hasPermission(permission); } if(permissionVerifier == null) { return hasPermission(permission); }
// Verify using the permission verifier // Verify using the permission verifier
return permissionVerifier == null || permissionVerifier.isValid(permission.getNBTData()); return permissionVerifier.isValid(permission.getNBTData());
}
return false;
} }
/** /**

8
src/test/java/net/minestom/server/permission/TestPermissions.java
View File

@ -85,6 +85,8 @@ public class TestPermissions {
Permission permission = new Permission("foo.b*r.baz"); Permission permission = new Permission("foo.b*r.baz");
Permission match = new Permission("foo.baaar.baz"); Permission match = new Permission("foo.baaar.baz");
Permission match2 = new Permission("foo.br.baz"); Permission match2 = new Permission("foo.br.baz");
String match3 = "foo.br.baz";
String match4 = "foo.baaar.baz";
Permission nomatch = new Permission("foo.br.bz"); Permission nomatch = new Permission("foo.br.bz");
Permission nomatch2 = new Permission("foo.b.baz"); Permission nomatch2 = new Permission("foo.b.baz");
assertFalse(player.hasPermission(match)); assertFalse(player.hasPermission(match));
@ -96,6 +98,8 @@ public class TestPermissions {
assertTrue(player.hasPermission(match)); assertTrue(player.hasPermission(match));
assertTrue(player.hasPermission(match2)); assertTrue(player.hasPermission(match2));
assertTrue(player.hasPermission(match3));
assertTrue(player.hasPermission(match4));
assertFalse(player.hasPermission(nomatch)); assertFalse(player.hasPermission(nomatch));
assertFalse(player.hasPermission(nomatch2)); assertFalse(player.hasPermission(nomatch2));
} }
@ -105,6 +109,8 @@ public class TestPermissions {
Permission permission = new Permission("foo.b*"); Permission permission = new Permission("foo.b*");
Permission match = new Permission("foo.baaar.baz"); Permission match = new Permission("foo.baaar.baz");
Permission match2 = new Permission("foo.b"); Permission match2 = new Permission("foo.b");
String match3 = "foo.b";
String match4 = "foo.baaar.baz";
Permission nomatch = new Permission("foo."); Permission nomatch = new Permission("foo.");
Permission nomatch2 = new Permission("foo/b"); Permission nomatch2 = new Permission("foo/b");
assertFalse(player.hasPermission(match)); assertFalse(player.hasPermission(match));
@ -116,6 +122,8 @@ public class TestPermissions {
assertTrue(player.hasPermission(match)); assertTrue(player.hasPermission(match));
assertTrue(player.hasPermission(match2)); assertTrue(player.hasPermission(match2));
assertTrue(player.hasPermission(match3));
assertTrue(player.hasPermission(match4));
assertFalse(player.hasPermission(nomatch)); assertFalse(player.hasPermission(nomatch));
assertFalse(player.hasPermission(nomatch2)); assertFalse(player.hasPermission(nomatch2));
} }