Make UserFilesizeQuota role-specific

Author: Toastbrot236

Refresh.Core/Configuration/GameServerConfig.cs

@@ -14,12 +14,26 @@ public class GameServerConfig : Config
     protected override void Migrate(int oldVer, dynamic oldConfig)
     {
         // In version 27, various (mostly already role-specific) perms, like blocked assets and read-only mode, were moved to dedicated child objects,
-        // to better split them between certain roles.
+        // to more cleanly split the perms between certain roles, and to make their enforcement easier.
         if (oldVer < 27)
         {
             this.NormalUserPermissions = new();
             this.TrustedUserPermissions = new();
 
+            // filesize quota limit was added during version 11, but the version wasn't bumped, so catch error to be safe
+            if (oldVer >= 11)
+            {
+                try
+                {
+                    this.NormalUserPermissions.UserFilesizeQuota = (int)oldConfig.UserFilesizeQuota;
+                    this.TrustedUserPermissions.UserFilesizeQuota = (int)oldConfig.UserFilesizeQuota;
+                }
+                catch (RuntimeBinderException)
+                {
+                    // do nothing
+                }
+            }
+
             if (oldVer >= 18)
             {
                 this.NormalUserPermissions.BlockedAssetFlags.Dangerous = (bool)oldConfig.BlockedAssetFlags.Dangerous;
@@ -138,10 +152,6 @@ protected override void Migrate(int oldVer, dynamic oldConfig)
     /// </summary>
     public string GameConfigStorageUrl { get; set; } = "https://refresh.example.com/lbp";
     public bool AllowInvalidTextureGuids { get; set; } = false;
-    /// <summary>
-    /// The amount of data the user is allowed to upload before all resource uploads get blocked, defaults to 100mb.
-    /// </summary>
-    public int UserFilesizeQuota { get; set; } = 100 * 1_048_576;
 
     /// <summary>
     /// Whether to print the room state whenever a `FindBestRoom` match returns no results

Refresh.Core/Configuration/RolePermissions.cs

@@ -14,4 +14,9 @@ public RolePermissions() {}
         TimeSpanHours = 24,
         LevelQuota = 10,
     };
+
+    /// <summary>
+    /// The amount of data the user is allowed to upload before all resource uploads get blocked, defaults to 100mb.
+    /// </summary>
+    public int UserFilesizeQuota { get; set; } = 100 * 1_048_576;
 }

Refresh.Interfaces.APIv3/Endpoints/ResourceApiEndpoints.cs

@@ -193,9 +193,10 @@ IntegrationConfig integration
             return new ApiValidationError($"The asset must be under 2MB. Your file was {body.Length:N0} bytes.");
         }
 
-        if (body.Length + user.FilesizeQuotaUsage > config.UserFilesizeQuota)
+        RolePermissions rolePerms = user.GetRolePermissionsForUser(config);
+        if (body.Length + user.FilesizeQuotaUsage > rolePerms.UserFilesizeQuota)
         {
-            context.Logger.LogWarning(BunkumCategory.UserContent, "User {0} has hit the filesize quota ({1} bytes), rejecting.", user.Username, config.UserFilesizeQuota);
+            context.Logger.LogWarning(BunkumCategory.UserContent, "User {0} has hit the filesize quota ({1} bytes), rejecting.", user.Username, rolePerms.UserFilesizeQuota);
             return new ApiValidationError($"You have exceeded your filesize quota.");
         }
 

Refresh.Interfaces.Game/Endpoints/ResourceEndpoints.cs

@@ -48,9 +48,11 @@ public Response UploadAsset(RequestContext context, string hash, string type, by
         if (dataStore.ExistsInStore(assetPath))
             return Conflict;
 
-        if (body.Length + user.FilesizeQuotaUsage > config.UserFilesizeQuota)
+        RolePermissions rolePerms = user.GetRolePermissionsForUser(config);
+        
+        if (body.Length + user.FilesizeQuotaUsage > rolePerms.UserFilesizeQuota)
         {
-            context.Logger.LogWarning(BunkumCategory.UserContent, "User {0} has hit the filesize quota ({1} bytes), rejecting.", user.Username, config.UserFilesizeQuota);
+            context.Logger.LogWarning(BunkumCategory.UserContent, "User {0} has hit the filesize quota ({1} bytes), rejecting.", user.Username, rolePerms.UserFilesizeQuota);
             return RequestEntityTooLarge;
         }
 
@@ -66,7 +68,7 @@ public Response UploadAsset(RequestContext context, string hash, string type, by
 
         gameAsset.UploadDate = DateTimeOffset.FromUnixTimeSeconds(Math.Clamp(gameAsset.UploadDate.ToUnixTimeSeconds(), timeProvider.EarliestDate, timeProvider.TimestampSeconds));
 
-        AssetFlags blockedAssetFlags = user.GetRolePermissionsForUser(config).BlockedAssetFlags.ToAssetFlags();
+        AssetFlags blockedAssetFlags = rolePerms.BlockedAssetFlags.ToAssetFlags();
 
         // Don't block any assets uploaded from PSP, else block any unwanted assets,
         // For example, if the "blocked asset flags" has the "Media" bit set, and so does the asset,

RefreshTests.GameServer/GameServer/TestGameServerConfig.cs

@@ -24,4 +24,5 @@ public void TestMigration()
 
     public int MaximumAssetSafetyLevel { get; set; } = 0;
     public int MaximumAssetSafetyLevelForTrustedUsers { get; set; } = 0;
+    public int UserFilesizeQuota { get; set; } = 141;
 }

RefreshTests.GameServer/Tests/Assets/AssetUploadTests.cs

@@ -39,7 +39,8 @@ public void CannotUploadAssetPastFillingFilesizeQuota(bool psp)
     {
         using TestContext context = this.GetServer();
 
-        context.Server.Value.GameServerConfig.UserFilesizeQuota = 8;
+        context.Server.Value.GameServerConfig.NormalUserPermissions.UserFilesizeQuota = 8;
+        context.Server.Value.GameServerConfig.TrustedUserPermissions.UserFilesizeQuota = 8;
 
         context.Server.Value.Server.AddService<ImportService>();
         GameUser user = context.CreateUser();

RefreshTests.GameServer/Tests/Configs/GameServerConfigTests.cs

@@ -20,6 +20,7 @@ public void MigratesRolePermsFromVersion26()
             },
             BlockedAssetFlags = new(AssetFlags.Dangerous | AssetFlags.Media),
             BlockedAssetFlagsForTrustedUsers = new(AssetFlags.Modded),
+            UserFilesizeQuota = 141,
         };
 
         config.TestMigration();
@@ -38,6 +39,9 @@ public void MigratesRolePermsFromVersion26()
 
         Assert.That(config.NormalUserPermissions.BlockedAssetFlags.ToAssetFlags(), Is.EqualTo(AssetFlags.Dangerous | AssetFlags.Media));
         Assert.That(config.TrustedUserPermissions.BlockedAssetFlags.ToAssetFlags(), Is.EqualTo(AssetFlags.Modded));
+
+        Assert.That(config.NormalUserPermissions.UserFilesizeQuota, Is.EqualTo(141));
+        Assert.That(config.TrustedUserPermissions.UserFilesizeQuota, Is.EqualTo(141));
     }
 
     [Test]