fix(permissions): keep plugins, higher spawn limits and teleport managing to staff

Author: TomGrobbe

src/Server/vMenu.Enhanced.Permissions.Server/PermissionNode.cs

@@ -13,6 +13,9 @@ public sealed class PermissionNode
     // Only steers which principal the generated example suggests, never a live check.
     public bool IsStaffOnly { get; internal set; }
 
+    // Whether being staff only carries down to everything nested underneath.
+    public bool CascadesStaffOnly { get; init; } = true;
+
     public required IReadOnlyList<string> ExtraParents { get; init; }
 
     public PermissionNode? StructuralParent { get; internal set; }

src/Server/vMenu.Enhanced.Permissions.Server/PermissionRegistry.cs

@@ -31,13 +31,14 @@ public static void Build(Assembly assembly)
         var discovered = Discover(assembly);
 
         // Metadata order is stable per build but not contractual, so sort for a deterministic tree.
-        foreach (var (name, extraParents, isStaffOnly) in discovered.OrderBy(entry => entry.Name, StringComparer.Ordinal))
+        foreach (var (name, extraParents, isStaffOnly, cascades) in discovered.OrderBy(entry => entry.Name, StringComparer.Ordinal))
         {
             Nodes[name] = new PermissionNode
             {
                 Name = name,
                 ExtraParents = extraParents,
                 IsStaffOnly = isStaffOnly,
+                CascadesStaffOnly = cascades,
             };
         }
 
@@ -74,7 +75,7 @@ public static bool RegisterDynamic(string permission, string source, bool staffO
         {
             Name = permission,
             Source = source,
-            IsStaffOnly = parent.IsStaffOnly || staffOnly,
+            IsStaffOnly = (parent.IsStaffOnly && parent.CascadesStaffOnly) || staffOnly,
             ExtraParents = parent.ExtraParents,
             StructuralParent = parent,
         };
@@ -204,9 +205,9 @@ private static Type[] TypesIn(Assembly assembly)
         }
     }
 
-    private static List<(string Name, string[] ExtraParents, bool IsStaffOnly)> Discover(Assembly assembly)
+    private static List<(string Name, string[] ExtraParents, bool IsStaffOnly, bool Cascades)> Discover(Assembly assembly)
     {
-        var discovered = new List<(string Name, string[] ExtraParents, bool IsStaffOnly)>();
+        var discovered = new List<(string Name, string[] ExtraParents, bool IsStaffOnly, bool Cascades)>();
         var owners = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
         foreach (var type in TypesIn(assembly))
@@ -219,7 +220,7 @@ private static Type[] TypesIn(Assembly assembly)
             }
 
             var prefix = category.Prefix ?? DerivePrefix(type);
-            var categoryIsStaffOnly = type.GetCustomAttribute<StaffOnlyAttribute>() is not null;
+            var categoryStaffOnly = type.GetCustomAttribute<StaffOnlyAttribute>();
             var hasContainerGrant = false;
             var declaredInCategory = 0;
 
@@ -258,8 +259,8 @@ private static Type[] TypesIn(Assembly assembly)
                 hasContainerGrant |= PermissionPath.IsContainerGrant(value);
                 declaredInCategory++;
 
-                var isStaffOnly = categoryIsStaffOnly || field.GetCustomAttribute<StaffOnlyAttribute>() is not null;
-                discovered.Add((value, category.AdditionalParents, isStaffOnly));
+                var staffOnly = field.GetCustomAttribute<StaffOnlyAttribute>() ?? categoryStaffOnly;
+                discovered.Add((value, category.AdditionalParents, staffOnly is not null, staffOnly?.Cascades ?? true));
             }
 
             // A single-permission category has nothing to group, so no container grant is expected. Neither does
@@ -321,7 +322,7 @@ static void MarkStaffOnlyBelow(PermissionNode node)
         {
             foreach (var child in node.StructuralChildren)
             {
-                child.IsStaffOnly |= node.IsStaffOnly;
+                child.IsStaffOnly |= node.IsStaffOnly && node.CascadesStaffOnly;
                 MarkStaffOnlyBelow(child);
             }
         }

src/Shared/vMenu.Enhanced.Data/Permissions/Menus/TeleportMenu.cs

@@ -17,5 +17,6 @@ public static class TeleportMenu
     public const string Category = "vMenu.Enhanced.Menus.TeleportMenu.Category";
 
     // Adding or removing a category or a location, which writes the config file for everybody.
+    [StaffOnly]
     public const string Manage = "vMenu.Enhanced.Menus.TeleportMenu.Manage";
 }

src/Shared/vMenu.Enhanced.Data/Permissions/Menus/VehicleSpawner.cs

@@ -14,7 +14,9 @@ public static class VehicleSpawner
 
     public const string SpawnLimitTier1 = "vMenu.Enhanced.Menus.VehicleSpawner.SpawnLimitTier1";
 
+    [StaffOnly]
     public const string SpawnLimitTier2 = "vMenu.Enhanced.Menus.VehicleSpawner.SpawnLimitTier2";
 
+    [StaffOnly]
     public const string SpawnLimitTier3 = "vMenu.Enhanced.Menus.VehicleSpawner.SpawnLimitTier3";
 }

src/Shared/vMenu.Enhanced.Data/Permissions/Plugins.cs

@@ -7,7 +7,9 @@ public static class Plugins
 {
     public const string Prefix = "vMenu.Enhanced.Plugins";
 
-    // Grants every permission of every plugin.
+    // Grants every permission of every plugin, including ones installed later, so it stays with staff.
+    // Each plugin's own permissions keep whatever its author suggested.
+    [StaffOnly(Cascades = false)]
     public const string All = Prefix + PermissionPath.AllSuffix;
 
     public static string AllFor(string pluginId) =>

src/Shared/vMenu.Enhanced.Data/Permissions/StaffOnlyAttribute.cs

@@ -4,4 +4,9 @@ namespace vMenu.Enhanced.Data.Permissions;
 // than to everybody. It only picks the principal written into permissions.cfg.example; nothing is
 // enforced by it, since a server owner is free to edit their copy however they like.
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
-public sealed class StaffOnlyAttribute : Attribute;
+public sealed class StaffOnlyAttribute : Attribute
+{
+    // A container that should stay with staff while what sits under it is still suggested to everybody
+    // one line at a time, so granting the lot stays a deliberate choice without hiding the parts.
+    public bool Cascades { get; init; } = true;
+}