AmongUs/Impostor
1
0 Fork 0
mirror of https://github.com/Impostor/Impostor.git synced 2026-10-19 15:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #599 from miniduikboot/fix/compatman-no-invalid-clients

Browse Source 
Improve CompatMgr behaviour for unknown versions
This commit is contained in:
miniduikboot authored and GitHub committed 2024-07-19 20:11:44 +02:00
2 parents 34c14f69a4 a61524842f
commit b218079f9e
2 files changed
+22 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Impostor.Server/Net/Manager/CompatibilityManager.cs
+8 -7
View File
@@ -63,6 +63,12 @@ internal class CompatibilityManager : ICompatibilityManager
return null;
}
private CompatibilityGroup GetCompatibilityGroupOrDefault(GameVersion clientVersion)
{
// If the compatibility group is not defined, we assume it is not compatible with anything else than itself
return TryGetCompatibilityGroup(clientVersion) ?? new CompatibilityGroup(new[] { clientVersion.Normalize() });
}
public VersionCompareResult CanConnectToServer(GameVersion clientVersion)
{
if (this.TryGetCompatibilityGroup(clientVersion) != null)
@@ -91,13 +97,8 @@ internal class CompatibilityManager : ICompatibilityManager
return GameJoinError.None;
}
var hostCompatGroup = this.TryGetCompatibilityGroup(hostVersion);
var playerCompatGroup = this.TryGetCompatibilityGroup(clientVersion);
if (hostCompatGroup == null || playerCompatGroup == null)
{
return GameJoinError.InvalidClient;
}
var hostCompatGroup = GetCompatibilityGroupOrDefault(hostVersion);
var playerCompatGroup = GetCompatibilityGroupOrDefault(clientVersion);
if (hostCompatGroup != playerCompatGroup)
{
src/Impostor.Tests/CompatibilityManagerTests.cs
+14 -2
View File
@@ -48,11 +48,23 @@ public sealed class CompatibilityManagerTests
public static IEnumerable<object[]> CanJoinGameData =>
new List<object[]>
{
// Same version -> can join
new object[] { GameJoinError.None, new GameVersion(1, 0, 0), new GameVersion(1, 0, 0) },
new object[] { GameJoinError.InvalidClient, new GameVersion(1, 0, 0), new GameVersion(100, 0, 0) },
// Compatible versions -> can join
new object[] { GameJoinError.None, new GameVersion(2, 0, 0), new GameVersion(2, 1, 0) },
// Different incompatible versions -> show correct error
new object[] { GameJoinError.ClientOutdated, new GameVersion(2, 0, 0), new GameVersion(1, 0, 0) },
new object[] { GameJoinError.ClientTooNew, new GameVersion(1, 0, 0), new GameVersion(2, 0, 0) },
new object[] { GameJoinError.None, new GameVersion(2, 0, 0), new GameVersion(2, 1, 0) },
// Versions unknown to Impostor -> also show correct errors
new object[] { GameJoinError.ClientTooNew, new GameVersion(0, 0, 1), new GameVersion(1, 0, 0) },
new object[] { GameJoinError.ClientOutdated, new GameVersion(1, 0, 0), new GameVersion(0, 0, 1) },
new object[] { GameJoinError.ClientTooNew, new GameVersion(1, 0, 0), new GameVersion(100, 0, 0) },
new object[] { GameJoinError.ClientOutdated, new GameVersion(100, 0, 0), new GameVersion(1, 0, 0) },
new object[] { GameJoinError.ClientTooNew, new GameVersion(0, 0, 1), new GameVersion(100, 0, 0) },
};
[Theory]