added * permission alias

Author: Tarek

cloudnet-lib/src/main/java/de/dytanic/cloudnet/lib/player/permission/PermissionEntity.java

@@ -5,9 +5,8 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -17,10 +16,13 @@
 @Getter
 @Setter
 public class PermissionEntity {
+
     protected UUID uniqueId;
+
     protected java.util.Map<String, Boolean> permissions;
 
     protected String prefix;
+
     @Setter
     protected String suffix;
 
@@ -33,70 +35,35 @@ public boolean hasPermission(PermissionPool permissionPool, String permission, S
 
         if (permissionPool == null || permission == null) return false;
 
-        if (checkAdminPermission(permission)) return true;
-
-        String adminPermission = null;
-        String[] block = permission.split("\\.");
-
-        if (block.length > 1) adminPermission = block[0] + ".*";
-
         if (permissions.containsKey(permission) && !permissions.get(permission))
             return false;
-        else if (adminPermission != null && permissions.containsKey(adminPermission) && !permissions.get(adminPermission))
-            return false;
+        else if (hasWildcardPermission(permission))
+            return true;
         else if (permissions.containsKey("*") && permissions.get("*"))
             return true;
         else if ((permissions.containsKey(permission)) && permissions.get(permission)) return true;
-        else if (adminPermission != null && permissions.containsKey(adminPermission) && permissions.get(adminPermission))
-            return true;
 
         for (GroupEntityData implg : groups)
         {
             if (!permissionPool.getGroups().containsKey(implg.getGroup())) continue;
             PermissionGroup permissionGroup = permissionPool.getGroups().get(implg.getGroup());
 
-            if (checkAdminPermission(permissionGroup, permission)) return true;
+            if (hasWildcardPermission(permissionGroup, permission, group)) return true;
 
-            if (checkAccess(permissionGroup, permission, adminPermission, group)) return true;
+            if (checkAccess(permissionGroup, permission, group)) return true;
 
             for (String implGroup : permissionGroup.getImplementGroups())
             {
                 if (!permissionPool.getGroups().containsKey(implGroup)) continue;
 
                 PermissionGroup subGroup = permissionPool.getGroups().get(implGroup);
-                if (checkAccess(subGroup, permission, adminPermission, group)) return true;
+                if (checkAccess(subGroup, permission, group)) return true;
             }
-
         }
 
         return false;
     }
 
-    private boolean checkAdminPermission(String permission)
-    {
-        List<String> parts = Arrays.asList(permission.split("\\."));
-        if (parts.size() < 2) return false;
-        for (int i = parts.size() - 2; i >= 1; i--)
-        {
-            String perm = String.join(".", parts.subList(0, i)) + ".*";
-            if (permissions.containsKey(perm)) return permissions.get(perm);
-        }
-        return false;
-    }
-
-    private boolean checkAdminPermission(PermissionGroup permissionGroup, String permission)
-    {
-        List<String> parts = Arrays.asList(permission.split("\\."));
-        if (parts.size() < 2) return false;
-        for (int i = parts.size() - 2; i >= 1; i--)
-        {
-            String perm = String.join(".", parts.subList(0, i)) + ".*";
-            if (permissionGroup.permissions.containsKey(perm))
-                return permissionGroup.permissions.get(perm);
-        }
-        return false;
-    }
-
     public PermissionGroup getHighestPermissionGroup(PermissionPool permissionPool)
     {
         PermissionGroup permissionGroup = null;
@@ -128,27 +95,47 @@ public void setPrefix(String prefix)
 
     /*= -------------------------------------------------------------------------------- =*/
 
-    private boolean checkAccess(PermissionGroup permissionGroup, String permission, String adminPermission, String group)
+    private boolean hasWildcardPermission(PermissionGroup permissionGroup, String permission, String group)
+    {
+        for (Map.Entry<String, Boolean> entry : permissionGroup.getPermissions().entrySet())
+            if (entry.getKey().endsWith("*") && entry.getKey().length() > 1 && permission.startsWith(entry.getKey().substring(0, entry.getKey().length() - 1)))
+                return true;
+
+        if (group != null && permissionGroup.getServerGroupPermissions().containsKey(group))
+            for (String perms : permissionGroup.getServerGroupPermissions().get(group))
+                if (perms.endsWith("*") && perms.length() > 1 && permission.startsWith(perms.substring(0, perms.length() - 1)))
+                    return true;
+
+        return false;
+    }
+
+    private boolean hasWildcardPermission(String permission)
     {
-        if ((adminPermission != null && (permissionGroup.getPermissions().containsKey(adminPermission) &&
-                !permissionGroup.getPermissions().get(adminPermission))) ||
-                (permissionGroup.getPermissions().containsKey("*") && !permissionGroup.getPermissions().get("*")) ||
+        for (Map.Entry<String, Boolean> entry : getPermissions().entrySet())
+            if (entry.getKey().endsWith("*") && entry.getKey().length() > 1 && permission.startsWith(entry.getKey().substring(0, entry.getKey().length() - 1)))
+                return true;
+
+        return false;
+    }
+
+    private boolean checkAccess(PermissionGroup permissionGroup, String permission, String group)
+    {
+        if ((permissionGroup.getPermissions().containsKey("*") && !permissionGroup.getPermissions().get("*")) ||
                 (permissionGroup.getPermissions().containsKey(permission) && !permissionGroup.getPermissions().get(permission)))
             return false;
 
         if ((permissionGroup.getPermissions().containsKey("*") && permissionGroup.getPermissions().get("*")))
             return true;
 
-        if ((permissionGroup.getPermissions().containsKey(permission) && permissionGroup.getPermissions().get(permission)) ||
-                (adminPermission != null && (permissionGroup.getPermissions().containsKey(adminPermission) && permissionGroup.getPermissions().get(adminPermission))))
+        if ((permissionGroup.getPermissions().containsKey(permission) && permissionGroup.getPermissions().get(permission)))
             return true;
 
-        if (permissionGroup.getServerGroupPermissions().containsKey(group))
-        {
-            return permissionGroup.getServerGroupPermissions().get(group).contains(permission) ||
-                    permissionGroup.getServerGroupPermissions().get(group).contains("*")
-                    || (adminPermission != null && permissionGroup.getServerGroupPermissions().get(group).contains(adminPermission));
-        }
+        if (group != null)
+            if (permissionGroup.getServerGroupPermissions().containsKey(group))
+            {
+                return permissionGroup.getServerGroupPermissions().get(group).contains(permission) ||
+                        permissionGroup.getServerGroupPermissions().get(group).contains("*");
+            }
 
         return false;
     }