Disable vault cache and improve restriction enforcement

ShimmyMySherbet · Dec 4, 2022 · 0a492aa · 0a492aa
1 parent b410966
commit 0a492aa
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 18 deletions.
diff --git a/SherbetVaults/Database/Tables/VaultItemsTable.cs b/SherbetVaults/Database/Tables/VaultItemsTable.cs
@@ -19,14 +19,18 @@ public VaultItemsTable(SherbetVaultsPlugin plugin, string tableName) : base(tabl
         public async Task<VaultItems> OpenVault(ulong playerID, string vaultID, VaultConfig config)
         {
             var items = await QueryAsync("SELECT * FROM @TABLE WHERE PlayerID=@0 AND VaultID=@1", playerID, vaultID);
-            var vi = new VaultItems(playerID, vaultID, Plugin);
-            vi.loadSize(config.Width, config.Height);
+
+            var vaultItems = new VaultItems(playerID, vaultID, Plugin);
+            vaultItems.loadSize(config.Width, config.Height);
+
             foreach (var item in items)
             {
-                vi.loadItem(item.X, item.Y, item.Rot, item.GetItem());
+                vaultItems.loadItem(item.X, item.Y, item.Rot, item.GetItem());
             }
-            vi.EnableSync();
-            return vi;
+
+            vaultItems.EnableSync();
+
+            return vaultItems;
         }
 
         public async Task AddItem(ulong playerID, string vaultID, Item item, byte rot, byte x, byte y) =>

diff --git a/SherbetVaults/Models/Config/Translations.cs b/SherbetVaults/Models/Config/Translations.cs
@@ -16,8 +16,9 @@ public partial class SherbetVaultsPlugin
             { "VaultAliases_Set", "[color=cyan]Vault alias created: {0}➔{1}[/color]" },
             { "VaultAliases_Removed", "[color=cyan]Removed alias {0}[/color]" },
             { "VaultAliases_Remove_NotFound", "[color=cyan]No alias by that name found[/color]" },
-            { "VaultAliases_List", "[color=cyan]Aliases: {1}[/color]" },
-            { "Restrictions_Blacklisted", "[color=red]You cannot store that item in your vault[/color]" }
+            { "VaultAliases_List", "Aliases: {1}" },
+            { "Restrictions_Blacklisted", "[color=red]You cannot store that item in your vault[/color]" },
+            { "VaultAliases_Disabled", "[color=red]Vault aliases are disabled on this server[/color]" }
         };
     }
 }
diff --git a/SherbetVaults/Models/Data/VaultItems.cs b/SherbetVaults/Models/Data/VaultItems.cs
@@ -1,5 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
+using Rocket.Core.Logging;
 using RocketExtensions.Models;
 using RocketExtensions.Utilities;
 using RocketExtensions.Utilities.ShimmyMySherbet.Extensions;
@@ -68,7 +69,12 @@ private void ItemAdded(byte page, byte index, ItemJar jar)
                 items.Remove(jar);
 
                 Player.Player.inventory.tryAddItem(jar.item, true, false);
-                return;
+
+                Logger.Log($"({Player.DisplayName}) tried to store blacklisted item ({jar.item.id}) in vault {VaultID}.");
+                Logger.Log("Please disregard the following error message.");
+
+                // Throw an error to prevent the item being stored client-side
+                throw new VaultStoreDeniedException();
             }
 
             Database.Enqueue(async (table) =>

diff --git a/SherbetVaults/Models/RestrictionTool.cs b/SherbetVaults/Models/RestrictionTool.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Rocket.API;
-using Rocket.Core.Logging;
 using RocketExtensions.Models;
 using SDG.Unturned;
 using SherbetVaults.Models.Config.Restrictions;
@@ -38,7 +37,6 @@ public bool IsPermitted(ushort itemID, LDMPlayer player, out RestrictionGroup ma
 
             if (asset == null)
             {
-                Logger.LogWarning($"Player {player.PlayerID} tried to put an unrecognized item in their vault. Item ID: {itemID}");
                 return false;
             }
 

diff --git a/SherbetVaults/Models/VaultManager.cs b/SherbetVaults/Models/VaultManager.cs
@@ -20,14 +20,14 @@ public VaultManager(SherbetVaultsPlugin vaultsPlugin)
 
         public async Task<VaultItems> GetVault(ulong playerID, string vaultID, bool allowCache = true)
         {
-            if (EnableCache && allowCache)
-            {
-                var cached = VaultsCache.GetStorage(playerID, vaultID);
-                if (cached != null)
-                {
-                    return cached;
-                }
-            }
+            //if (EnableCache && allowCache)
+            //{
+            //    var cached = VaultsCache.GetStorage(playerID, vaultID);
+            //    if (cached != null)
+            //    {
+            //        return cached;
+            //    }
+            //}
 
             var vaultConfig = VaultsPlugin.VaultSelector.GetVaultConfig(vaultID);
 

diff --git a/SherbetVaults/Models/VaultStoreDeniedException.cs b/SherbetVaults/Models/VaultStoreDeniedException.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace SherbetVaults.Models
+{
+    public class VaultStoreDeniedException : Exception
+    {
+        public VaultStoreDeniedException() : base("A player attemped to store an item in their vault that is blacklisted")
+        {
+        }
+    }
+}
diff --git a/SherbetVaults/SherbetVaults.csproj b/SherbetVaults/SherbetVaults.csproj
@@ -442,6 +442,7 @@
     <Compile Include="Models\Utility\VaultSelector.cs" />
     <Compile Include="Models\Data\VaultItems.cs" />
     <Compile Include="Models\VaultManager.cs" />
+    <Compile Include="Models\VaultStoreDeniedException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SherbetVaultsPlugin.cs" />
   </ItemGroup>