- Pass on safety, optimization and error handling

Author: x64-dev

GenOnlineService/Constants.cs

@@ -238,11 +238,11 @@ public static async Task<UserWebSocketInstance> CreateSession(bool bIsReconnect,
 			return newSess;
 		}
 
-		public static async void Tick()
+		public static async Task Tick()
 		{
 			foreach (var kvPair in m_dictUserSessions)
 			{
-				kvPair.Value.TickWebsocket();
+				await kvPair.Value.TickWebsocket();
 			}
 		}
 
@@ -642,7 +642,7 @@ public async Task<UserWebSocketInstance> CloseWebsocket(WebSocketCloseStatus rea
 			return websocketForUser;
 		}
 
-		public async void TickWebsocket()
+		public async Task TickWebsocket()
 		{
 			// Do we have a connection to send on?
 			UserWebSocketInstance websocketForUser = WebSocketManager.GetWebSocketForSession(this);
@@ -748,7 +748,7 @@ public bool WasPlayerInMatch(UInt64 matchID, out int slotIndexInLobby, out int a
 			return bWasInMatch;
 		}
 
-		public async void UpdateSessionNetworkRoom(Int16 newRoomID)
+		public async Task UpdateSessionNetworkRoom(Int16 newRoomID)
 		{
 			Int16 oldRoom = networkRoomID;
 			networkRoomID = newRoomID;

GenOnlineService/Controllers/Lobbies/LobbiesController.cs

@@ -60,12 +60,31 @@ public override Type GetReturnType()
 	public class LobbiesController : ControllerBase
 	{
 		private readonly ILogger<LobbiesController> _logger;
+		private static List<RoomData>? s_cachedRooms = null;
+		private static readonly object s_roomsLock = new object();
 
 		public LobbiesController(ILogger<LobbiesController> logger)
 		{
 			_logger = logger;
 		}
 
+		// Cache rooms.json data to avoid disk I/O on every request
+		private static async Task<List<RoomData>?> GetCachedRooms(JsonSerializerOptions options)
+		{
+			if (s_cachedRooms == null)
+			{
+				lock (s_roomsLock)
+				{
+					if (s_cachedRooms == null)
+					{
+						string strFileData = System.IO.File.ReadAllText(Path.Combine("data", "rooms.json"));
+						s_cachedRooms = JsonSerializer.Deserialize<List<RoomData>>(strFileData, options);
+					}
+				}
+			}
+			return await Task.FromResult(s_cachedRooms);
+		}
+
 		// FOR LATENCY ESTIMATIONS
 		// Convert degrees to radians
 		public static double ToRadians(double angleInDegrees)
@@ -136,9 +155,8 @@ public async Task<APIResult> Get()
 
 						if (sourceData != null)
 						{
-							// TODO: Dont deserialize this per request, cache it in the session
-							string strFileData = await System.IO.File.ReadAllTextAsync(Path.Combine("data", "rooms.json"));
-							List<RoomData>? lstRooms = JsonSerializer.Deserialize<List<RoomData>>(strFileData, options);
+							// Use cached rooms data
+							List<RoomData>? lstRooms = await GetCachedRooms(options);
 							if (lstRooms != null)
 							{
 								foreach (RoomData room in lstRooms)
@@ -307,6 +325,28 @@ public async Task<APIResult> Put()
 						UInt32 exe_crc = data["exe_crc"].GetUInt32();
 						UInt32 ini_crc = data["ini_crc"].GetUInt32();
 
+						// Input validation
+						if (strName != null && strName.Length > 255)
+						{
+							Response.StatusCode = (int)HttpStatusCode.BadRequest;
+							return result;
+						}
+						if (strMapName != null && strMapName.Length > 255)
+						{
+							Response.StatusCode = (int)HttpStatusCode.BadRequest;
+							return result;
+						}
+						if (strMapPath != null && strMapPath.Length > 512)
+						{
+							Response.StatusCode = (int)HttpStatusCode.BadRequest;
+							return result;
+						}
+						if (strPassword != null && strPassword.Length > 128)
+						{
+							Response.StatusCode = (int)HttpStatusCode.BadRequest;
+							return result;
+						}
+
 
 
 						// get requesting user data from session token

GenOnlineService/Controllers/Lobby/LobbyController.cs

@@ -263,7 +263,8 @@ public async Task<APIResult> Delete(Int64 lobbyID)
 				string jsonData = await reader.ReadToEndAsync();
 				var options = new JsonSerializerOptions
 				{
-					PropertyNameCaseInsensitive = true
+					PropertyNameCaseInsensitive = true,
+					MaxDepth = 32
 				};
 
 				try
@@ -487,7 +488,7 @@ public async Task<APIResult> Post(Int64 lobbyID)
 											}
 
 											// we have to manually send to the kicked user... they won't get the dirty lobby update anymore
-											lobby.DirtyRetransmitToSingleMember(KickedUserID);
+											await lobby.DirtyRetransmitToSingleMember(KickedUserID);
 										}
 									}
 								}

GenOnlineService/Controllers/Matchmaking/MatchmakingController.cs

@@ -71,7 +71,7 @@ public MatchmakingController(ILogger<MatchmakingController> logger)
 					{
 						UInt16 playlistID = data["playlist"].GetUInt16();
 						var array = data["maps"].EnumerateArray();
-						List<int> mapIndices = array.ToList().Select(x => x.GetInt32()).ToList();
+						List<int> mapIndices = array.Select(x => x.GetInt32()).ToList();
 						UInt32 exe_crc = data["exe_crc"].GetUInt32();
 						UInt32 ini_crc = data["ini_crc"].GetUInt32();
 

GenOnlineService/Controllers/WebSocket/WebSocketController.cs

@@ -21,6 +21,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System;
+using System.Buffers;
 using System.Net.WebSockets;
 using System.Security.Claims;
 using System.Text;
@@ -394,7 +395,7 @@ private async Task ProcessWSMessage(UserWebSocketInstance sourceWS, UserSession
 
 						outboundMsg.action = chatMessage.action;
 
-						// send to everyone (minus those who have the chatter blocked)
+						// Serialize once before broadcasting
 						byte[] bytesJSON = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(outboundMsg));
 
 						// send it to everyone in the same room
@@ -430,7 +431,7 @@ private async Task ProcessWSMessage(UserWebSocketInstance sourceWS, UserSession
 					if (data != null && data.ContainsKey("room"))
 					{
 						Int16 roomID = data["room"].GetInt16();
-						sourceUserSession.UpdateSessionNetworkRoom(roomID);
+						await sourceUserSession.UpdateSessionNetworkRoom(roomID);
 					}
 				}
 				else if (msgID == EWebSocketMessageID.NETWORK_ROOM_MARK_READY)
@@ -557,7 +558,7 @@ private async Task ProcessWSMessage(UserWebSocketInstance sourceWS, UserSession
 							outboundMsg.announcement = chatMessage.announcement;
 							outboundMsg.show_announcement_to_host = chatMessage.show_announcement_to_host;
 
-							// send to everyone in lobby
+							// Serialize once before broadcasting
 							byte[] bytesJSON = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(outboundMsg));
 
 							foreach (LobbyMember lobbyMember in playerLobby.Members)
@@ -630,15 +631,15 @@ private async Task ProcessWSMessage(UserWebSocketInstance sourceWS, UserSession
 					}
 
 					// start match + create placeholder match
-					lobbyInfo.UpdateState(ELobbyState.INGAME);
+					await lobbyInfo.UpdateState(ELobbyState.INGAME);
 
 					// simple websocket msg, has no data, so dont even read anything
 
 					// response
 					WebSocketMessage_Simple startCommand = new WebSocketMessage_Simple();
 					startCommand.msg_id = (int)EWebSocketMessageID.START_GAME;
 
-					// send to everyone in lobby
+					// Serialize once before broadcasting
 					byte[] bytesJSON = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(startCommand));
 
 					foreach (KeyValuePair<Int64, UserSession> sessionData in WebSocketManager.GetUserDataCache())
@@ -682,7 +683,7 @@ private async Task ProcessWSMessage(UserWebSocketInstance sourceWS, UserSession
 					WebSocketMessage_Simple startCommand = new WebSocketMessage_Simple();
 					startCommand.msg_id = (int)EWebSocketMessageID.FULL_MESH_CONNECTIVITY_CHECK_RESPONSE;
 
-					// send to everyone in lobby
+					// Serialize once before broadcasting
 					byte[] bytesJSON = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(startCommand));
 
 					foreach (KeyValuePair<Int64, UserSession> sessionData in WebSocketManager.GetUserDataCache())
@@ -757,12 +758,6 @@ private async Task ProcessWSMessage(UserWebSocketInstance sourceWS, UserSession
 				}
 				else if (msgID == EWebSocketMessageID.NETWORK_SIGNAL)
 				{
-					var options = new JsonSerializerOptions
-					{
-						PropertyNameCaseInsensitive = true,
-						AllowOutOfOrderMetadataProperties = true
-					};
-
 					WebSocketMessage_SignalBidirectional? signal =
 						JsonSerializer.Deserialize<WebSocketMessage_SignalBidirectional>(payload, JsonOpts);
 					//Console.WriteLine("Signal received: " + signal.signal);