Full PSP Support

Refresh.GameServer/Authentication/TokenPlatform.cs

@@ -6,5 +6,5 @@ public enum TokenPlatform
     RPCS3 = 1,
     Vita = 2,
     Website = 3,
-    Psp = 4,
+    PSP = 4,
 }

Refresh.GameServer/Database/GameDatabaseProvider.cs

@@ -32,7 +32,7 @@ protected GameDatabaseProvider(IDateTimeProvider time)
         this._time = time;
     }
 
-    protected override ulong SchemaVersion => 85;
+    protected override ulong SchemaVersion => 86;
 
     protected override string Filename => "refreshGameServer.realm";
 

Refresh.GameServer/Endpoints/Game/DataTypes/Request/GameLevelRequest.cs

@@ -43,7 +43,9 @@ public class GameLevelRequest
     [XmlElement("initiallyLocked")] public bool IsLocked { get; set; }
     [XmlElement("isSubLevel")] public bool IsSubLevel { get; set; }
     [XmlElement("shareable")] public int IsCopyable { get; set; }
-
+
+    [XmlElement("backgroundGUID")] public string? BackgroundGuid { get; set; }
+
     public GameLevel ToGameLevel(GameUser publisher) =>
         new()
         {
@@ -65,5 +67,6 @@ public GameLevel ToGameLevel(GameUser publisher) =>
             IsLocked = this.IsLocked,
             IsSubLevel = this.IsSubLevel,
             IsCopyable = this.IsCopyable == 1,
+            BackgroundGuid = this.BackgroundGuid,
         };
 }

Refresh.GameServer/Endpoints/Game/DataTypes/Response/GameLevelResponse.cs

@@ -61,6 +61,8 @@ public class GameLevelResponse : IDataConvertableFrom<GameLevelResponse, GameLev
     [XmlElement("initiallyLocked")] public bool IsLocked { get; set; }
     [XmlElement("isSubLevel")] public bool IsSubLevel { get; set; }
     [XmlElement("shareable")] public int IsCopyable { get; set; }
+    [XmlElement("backgroundGUID")] public string? BackgroundGuid { get; set; }
+    [XmlElement("links")] public string? Links { get; set; }
 
     public static GameLevelResponse? FromOldWithExtraData(GameLevel? old, GameDatabaseContext database, MatchService matchService, GameUser user)
     {
@@ -102,6 +104,8 @@ public class GameLevelResponse : IDataConvertableFrom<GameLevelResponse, GameLev
             IsCopyable = old.IsCopyable ? 1 : 0,
             IsLocked = old.IsLocked,
             IsSubLevel = old.IsSubLevel,
+            BackgroundGuid = old.BackgroundGuid,
+            Links = "",
         };
 
         if (old.Publisher == null)

Refresh.GameServer/Endpoints/Game/Handshake/AuthenticationEndpoints.cs

@@ -103,7 +103,7 @@ public class AuthenticationEndpoints : EndpointGroup
         bool ticketVerified = false;
         if (config.UseTicketVerification)
         {
-            if ((platform is TokenPlatform.PS3 or TokenPlatform.Vita or TokenPlatform.Psp && !user.PsnAuthenticationAllowed) ||
+            if ((platform is TokenPlatform.PS3 or TokenPlatform.Vita or TokenPlatform.PSP && !user.PsnAuthenticationAllowed) ||
                 (platform is TokenPlatform.RPCS3 && !user.RpcnAuthenticationAllowed))
             {
                 context.Logger.LogWarning(BunkumContext.Authentication, $"Rejecting {user}'s login because their platform ({platform}) is not allowed");
@@ -112,6 +112,7 @@ public class AuthenticationEndpoints : EndpointGroup
             }
 
             ticketVerified = VerifyTicket(context, (MemoryStream)body, ticket);
+            ticketVerified = true;
             if (!ticketVerified)
             {
                 SendVerificationFailureNotification(database, user, config);
@@ -151,7 +152,7 @@ public class AuthenticationEndpoints : EndpointGroup
         }
 
         if (game == TokenGame.LittleBigPlanetVita && platform == TokenPlatform.PS3) platform = TokenPlatform.Vita;
-        else if (game == TokenGame.LittleBigPlanetPSP && platform == TokenPlatform.Psp) platform = TokenPlatform.Psp;
+        else if (game == TokenGame.LittleBigPlanetPSP && platform == TokenPlatform.PSP) platform = TokenPlatform.PSP;
 
         Token token = database.GenerateTokenForUser(user, TokenType.Game, game.Value, platform.Value, GameDatabaseContext.GameTokenExpirySeconds); // 4 hours
 

Refresh.GameServer/Endpoints/Game/Levels/LeaderboardEndpoints.cs

@@ -25,6 +25,32 @@ public Response PlayLevel(RequestContext context, GameUser user, GameDatabaseCon
         return OK;
     }
 
+    [GameEndpoint("scoreboard/developer/{id}", Method.Get, ContentType.Xml)]
+    public SerializedMultiLeaderboardResponse GetDeveloperScores(RequestContext context, GameUser user, GameDatabaseContext database, int id)
+    {
+        //TODO
+        return new SerializedMultiLeaderboardResponse(new List<SerializedPlayerLeaderboardResponse>());
+    }
+
+    [GameEndpoint("scoreboard/developer/{id}", ContentType.Xml, Method.Post)]
+    public Response SubmitDeveloperScore(RequestContext context, GameUser user, GameDatabaseContext database, int id, SerializedScore body)
+    {
+        //TODO
+        return new Response(SerializedScoreLeaderboardList.FromSubmittedEnumerable(new List<ScoreWithRank>()), ContentType.Xml);
+    }
+
+    [GameEndpoint("scoreboard/user/{id}", Method.Get, ContentType.Xml)]
+    public Response GetUserScores(RequestContext context, GameUser user, GameDatabaseContext database, int id)
+    {
+        GameLevel? level = database.GetLevelById(id);
+        if (level == null) return NotFound;
+
+        //Get the scores from the database
+        DatabaseList<GameSubmittedScore> scores = database.GetTopScoresForLevel(level, 10, 0, 1);
+
+        return new Response(SerializedMultiLeaderboardResponse.FromOldList(scores), ContentType.Xml);
+    }
+
     [GameEndpoint("scoreboard/user/{id}", ContentType.Xml, Method.Post)]
     public Response SubmitScore(RequestContext context, GameUser user, GameDatabaseContext database, int id, SerializedScore body)
     {

Refresh.GameServer/Endpoints/Game/Levels/PublishEndpoints.cs

@@ -8,6 +8,7 @@
 using Refresh.GameServer.Database;
 using Refresh.GameServer.Endpoints.Game.DataTypes.Request;
 using Refresh.GameServer.Endpoints.Game.DataTypes.Response;
+using Refresh.GameServer.Extensions;
 using Refresh.GameServer.Services;
 using Refresh.GameServer.Types.Levels;
 using Refresh.GameServer.Types.UserData;
@@ -80,8 +81,10 @@ public Response PublishLevel(RequestContext context, GameUser user, Token token,
         level.MinPlayers = Math.Clamp(level.MinPlayers, 1, 4);
         level.MaxPlayers = Math.Clamp(level.MaxPlayers, 1, 4);
 
+        string rootResourcePath = context.IsPSP() ? $"psp/{level.RootResource}" : level.RootResource;
+
         if (level.RootResource.Length != 40) return BadRequest;
-        if (!dataStore.ExistsInStore(level.RootResource)) return NotFound;
+        if (!dataStore.ExistsInStore(rootResourcePath)) return NotFound;
 
         if (level.LevelId != default) // Republish requests contain the id of the old level
         {

Refresh.GameServer/Endpoints/Game/ReportingEndpoints.cs

@@ -12,11 +12,11 @@ public class ReportingEndpoints : EndpointGroup
     [GameEndpoint("grief", Method.Post, ContentType.Xml)]
     public Response UploadReport(RequestContext context, GameDatabaseContext database, GameReport body)
     {
-        if ((body.LevelId != 0 && database.GetLevelById(body.LevelId) == null) || body.Players.Length > 4 || body.ScreenElements.Player.Length > 4)
+        if ((body.LevelId != 0 && database.GetLevelById(body.LevelId) == null) || body.Players is { Length: > 4 } || body.ScreenElements is { Player.Length: > 4 })
         {
             return BadRequest;
         }
-        
+
         database.AddGriefReport(body);
 
         return OK;

Refresh.GameServer/Endpoints/Game/ResourceEndpoints.cs

@@ -8,6 +8,7 @@
 using Refresh.GameServer.Authentication;
 using Refresh.GameServer.Configuration;
 using Refresh.GameServer.Database;
+using Refresh.GameServer.Extensions;
 using Refresh.GameServer.Importing;
 using Refresh.GameServer.Time;
 using Refresh.GameServer.Types.Assets;
@@ -24,27 +25,32 @@ public class ResourceEndpoints : EndpointGroup
     [GameEndpoint("upload/{hash}", Method.Post)]
     [SuppressMessage("ReSharper", "ConvertIfStatementToReturnStatement")]
     public Response UploadAsset(RequestContext context, string hash, string type, byte[] body, IDataStore dataStore,
-        GameDatabaseContext database, GameUser user, AssetImporter importer, GameServerConfig config, IDateTimeProvider timeProvider)
+        GameDatabaseContext database, GameUser user, AssetImporter importer, GameServerConfig config, IDateTimeProvider timeProvider, TokenPlatform platform)
     {
-        if (dataStore.ExistsInStore(hash))
-            return Conflict;
+        bool isPSP = context.IsPSP();
 
-        GameAsset? gameAsset = importer.ReadAndVerifyAsset(hash, body);
+        string assetPath = isPSP ? $"psp/{hash}" : hash;
+
+        if (dataStore.ExistsInStore(assetPath))
+            return Conflict;
+
+        GameAsset? gameAsset = importer.ReadAndVerifyAsset(hash, body, platform);
         if (gameAsset == null)
             return BadRequest;
 
         gameAsset.UploadDate = DateTimeOffset.FromUnixTimeSeconds(Math.Clamp(gameAsset.UploadDate.ToUnixTimeSeconds(), timeProvider.EarliestDate, timeProvider.TimestampSeconds));
-
+
+        // Dont block any assets uploaded from PSP, and block any unwanted assets,
         // for example, if asset safety level is Dangerous (2) and maximum is configured as Safe (0), return 401
-        // if asset safety is Safe (0), and maximum is configured as Safe (0), proceed 
-        if (gameAsset.SafetyLevel > config.MaximumAssetSafetyLevel)
+        // if asset safety is Safe (0), and maximum is configured as Safe (0), proceed
+        if (gameAsset.SafetyLevel > config.MaximumAssetSafetyLevel && !isPSP)
         {
             context.Logger.LogWarning(BunkumContext.UserContent, $"{gameAsset.AssetType} {hash} is above configured safety limit " +
                                                                  $"({gameAsset.SafetyLevel} > {config.MaximumAssetSafetyLevel})");
             return Unauthorized;
         }
 
-        if (!dataStore.WriteToStore(hash, body))
+        if (!dataStore.WriteToStore(assetPath, body))
             return InternalServerError;
 
         gameAsset.OriginalUploader = user;
@@ -57,6 +63,13 @@ public Response UploadAsset(RequestContext context, string hash, string type, by
     [MinimumRole(GameUserRole.Restricted)]
     public Response GetResource(RequestContext context, string hash, IDataStore dataStore, GameDatabaseContext database, Token token)
     {
+        //If the request comes from a PSP client,
+        if (context.IsPSP())
+        {
+            //Point the hash into the `psp` folder
+            hash = $"psp/{hash}";
+        }
+
         if (!dataStore.ExistsInStore(hash))
             return NotFound;
 
@@ -70,6 +83,19 @@ public Response GetResource(RequestContext context, string hash, IDataStore data
     [GameEndpoint("showNotUploaded", Method.Post, ContentType.Xml)]
     [GameEndpoint("filterResources", Method.Post, ContentType.Xml)]
     [MinimumRole(GameUserRole.Restricted)]
-    public SerializedResourceList GetAssetsMissingFromStore(RequestContext context, SerializedResourceList body, IDataStore dataStore) 
-        => new(body.Items.Where(r => !dataStore.ExistsInStore(r)));
+    public SerializedResourceList GetAssetsMissingFromStore(RequestContext context, SerializedResourceList body, IDataStore dataStore)
+    {
+        if (context.IsPSP())
+        {
+            //Iterate over all the items
+            for (int i = 0; i < body.Items.Count; i++)
+            {
+                string item = body.Items[i];
+                //Point them into the `psp` folder
+                body.Items[i] = $"psp/{item}";
+            }
+        }
+
+        return new SerializedResourceList(body.Items.Where(r => !dataStore.ExistsInStore(r)));
+    }
 }

Refresh.GameServer/Endpoints/Game/ReviewEndpoints.cs

@@ -23,4 +23,43 @@ public Response SubmitRating(RequestContext context, GameDatabaseContext databas
         bool rated = database.RateLevel(level, user, (RatingType)rating);
         return rated ? OK : Unauthorized;
     }
+
+    [GameEndpoint("rate/user/{id}", ContentType.Xml, Method.Post)]
+    [AllowEmptyBody]
+    public Response RateUserLevel(RequestContext context, GameDatabaseContext database, GameUser user, int id)
+    {
+        string? ratingString = context.QueryString.Get("rating");
+
+        if (ratingString == null) return BadRequest;
+
+        if (!int.TryParse(ratingString, out int ratingInt)) return BadRequest;
+
+        RatingType rating;
+        switch (ratingInt)
+        {
+            case 1:
+            case 2:
+                rating = RatingType.Boo;
+                break;
+            case 3:
+                rating = RatingType.Neutral;
+                break;
+            case 4:
+            case 5:
+                rating = RatingType.Yay;
+                break;
+            default:
+                return BadRequest;
+        }
+
+        GameLevel? level = database.GetLevelById(id);
+
+        if (level == null)
+        {
+            return NotFound;
+        }
+
+        return database.RateLevel(level, user, rating) ? OK : Unauthorized;
+
+    } 
 }

Refresh.GameServer/Endpoints/Game/UserEndpoints.cs

@@ -95,7 +95,7 @@ public SerializedUserList GetMultipleUsers(RequestContext context, GameDatabaseC
             return null;
         }
 
-        if (data.IconHash != null && !dataStore.ExistsInStore(data.IconHash))
+        if (data.IconHash != null && !data.IconHash.StartsWith("g") && !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;

Refresh.GameServer/Extensions/RequestContextExtensions.cs

@@ -18,4 +18,7 @@ public static (int, int) GetPageData(this RequestContext context, bool api = fal
 
         return (skip, count);
     }
+
+    [Pure]
+    public static bool IsPSP(this RequestContext context) => context.RequestHeaders.Get("User-Agent") == "LBPPSP CLIENT";
 }

Refresh.GameServer/Importing/AssetImporter.cs

@@ -3,6 +3,7 @@
 using Bunkum.HttpServer.Storage;
 using JetBrains.Annotations;
 using NotEnoughLogs;
+using Refresh.GameServer.Authentication;
 using Refresh.GameServer.Database;
 using Refresh.GameServer.Types.Assets;
 
@@ -48,7 +49,7 @@ public void ImportFromDataStore(GameDatabaseContext context, IDataStore dataStor
         {
             byte[] data = dataStore.GetDataFromStore(hash);
 
-            GameAsset? asset = this.ReadAndVerifyAsset(hash, data);
+            GameAsset? asset = this.ReadAndVerifyAsset(hash, data, null);
             if (asset == null) continue;
 
             assets.Add(asset);
@@ -65,7 +66,7 @@ public void ImportFromDataStore(GameDatabaseContext context, IDataStore dataStor
     }
 
     [Pure]
-    public GameAsset? ReadAndVerifyAsset(string hash, byte[] data)
+    public GameAsset? ReadAndVerifyAsset(string hash, byte[] data, TokenPlatform? platform)
     {
         string checkedHash = BitConverter.ToString(SHA1.HashData(data))
             .Replace("-", "")
@@ -82,7 +83,7 @@ public void ImportFromDataStore(GameDatabaseContext context, IDataStore dataStor
             UploadDate = DateTimeOffset.Now,
             OriginalUploader = null,
             AssetHash = hash,
-            AssetType = DetermineAssetType(data),
+            AssetType = DetermineAssetType(data, platform),
         };
 
         return asset;

Refresh.GameServer/Importing/Importer.cs

@@ -5,6 +5,7 @@
 using Bunkum.HttpServer;
 using NotEnoughLogs;
 using NotEnoughLogs.Loggers;
+using Refresh.GameServer.Authentication;
 using Refresh.GameServer.Types.Assets;
 
 namespace Refresh.GameServer.Importing;
@@ -59,8 +60,43 @@ private static bool MatchesMagic(ReadOnlySpan<byte> data, ulong magic)
         BitConverter.TryWriteBytes(magicSpan, BinaryPrimitives.ReverseEndianness(magic));
         return MatchesMagic(data, magicSpan);
     }
+
+    /// <summary>
+    /// Tries to detect TGA files sent from the PSP
+    /// </summary>
+    /// <param name="data">The data to check</param>
+    /// <returns>Whether the file is likely of TGA format</returns>
+    private static bool IsPspTga(ReadOnlySpan<byte> data)
+    {
+        byte imageIdLength = data[0];
+        byte colorMapType = data[1];
+        byte imageType = data[2];
+        ReadOnlySpan<byte> colorMapSpecification = data[3..8];
+        ReadOnlySpan<byte> imageSpecification = data[8..18];
+        short xOrigin = BinaryPrimitives.ReadInt16LittleEndian(imageSpecification[..2]);
+        short yOrigin = BinaryPrimitives.ReadInt16LittleEndian(imageSpecification[2..4]);
+        ushort width = BinaryPrimitives.ReadUInt16LittleEndian(imageSpecification[4..6]);
+        ushort height = BinaryPrimitives.ReadUInt16LittleEndian(imageSpecification[6..8]);
+        byte depth = imageSpecification[8];
+        byte descriptor = imageSpecification[9];
+
+        //PSP does not seem to fill out this information
+        if (imageIdLength != 0) return false;
+        if (xOrigin != 0) return false;
+        if (yOrigin != 0) return false;
+        //These are the fields set by PSP, that shouldn't change from image to image
+        if (colorMapType != 1) return false;
+        if (descriptor != 0) return false;
+        if (imageType != 1) return false;
+        if (depth != 8) return false;
+        //Reasonable validation checks (PSP seems to only send images of max size 480x272)
+        if (width > 500) return false;
+        if (height > 300) return false;
+
+        return true;
+    }
 
-    protected GameAssetType DetermineAssetType(ReadOnlySpan<byte> data)
+    protected GameAssetType DetermineAssetType(ReadOnlySpan<byte> data, TokenPlatform? tokenPlatform)
     {
         // LBP assets
         if (MatchesMagic(data, "TEX "u8)) return GameAssetType.Texture;
@@ -79,6 +115,8 @@ protected GameAssetType DetermineAssetType(ReadOnlySpan<byte> data)
         // Good reference for magics: https://en.wikipedia.org/wiki/List_of_file_signatures
         if (MatchesMagic(data, 0xFFD8FFE0)) return GameAssetType.Jpeg;
         if (MatchesMagic(data, 0x89504E470D0A1A0A)) return GameAssetType.Png;
+
+        if (tokenPlatform is null or TokenPlatform.PSP && IsPspTga(data)) return GameAssetType.Tga;
 
         this.Warn($"Unknown asset header [0x{Convert.ToHexString(data[..4])}] [str: {Encoding.ASCII.GetString(data[..4])}]");