GuidCheckerService: Verify PSP avatar GUIDs

LittleBigRefresh · Dec 23, 2023 · af501a9 · af501a9
1 parent e268a34
commit af501a9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/Refresh.GameServer/Endpoints/Game/UserEndpoints.cs b/Refresh.GameServer/Endpoints/Game/UserEndpoints.cs
@@ -98,16 +98,27 @@ public SerializedUserList GetMultipleUsers(RequestContext context, GameDatabaseC
 
         if (data.IconHash != null)
         {
-            if (!data.IconHash.StartsWith('g') && !dataStore.ExistsInStore(data.IconHash))
+            //If the icon is a GUID
+            if (data.IconHash.StartsWith('g'))
             {
-                database.AddErrorNotification("Profile update failed", "Your avatar failed to update because the asset was missing on the server.", user);
-                return null;
+                //Parse out the GUID
+                long guid = long.Parse(data.IconHash.AsSpan()[1..]);
+
+                //If its not a valid GUID, block the request
+                if(data.IconHash.StartsWith('g') && !guidChecker.IsTextureGuid(token.TokenGame, guid))
+                {
+                    database.AddErrorNotification("Profile update failed", "Your avatar failed to update because the asset was an invalid GUID.", user);
+                    return null; 
+                }
             }
-
-            if(data.IconHash.StartsWith('g') && !guidChecker.IsTextureGuid(token.TokenGame, long.Parse(data.IconHash.AsSpan()[1..])))
+            else
             {
-                database.AddErrorNotification("Profile update failed", "Your avatar failed to update because the asset was an invalid GUID.", user);
-                return null; 
+                //If the asset does not exist on the server, block the request
+                if (!dataStore.ExistsInStore(data.IconHash))
+                {
+                    database.AddErrorNotification("Profile update failed", "Your avatar failed to update because the asset was missing on the server.", user);
+                    return null;
+                } 
             }
         }
 

diff --git a/Refresh.GameServer/Services/GuidCheckerService.cs b/Refresh.GameServer/Services/GuidCheckerService.cs
@@ -52,7 +52,7 @@ public bool IsTextureGuid(TokenGame game, long guid)
             TokenGame.LittleBigPlanet2 => this._validMainlineTextureGuids.TryGetValue(guid, out _),
             TokenGame.LittleBigPlanet3 => this._validMainlineTextureGuids.TryGetValue(guid, out _),
             TokenGame.LittleBigPlanetVita => this._validVitaTextureGuids.TryGetValue(guid, out _),
-            TokenGame.LittleBigPlanetPSP => true,
+            TokenGame.LittleBigPlanetPSP => guid is >= 0 and <= 63, //PSP avatar GUIDs can be g0 - g63
             _ => throw new ArgumentOutOfRangeException(nameof(game), game, null),
         };
     }