sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Always clone messages incoming from client-side

Browse Source
This commit is contained in:
Dan Balasescu
2022-07-01 19:36:37 +09:00
parent 37acec1952
commit 084a65578c
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
View File

@ -201,13 +201,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
Debug.Assert(ServerRoom != null); Debug.Assert(ServerRoom != null);
var user = ServerRoom.Users.Single(u => u.UserID == userId); var user = ServerRoom.Users.Single(u => u.UserID == userId);
user.BeatmapAvailability = clone(newBeatmapAvailability); user.BeatmapAvailability = newBeatmapAvailability;
((IMultiplayerClient)this).UserBeatmapAvailabilityChanged(clone(userId), clone(user.BeatmapAvailability)); ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged(clone(userId), clone(user.BeatmapAvailability));
} }
protected override async Task<MultiplayerRoom> JoinRoom(long roomId, string? password = null) protected override async Task<MultiplayerRoom> JoinRoom(long roomId, string? password = null)
{ {
roomId = clone(roomId);
password = clone(password);
ServerAPIRoom = roomManager.ServerSideRooms.Single(r => r.RoomID.Value == roomId); ServerAPIRoom = roomManager.ServerSideRooms.Single(r => r.RoomID.Value == roomId);
if (password != ServerAPIRoom.Password.Value) if (password != ServerAPIRoom.Password.Value)
@ -262,6 +265,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
public override Task TransferHost(int userId) public override Task TransferHost(int userId)
{ {
userId = clone(userId);
Debug.Assert(ServerRoom != null); Debug.Assert(ServerRoom != null);
ServerRoom.Host = ServerRoom.Users.Single(u => u.UserID == userId); ServerRoom.Host = ServerRoom.Users.Single(u => u.UserID == userId);
@ -271,10 +276,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
public override Task KickUser(int userId) public override Task KickUser(int userId)
{ {
userId = clone(userId);
Debug.Assert(ServerRoom != null); Debug.Assert(ServerRoom != null);
var user = ServerRoom.Users.Single(u => u.UserID == userId); var user = ServerRoom.Users.Single(u => u.UserID == userId);
ServerRoom.Users.Remove(user); ServerRoom.Users.Remove(user);
return ((IMultiplayerClient)this).UserKicked(clone(user)); return ((IMultiplayerClient)this).UserKicked(clone(user));
@ -282,11 +288,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
public override async Task ChangeSettings(MultiplayerRoomSettings settings) public override async Task ChangeSettings(MultiplayerRoomSettings settings)
{ {
settings = clone(settings);
Debug.Assert(ServerRoom != null); Debug.Assert(ServerRoom != null);
Debug.Assert(currentItem != null); Debug.Assert(currentItem != null);
settings = clone(settings);
// Server is authoritative for the time being. // Server is authoritative for the time being.
settings.PlaylistItemId = ServerRoom.Settings.PlaylistItemId; settings.PlaylistItemId = ServerRoom.Settings.PlaylistItemId;
ServerRoom.Settings = settings; ServerRoom.Settings = settings;
@ -304,40 +310,44 @@ namespace osu.Game.Tests.Visual.Multiplayer
public override Task ChangeState(MultiplayerUserState newState) public override Task ChangeState(MultiplayerUserState newState)
{ {
newState = clone(newState);
if (newState == MultiplayerUserState.Idle && LocalUser?.State == MultiplayerUserState.WaitingForLoad) if (newState == MultiplayerUserState.Idle && LocalUser?.State == MultiplayerUserState.WaitingForLoad)
return Task.CompletedTask; return Task.CompletedTask;
ChangeUserState(api.LocalUser.Value.Id, newState); ChangeUserState(api.LocalUser.Value.Id, clone(newState));
return Task.CompletedTask; return Task.CompletedTask;
} }
public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability) public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
{ {
ChangeUserBeatmapAvailability(api.LocalUser.Value.Id, newBeatmapAvailability); ChangeUserBeatmapAvailability(api.LocalUser.Value.Id, clone(newBeatmapAvailability));
return Task.CompletedTask; return Task.CompletedTask;
} }
public void ChangeUserMods(int userId, IEnumerable<Mod> newMods) public void ChangeUserMods(int userId, IEnumerable<Mod> newMods)
=> ChangeUserMods(userId, newMods.Select(m => new APIMod(m)).ToList()); => ChangeUserMods(userId, newMods.Select(m => new APIMod(m)));
public void ChangeUserMods(int userId, IEnumerable<APIMod> newMods) public void ChangeUserMods(int userId, IEnumerable<APIMod> newMods)
{ {
Debug.Assert(ServerRoom != null); Debug.Assert(ServerRoom != null);
var user = ServerRoom.Users.Single(u => u.UserID == userId); var user = ServerRoom.Users.Single(u => u.UserID == userId);
user.Mods = clone(newMods).ToArray(); user.Mods = newMods.ToArray();
((IMultiplayerClient)this).UserModsChanged(clone(userId), clone(user.Mods)); ((IMultiplayerClient)this).UserModsChanged(clone(userId), clone(user.Mods));
} }
public override Task ChangeUserMods(IEnumerable<APIMod> newMods) public override Task ChangeUserMods(IEnumerable<APIMod> newMods)
{ {
ChangeUserMods(api.LocalUser.Value.Id, newMods); ChangeUserMods(api.LocalUser.Value.Id, clone(newMods));
return Task.CompletedTask; return Task.CompletedTask;
} }
public override async Task SendMatchRequest(MatchUserRequest request) public override async Task SendMatchRequest(MatchUserRequest request)
{ {
request = clone(request);
Debug.Assert(ServerRoom != null); Debug.Assert(ServerRoom != null);
Debug.Assert(LocalUser != null); Debug.Assert(LocalUser != null);
@ -455,7 +465,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
updateRoomStateIfRequired(); updateRoomStateIfRequired();
} }
public override Task RemovePlaylistItem(long playlistItemId) => RemoveUserPlaylistItem(api.LocalUser.Value.OnlineID, playlistItemId); public override Task RemovePlaylistItem(long playlistItemId) => RemoveUserPlaylistItem(api.LocalUser.Value.OnlineID, clone(playlistItemId));
private async Task changeMatchType(MatchType type) private async Task changeMatchType(MatchType type)
{ {