[Horizon/WebAPIService/SVO] - Various bug fixes.

Horizon: Fixes some packet handling bugs, revised the MPS game joining appid exception check to match the MUM one, removes some useless extension methods.

WebAPIServive: Fixes a double to int parsing bug for the furniture_up endpoint in the JUGGERNAUT Bramblenook API.

SVO: Fixes the Wipeout 2048 leaderboard handling (no data for now).

Author: GitHubProUser67

AuxiliaryServices/HorizonService/LIBRARY.Common/Utils.cs

@@ -1,37 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 
 namespace Horizon.LIBRARY.Common
 {
     public static class Utils
     {
-        public static byte[] FromString(string str)
-        {
-            byte[] buffer = new byte[str.Length / 2];
-
-            for (int i = 0; i < buffer.Length; ++i)
-            {
-                buffer[i] = byte.Parse(str.Substring(i * 2, 2), System.Globalization.NumberStyles.HexNumber);
-            }
-
-            return buffer;
-        }
-
-        public static byte[] FromStringFlipped(string str)
-        {
-            byte[] buffer = new byte[str.Length / 2];
-
-            int strIndex = str.Length - 2;
-            for (int i = 0; i < buffer.Length; ++i)
-            {
-                buffer[i] = byte.Parse(str.Substring(strIndex, 2), System.Globalization.NumberStyles.HexNumber);
-                strIndex -= 2;
-            }
-
-            return buffer;
-        }
-
         #region LINQ
 
         /// <summary>

AuxiliaryServices/HorizonService/RT.Common/Types.cs

@@ -2389,6 +2389,17 @@ public enum MGCL_GAME_HOST_TYPE : int
         MGCLGameHostMax = 7,
     }
 
+    [Flags]
+    public enum StartupMessageFlags : byte
+    {
+        None = 0,
+        HasStartupInfo = 1 << 1, // 0x02
+        HasGlobalTimeReset = 1 << 2, // 0x04
+        HasFieldSetA = 1 << 3, // 0x08
+        HasFieldSetB = 1 << 4, // 0x10
+        HasFieldSetC = 1 << 5, // 0x20
+    }
+
     public enum MGCL_ERROR_CODE : sbyte
     {
         /// <summary>

AuxiliaryServices/HorizonService/RT.Models/Lobby/MediusGetMyClanMessagesResponse.cs

@@ -25,7 +25,6 @@ public override void Deserialize(MessageReader reader)
             MessageID = reader.Read<MessageId>();
             StatusCode = reader.Read<MediusCallbackStatus>();
             ClanID = reader.ReadInt32();
-
 
             if (reader.MediusVersion == 113)
             {
@@ -35,8 +34,6 @@ public override void Deserialize(MessageReader reader)
             else
                 Message = reader.ReadString(Constants.CLANMSG_MAXLEN);
 
-            //Message = reader.ReadString(Constants.CLANMSG_MAXLEN);
-
             EndOfList = reader.ReadBoolean();
         }
 
@@ -47,7 +44,6 @@ public override void Serialize(MessageWriter writer)
             writer.Write(MessageID ?? MessageId.Empty);
             writer.Write(StatusCode);
             writer.Write(ClanID);
-
 
             if (writer.MediusVersion == 113)
             {
@@ -57,7 +53,6 @@ public override void Serialize(MessageWriter writer)
             else
                 writer.Write(Message, Constants.CLANMSG_MAXLEN);
 
-            //writer.Write(Message, Constants.CLANMSG_MAXLEN);
             writer.Write(EndOfList);
         }
 

AuxiliaryServices/HorizonService/RT.Models/Lobby/MediusSendClanMessageRequest.cs

@@ -17,37 +17,26 @@ public class MediusSendClanMessageRequest : BaseLobbyMessage, IMediusRequest
 
         public override void Deserialize(MessageReader reader)
         {
-            // 
             base.Deserialize(reader);
 
-            // 
             MessageID = reader.Read<MessageId>();
             SessionKey = reader.ReadString(Constants.SESSIONKEY_MAXLEN);
-            if(reader.MediusVersion == 113)
-            {
+            if (reader.MediusVersion == 113)
                 Message = reader.ReadString(Constants.CLANMSG_MAXLEN_113_2);
-            } else
-            {
+            else
                 Message = reader.ReadString(Constants.CLANMSG_MAXLEN);
-            }
         }
 
         public override void Serialize(MessageWriter writer)
         {
-            // 
             base.Serialize(writer);
 
-            // 
             writer.Write(MessageID ?? MessageId.Empty);
             writer.Write(SessionKey, Constants.SESSIONKEY_MAXLEN);
             if (writer.MediusVersion == 113)
-            {
                 writer.Write(Message, Constants.CLANMSG_MAXLEN_113_2);
-            }
             else
-            {
                 writer.Write(Message, Constants.CLANMSG_MAXLEN);
-            }
         }
 
         public override string ToString()

AuxiliaryServices/HorizonService/RT.Models/Lobby/MediusSendClanMessageResponse.cs

@@ -16,21 +16,17 @@ public class MediusSendClanMessageResponse : BaseLobbyMessage, IMediusResponse
 
         public override void Deserialize(MessageReader reader)
         {
-            // 
             base.Deserialize(reader);
 
-            // 
             MessageID = reader.Read<MessageId>();
             reader.ReadBytes(3);
             StatusCode = reader.Read<MediusCallbackStatus>();
         }
 
         public override void Serialize(MessageWriter writer)
         {
-            // 
             base.Serialize(writer);
 
-            // 
             writer.Write(MessageID ?? MessageId.Empty);
             writer.Write(new byte[3]);
             writer.Write(StatusCode);

AuxiliaryServices/HorizonService/RT.Models/MGCL/MediusServerCreateGameOnSelfRequest0.cs

@@ -63,9 +63,17 @@ public override void Serialize(MessageWriter writer)
             base.Serialize(writer);
 
             writer.Write(MessageID ?? MessageId.Empty);
-            writer.Write(GameName, Constants.MGCL_GAMENAME_MAXLEN);
+
+            if (writer.MediusVersion == 113)
+                writer.Write(GameName, Constants.MGCL_GAMENAME_MAXLEN1);
+            else
+                writer.Write(GameName, Constants.MGCL_GAMENAME_MAXLEN);
             writer.Write(GameStats, Constants.MGCL_GAMESTATS_MAXLEN);
-            writer.Write(GamePassword, Constants.MGCL_GAMEPASSWORD_MAXLEN);
+
+            if (writer.MediusVersion == 113)
+                writer.Write(GamePassword, Constants.MGCL_GAMEPASSWORD_MAXLEN1);
+            else
+                writer.Write(GamePassword, Constants.MGCL_GAMEPASSWORD_MAXLEN);
             writer.Write(new byte[3]);
             writer.Write(ApplicationID);
             writer.Write(MaxPlayers);

AuxiliaryServices/HorizonService/RT.Models/RT/RT_MSG_SERVER_APP.cs

@@ -10,7 +10,7 @@ public class RT_MSG_SERVER_APP : BaseScertMessage
         public override RT_MSG_TYPE Id => RT_MSG_TYPE.RT_MSG_SERVER_APP;
 
         public BaseMediusMessage Message { get; set; } = null;
-        //public BaseMediusGHSMessage GHSMessage { get; set; } = null;
+
         public override bool SkipEncryption
         {
             get => Message?.SkipEncryption ?? base.SkipEncryption;
@@ -24,32 +24,16 @@ public override bool SkipEncryption
         public override void Deserialize(MessageReader reader)
         {
             Message = BaseMediusMessage.Instantiate(reader);
-            /*
-            if(reader.AppId == 0)
-            {
-                //GHSMessage = BaseMediusGHSMessage.Instantiate(reader);
-            } else
-            {
-
-            }
-            */
         }
 
         public override void Serialize(MessageWriter writer)
         {
-            writer.Write(Message.PacketClass);
-            writer.Write(Message.PacketType);
-            Message.Serialize(writer);
-            /*
             if (Message != null)
             {
-            } else
-            {
-                writer.Write(GHSMessage.msgSize);
-                writer.Write(ReverseBytes16((ushort)GHSMessage.GhsOpcode));
-                GHSMessage.Serialize(writer);
+                writer.Write(Message.PacketClass);
+                writer.Write(Message.PacketType);
+                Message.Serialize(writer);
             }
-            */
         }
 
         public override bool CanLog()
@@ -65,23 +49,6 @@ public override string ToString()
         {
             return base.ToString() + " " +
                 $"Message: {Message}";
-            /*
-            if(Message != null)
-            {
-            } else {
-                return base.ToString() + " " +
-                    $"GHSMessage: {GHSMessage}";
-            }
-            */
-        }
-         /// <summary>
-         /// Reverses UInt16 
-         /// </summary>
-         /// <param name="nValue"></param>
-         /// <returns></returns>
-        public static ushort ReverseBytes16(ushort nValue)
-        {
-            return (ushort)((ushort)((nValue >> 8)) | (nValue << 8));
         }
     }
 }

AuxiliaryServices/HorizonService/RT.Models/RT/RT_MSG_SERVER_CONNECT_ACCEPT_TCP.cs

@@ -20,7 +20,6 @@ public class RT_MSG_SERVER_CONNECT_ACCEPT_TCP : BaseScertMessage
 
         public override void Deserialize(MessageReader reader)
         {
-
             if (reader.MediusVersion <= 108)
             {
                 UNK_07 = reader.ReadBytes(3);

AuxiliaryServices/HorizonService/RT.Models/RT/RT_MSG_SERVER_HELLO.cs

@@ -1,9 +1,8 @@
-using System.IO;
 using Org.BouncyCastle.Math;
 using Horizon.RT.Common;
-using Horizon.LIBRARY.Common;
 using Horizon.LIBRARY.Common.Stream;
 using System;
+using NetworkLibrary.Extension;
 
 namespace Horizon.RT.Models
 {
@@ -20,8 +19,8 @@ public class RT_MSG_SERVER_HELLO : BaseScertMessage
         public bool MLS = false;
         public byte EncryptFlagDisable = 0x02;
 
-        public byte[] Certificate = Utils.FromString("71000006e702308202e3308201cba00302010202140100000000000000000000001100000000000001300d06092a864886f70d0101050500308196310b3009060355040613025553310b3009060355040813024341311230100603550407130953616e20446965676f3131302f060355040a1328534f4e5920436f6d707574657220456e7465727461696e6d656e7420416d657269636120496e632e31143012060355040b130b53434552542047726f7570311d301b06035504031314534345525420526f6f7420417574686f72697479301e170d3035303432363231303133385a170d3335303432353233353935395a308187310b3009060355040613025553310b3009060355040813024341311230100603550407130953616e20446965676f3131302f060355040a1328534f4e5920436f6d707574657220456e7465727461696e6d656e7420416d657269636120496e632e31143012060355040b130b53434552542047726f7570310e300c060355040313054d41532031305c300d06092a864886f70d0101010500034b003048024100c4f75716ec835d2325689f91ff85ed9bfc3211db9c164f41852e264e569d2802008054a0ef459e7e3eabb87fae576e735434d1d124b30b11bd6de098148601550203000011300d06092a864886f70d010105050003820101006c91abeeb59ac01dfbb080646e4df616f833c36a5a448773f7c1acb8ec162ff811ab11f8051294e20754361827b259a534b010dfbb42e56b571ae453779682ca8650ac5dd0b3888cfb16fb858e5c39dff094380bc4f6f0268ade80c22878afc4c16099c64d435a9ab67101e63b0f5336febb1f71683ba0b0ac7eab2ef0d10d9324b6ce5683d1ab359deda17c47f2a253162674be37c2ce185d90c76b7fd7d9983c289747ad10828b385b82d7eb18f52f2eced4c3a65b0dd63dd8c83c5f92203829fdbf1a85c78b869283b0b1d5fe1bb5e85749abf50e46d9decca190c2d954b6e442e58fbde9958af397e9af575e1f76d63f35ee5987406c109db7da50557e8600000000");
-        public byte[] MLSCert = Utils.FromString("71000006e702308202e3308201cba00302010202140100000000000000000000001100000000000004300d06092a864886f70d0101050500308196310b3009060355040613025553310b3009060355040813024341311230100603550407130953616e20446965676f3131302f060355040a1328534f4e5920436f6d707574657220456e7465727461696e6d656e7420416d657269636120496e632e31143012060355040b130b53434552542047726f7570311d301b06035504031314534345525420526f6f7420417574686f72697479301e170d3035303432373231303233335a170d3335303432363233353935395a308187310b3009060355040613025553310b3009060355040813024341311230100603550407130953616e20446965676f3131302f060355040a1328534f4e5920436f6d707574657220456e7465727461696e6d656e7420416d657269636120496e632e31143012060355040b130b53434552542047726f7570310e300c060355040313054d4c532030305c300d06092a864886f70d0101010500034b003048024100cf16b818a204ba6db8fc85d866e4f708e6cfa754a5a2399d08eafdfdbbff852d3f1c86944e157dd8f6408d7cd9cfdab409d32fddee05bdde8cff303187b374690203000011300d06092a864886f70d010105050003820101007cc5ccb73e8bffb1888d870279767063a8ea2a619fdd3bbc0b1209b5384853408ec61aafa8b9071f9e41ab93bb56dbcea59ebf18ca113775fd146c3e97fb673db572f849dc906e9f6ee6817cdcf104c4ac4758020ff2443b770d0979fce7cd8807c69ef787e51660e22e35ca19f43da41346ee619d1a707c335684f183ea432c38aaf5dbb277c8527ad98412d7624362d89d52af9f39459db0c5159a8d737262b4a9abdd95b1b8d9d586230bc3cef9fafab68b0fa8e516a89672aa4f0b3956c0a1fbb392b4b7cfca233bee6b83a4b90fe9a8211803f35f3ab83ef81dd2077e185cfc86204adc2538225951a6e9473540d647cbca5d2f6d189644006f2af7d85386dbb9b3d4885887fbb394268da005317eff6eed");
+        public byte[] Certificate = "71000006e702308202e3308201cba00302010202140100000000000000000000001100000000000001300d06092a864886f70d0101050500308196310b3009060355040613025553310b3009060355040813024341311230100603550407130953616e20446965676f3131302f060355040a1328534f4e5920436f6d707574657220456e7465727461696e6d656e7420416d657269636120496e632e31143012060355040b130b53434552542047726f7570311d301b06035504031314534345525420526f6f7420417574686f72697479301e170d3035303432363231303133385a170d3335303432353233353935395a308187310b3009060355040613025553310b3009060355040813024341311230100603550407130953616e20446965676f3131302f060355040a1328534f4e5920436f6d707574657220456e7465727461696e6d656e7420416d657269636120496e632e31143012060355040b130b53434552542047726f7570310e300c060355040313054d41532031305c300d06092a864886f70d0101010500034b003048024100c4f75716ec835d2325689f91ff85ed9bfc3211db9c164f41852e264e569d2802008054a0ef459e7e3eabb87fae576e735434d1d124b30b11bd6de098148601550203000011300d06092a864886f70d010105050003820101006c91abeeb59ac01dfbb080646e4df616f833c36a5a448773f7c1acb8ec162ff811ab11f8051294e20754361827b259a534b010dfbb42e56b571ae453779682ca8650ac5dd0b3888cfb16fb858e5c39dff094380bc4f6f0268ade80c22878afc4c16099c64d435a9ab67101e63b0f5336febb1f71683ba0b0ac7eab2ef0d10d9324b6ce5683d1ab359deda17c47f2a253162674be37c2ce185d90c76b7fd7d9983c289747ad10828b385b82d7eb18f52f2eced4c3a65b0dd63dd8c83c5f92203829fdbf1a85c78b869283b0b1d5fe1bb5e85749abf50e46d9decca190c2d954b6e442e58fbde9958af397e9af575e1f76d63f35ee5987406c109db7da50557e8600000000".HexStringToByteArray();
+        public byte[] MLSCert = "71000006e702308202e3308201cba00302010202140100000000000000000000001100000000000004300d06092a864886f70d0101050500308196310b3009060355040613025553310b3009060355040813024341311230100603550407130953616e20446965676f3131302f060355040a1328534f4e5920436f6d707574657220456e7465727461696e6d656e7420416d657269636120496e632e31143012060355040b130b53434552542047726f7570311d301b06035504031314534345525420526f6f7420417574686f72697479301e170d3035303432373231303233335a170d3335303432363233353935395a308187310b3009060355040613025553310b3009060355040813024341311230100603550407130953616e20446965676f3131302f060355040a1328534f4e5920436f6d707574657220456e7465727461696e6d656e7420416d657269636120496e632e31143012060355040b130b53434552542047726f7570310e300c060355040313054d4c532030305c300d06092a864886f70d0101010500034b003048024100cf16b818a204ba6db8fc85d866e4f708e6cfa754a5a2399d08eafdfdbbff852d3f1c86944e157dd8f6408d7cd9cfdab409d32fddee05bdde8cff303187b374690203000011300d06092a864886f70d010105050003820101007cc5ccb73e8bffb1888d870279767063a8ea2a619fdd3bbc0b1209b5384853408ec61aafa8b9071f9e41ab93bb56dbcea59ebf18ca113775fd146c3e97fb673db572f849dc906e9f6ee6817cdcf104c4ac4758020ff2443b770d0979fce7cd8807c69ef787e51660e22e35ca19f43da41346ee619d1a707c335684f183ea432c38aaf5dbb277c8527ad98412d7624362d89d52af9f39459db0c5159a8d737262b4a9abdd95b1b8d9d586230bc3cef9fafab68b0fa8e516a89672aa4f0b3956c0a1fbb392b4b7cfca233bee6b83a4b90fe9a8211803f35f3ab83ef81dd2077e185cfc86204adc2538225951a6e9473540d647cbca5d2f6d189644006f2af7d85386dbb9b3d4885887fbb394268da005317eff6eed".HexStringToByteArray();
         public BigInteger RsaPublicKey = BigInteger.Zero;
 
         public RT_MSG_SERVER_HELLO()
@@ -38,7 +37,7 @@ public override void Deserialize(MessageReader reader)
         public override void Serialize(MessageWriter writer)
         {
             //If PS3 Medius Version 112/113, Send PS3 MAS Cert for Encryption/Decryption
-            if ((writer.MediusVersion == 112 || writer.MediusVersion == 113) && MLS == false)
+            if ((writer.MediusVersion == 112 || writer.MediusVersion == 113) && !MLS)
             {
                 // serialize rsa modulus
                 // this is sent in server hello at offset 0x194
@@ -55,7 +54,7 @@ public override void Serialize(MessageWriter writer)
                 writer.Write(Certificate);
             }
             //If PS3 Medius Version 112/113, and is MLS, Send PS3 MLS Cert for Encryption/Decryption
-            else if ((writer.MediusVersion == 112 || writer.MediusVersion == 113) && MLS == true)
+            else if ((writer.MediusVersion == 112 || writer.MediusVersion == 113) && MLS)
             {
                 // serialize rsa modulus
                 // this is sent in server hello at offset 0x194