Follow-up to #2721. It fixes how the remaining tests behave and changes no production code. ## CI - Both `dotnet test` steps pass `--filter "Category!=Manual"`. Before this, Manual-tagged tests ran on CI anyway. - The one surviving movement-throttle latency test is the only coverage of burst forgiveness over a full, wrapped history. It loses its Manual tag, so it runs on CI. ## Tests that passed on CI without testing anything - **Corpse and throwing tests.** They relied on tiledata for the weapon `Layer`, so on CI the equip silently failed and they asserted against empty lists. They now set `Layer` explicitly and assert the equip took effect. `TestThrown` also pins its own strength and range values, so a shard retuning SoulGlaive no longer breaks them. - **Healthbar poison rows.** Server.Tests registers no poisons, so every row tested `null`. They now use real poison levels. - **Account packet tests.** The mock accounts reported `Length` 0, so the character-list tests only ever encoded empty slots. They now encode the real characters. - **Pathing and AI tests that only mean something on real Trammel/Felucca terrain** are now guarded with `TileDataRequirement.SkipIfMissing()`: Britain desk and clutter scenes, house footprints (no MultiData on CI) and fingerprints. Tests that are valid on flat blank terrain stay unguarded. (A synthetic tiledata fixture to run these on CI is a planned follow-up.) - **Assertions that couldn't fail now check their claim.** Affected tests include the `DefaultWalker` cache use, cache on/off parity requiring a path, the recorder capability flags, the idle-pet gate, the monthly DST recurrence, the AdvancedSearch `Record.Exception` wrappers, `CanFitItem` with no branch-guarded assert, the Firewall callback, and `Import_NoMap`. The Geometry Parse asserts also now use the same input as their TryParse. ## Shared state Every test that changes process-wide state now restores it, even when an assert fails: - **The clock.** A new `TimerWheelScope` saves and restores `Core._tickCount`, `Core._now` and the timer wheel. `SimulatedClockScope` covers decay tests. - **StepCache settings and caches**, via `StepCacheStateScope`. - **Network state.** The ManualAllowlist, LoginAllowlist, firewall and BanChannel reporters are restored. Global packet handlers are now registered per test and removed afterwards, so they no longer stay registered for later tests. - **Data and config tables.** `ArchiveJournal` statics, `TileData.ItemTable`, `ObjectPropertyList.Enabled`, `Core.Expansion` and the localization table are restored. One `MobileStatusVersion` restore was resetting a different expansion than the one the test changed. - **Entities.** Tests with fixed serials now delete what they create. Fixed mobile serials moved to `World.NewMobile`, because deleting a hard-coded serial could unregister a live entity. - **Collection race.** `SpiralScanTests` no longer clears the spawn cache from a separate collection that could run in parallel with the cache-manager tests. - **Shared statics.** Classes reading shared static allowlists joined the sequential collection. ## Duplication New shared helpers replace copy-pasted harness code: - **Server.Tests:** `PacketAssert.Sends`, used by about 130 packet tests; `TestClientHarness`, `PersistencePipelineScope`, `NetTestHelpers`, `EntityCleanup` and one `TestMulti`. - **UOContent.Tests:** `TimerWheelScope`, which also holds one wraparound-safe `RunFor`/`RunUntil`; `AiTestStubs`, which merges six walker copies and five identical creature stubs; `MobileTestHarness`, `CommandTestHarness` and `TempDirectory`. Dead oracle packet classes are removed. ## Cost | Test | Before | After | |---|---|---| | `VirtualSerialTests` | 1.57s | 2ms (starts near the wrap via reflection instead of drawing ~17.9M serials) | | Event scheduler recurrence loop | 473ms | 1ms | | CrowdSec drain | 517ms | 16ms (event-driven instead of a fixed 500ms wait) | | AuthId tests | 248ms | 99ms (SHA2 except the two GameLogin tests) | | Container cap tests | 5,000 items | 3,449 / 3,277 (one past each protocol cap) | | Bulk removal | 100k children | 20k children | | OPL hash distribution | 60k builds | 10k builds | ## Shard-tuning decoupling - AI assertions read `ReacquireDelay` and `FollowMoveSpeed` instead of hard-coding production tuning. - The guard friendly-fire test uses an `AI_Mage` stub instead of WhiteWyrm. - Argon2 assertions pin the `argon2id` variant and `v=19` but read the cost parameters from the configured hasher. ## Tests | Run | Server.Tests | UOContent.Tests | |---|---|---| | With client files | 812 pass | 1,123 pass | | Without client files (CI simulation) | 800 pass, 12 skip | 1,021 pass, 102 skip | - The UOContent fixture reads `MODERNUO_TEST_DATA_DIR`; Server.Tests reads `MODERNUO_CLIENT_PATH`. - The 15 new UOContent skips are the map-dependent guards above. - Total run time with client files is about 5s, down from about 8s.
123 lines
4.9 KiB
C#
123 lines
4.9 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2026 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: BanExemptionsTests.cs *
|
|
* *
|
|
* This program is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
*************************************************************************/
|
|
|
|
using System;
|
|
using System.Net;
|
|
using System.Reflection;
|
|
using System.Text;
|
|
using Server.Network;
|
|
using Server.Network.Bans;
|
|
using Xunit;
|
|
|
|
namespace Server.Tests.Network.Exemptions;
|
|
|
|
// ManualAllowlist is process-wide and BlocklistFilter reads it, so this runs in the sequential collection
|
|
// and puts the original snapshot back. Addresses come from TEST-NET-1 (192.0.2.0/24).
|
|
[Collection("Sequential UOContent Tests")]
|
|
public class BanExemptionsTests : IDisposable
|
|
{
|
|
private static readonly FieldInfo _snapshotField =
|
|
typeof(ManualAllowlist).GetField("_snapshot", BindingFlags.Static | BindingFlags.NonPublic);
|
|
|
|
private readonly object _savedSnapshot = _snapshotField.GetValue(null);
|
|
|
|
public void Dispose() => ManualAllowlist.LoadForTesting((BlocklistSnapshot)_savedSnapshot);
|
|
|
|
private static readonly IPAddress _listed = IPAddress.Parse("192.0.2.10");
|
|
private static readonly IPAddress _unlisted = IPAddress.Parse("192.0.2.11");
|
|
|
|
private static void WithManualAllowlist(string contents) =>
|
|
ManualAllowlist.LoadForTesting(BlocklistSnapshot.Build(Encoding.ASCII.GetBytes(contents), out _, out _));
|
|
|
|
private static void WithEmptyManualAllowlist() => ManualAllowlist.LoadForTesting(BlocklistSnapshot.Empty);
|
|
|
|
[Fact]
|
|
public void Manual_allowlist_exempts_behavioral_contributions()
|
|
{
|
|
WithManualAllowlist("192.0.2.10");
|
|
|
|
// Subtracting from the blocklist does nothing for behavioural detections, which never consult it.
|
|
Assert.True(BanExemptions.IsExempt(_listed, BanReasons.ForeignProtocol, NeverCalled));
|
|
Assert.True(BanExemptions.IsExempt(_listed, BanReasons.RateLimit, NeverCalled));
|
|
Assert.True(BanExemptions.IsExempt(_listed, BanReasons.SilentConnect, NeverCalled));
|
|
Assert.True(BanExemptions.IsExempt(_listed, BanReasons.InvalidSeed, NeverCalled));
|
|
}
|
|
|
|
[Fact]
|
|
public void Manual_allowlist_covers_cidr_entries()
|
|
{
|
|
// Carve-outs are CIDRs, so a shared-CGNAT player is only covered if ranges work here.
|
|
WithManualAllowlist("192.0.2.0/24");
|
|
|
|
Assert.True(BanExemptions.IsExempt(_listed, BanReasons.RateLimit, NeverCalled));
|
|
Assert.True(BanExemptions.IsExempt(IPAddress.Parse("192.0.2.254"), BanReasons.RateLimit, NeverCalled));
|
|
Assert.False(BanExemptions.IsExempt(IPAddress.Parse("192.0.3.1"), BanReasons.RateLimit, AlwaysFalse));
|
|
}
|
|
|
|
[Fact]
|
|
public void Manual_bans_are_never_exempt_even_when_allowlisted()
|
|
{
|
|
WithManualAllowlist("192.0.2.10");
|
|
|
|
// An explicit decision outranks the operator's own carve-out, and must not cost a strike.
|
|
Assert.False(BanExemptions.IsExempt(_listed, BanReasons.Manual, NeverCalled));
|
|
}
|
|
|
|
[Fact]
|
|
public void Unopted_reasons_are_never_exempt()
|
|
{
|
|
WithManualAllowlist("192.0.2.10");
|
|
|
|
Assert.False(BanExemptions.IsExempt(_listed, BanReasons.Blocklist, NeverCalled));
|
|
Assert.False(BanExemptions.IsExempt(_listed, "some-future-reason", NeverCalled));
|
|
}
|
|
|
|
[Fact]
|
|
public void Falls_through_to_the_login_allowlist_when_not_file_listed()
|
|
{
|
|
WithEmptyManualAllowlist();
|
|
|
|
var consulted = 0;
|
|
|
|
var result = BanExemptions.IsExempt(
|
|
_unlisted,
|
|
BanReasons.RateLimit,
|
|
(_, _) =>
|
|
{
|
|
consulted++;
|
|
return true;
|
|
}
|
|
);
|
|
|
|
Assert.True(result);
|
|
Assert.Equal(1, consulted);
|
|
}
|
|
|
|
[Fact]
|
|
public void Null_address_is_never_exempt()
|
|
{
|
|
WithEmptyManualAllowlist();
|
|
|
|
Assert.False(BanExemptions.IsExempt(null, BanReasons.RateLimit, NeverCalled));
|
|
}
|
|
|
|
private static bool NeverCalled(IPAddress address, string reason)
|
|
{
|
|
Assert.Fail("The login allowlist must not be consulted once the answer is already decided.");
|
|
return false;
|
|
}
|
|
|
|
private static bool AlwaysFalse(IPAddress address, string reason) => false;
|
|
}
|