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.
307 lines
11 KiB
C#
307 lines
11 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2026 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: CrowdSecReporterTests.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.Collections.Generic;
|
|
using System.Globalization;
|
|
using System.Net;
|
|
using System.Text.Json;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Server.Network.Bans.CrowdSec;
|
|
using Xunit;
|
|
|
|
namespace Server.Tests.Network.Bans;
|
|
|
|
public class CrowdSecReporterTests
|
|
{
|
|
private static CrowdSecSettings Settings() => new()
|
|
{
|
|
MachineId = "shard",
|
|
Password = "secret",
|
|
Origin = "modernuo",
|
|
ManualBanDuration = TimeSpan.FromHours(168)
|
|
};
|
|
|
|
[Fact]
|
|
public void BuildAlerts_DedupsByIp()
|
|
{
|
|
var now = DateTime.UnixEpoch;
|
|
var items = new List<CrowdSecReporter.ReportItem>
|
|
{
|
|
new(IPAddress.Parse("1.1.1.1"), TimeSpan.FromHours(1), "rate-limit", false),
|
|
new(IPAddress.Parse("1.1.1.1"), TimeSpan.FromHours(1), "rate-limit", false),
|
|
new(IPAddress.Parse("2.2.2.2"), TimeSpan.FromHours(1), "rate-limit", false)
|
|
};
|
|
|
|
var alerts = CrowdSecReporter.BuildAlerts(items, Settings(), now);
|
|
|
|
Assert.Equal(2, alerts.Count);
|
|
Assert.All(alerts, a => Assert.Single(a.Decisions));
|
|
Assert.Contains(alerts, a => a.Source.Value == "1.1.1.1");
|
|
Assert.Contains(alerts, a => a.Source.Value == "2.2.2.2");
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildAlerts_ScenarioFromReason_OriginFromSettings()
|
|
{
|
|
var alerts = CrowdSecReporter.BuildAlerts(
|
|
[new(IPAddress.Parse("3.3.3.3"), TimeSpan.FromHours(1), "manual", false)],
|
|
Settings(),
|
|
DateTime.UnixEpoch);
|
|
|
|
var decision = Assert.Single(alerts).Decisions[0];
|
|
Assert.Equal("modernuo/manual", alerts[0].Scenario);
|
|
Assert.Equal("modernuo", decision.Origin);
|
|
Assert.Equal("ban", decision.Type);
|
|
Assert.Equal("Ip", decision.Scope);
|
|
Assert.Equal("3.3.3.3", decision.Value);
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildAlerts_ScenarioFromReason_Blocklist()
|
|
{
|
|
var alerts = CrowdSecReporter.BuildAlerts(
|
|
[new(IPAddress.Parse("5.5.5.5"), TimeSpan.FromHours(1), "blocklist", false)],
|
|
Settings(),
|
|
DateTime.UnixEpoch);
|
|
|
|
var decision = Assert.Single(alerts).Decisions[0];
|
|
Assert.Equal("modernuo/blocklist", alerts[0].Scenario);
|
|
Assert.Equal("modernuo/blocklist", decision.Scenario);
|
|
}
|
|
|
|
/// <summary>
|
|
/// LAPI dereferences scenario_hash/scenario_version unconditionally when persisting an alert, so an
|
|
/// omitted field is a 500, not a validation error. Asserted on the serialized payload rather than the
|
|
/// DTO because that is what actually goes on the wire.
|
|
/// </summary>
|
|
[Fact]
|
|
public void BuildAlerts_SerializedPayload_CarriesRequiredScenarioFields()
|
|
{
|
|
var alerts = CrowdSecReporter.BuildAlerts(
|
|
[new(IPAddress.Parse("9.9.9.9"), TimeSpan.FromHours(1), "rate-limit", false)],
|
|
Settings(),
|
|
DateTime.UnixEpoch);
|
|
|
|
var payload = JsonSerializer.SerializeToNode(alerts)!.AsArray()[0]!.AsObject();
|
|
|
|
Assert.True(payload.ContainsKey("scenario_hash"));
|
|
Assert.True(payload.ContainsKey("scenario_version"));
|
|
Assert.Equal(JsonValueKind.String, payload["scenario_hash"]!.GetValue<JsonElement>().ValueKind);
|
|
Assert.Equal(JsonValueKind.String, payload["scenario_version"]!.GetValue<JsonElement>().ValueKind);
|
|
Assert.Equal(1, payload["capacity"]!.GetValue<int>());
|
|
}
|
|
|
|
/// <summary>
|
|
/// ':' is the time-separator specifier in a custom .NET format string, so a shard under fi-FI used to
|
|
/// emit "T00.00.00.000Z" — which Go's time.RFC3339 rejects, and LAPI answers 500 for. th-TH additionally
|
|
/// shifts the year via the Buddhist calendar.
|
|
/// </summary>
|
|
[Theory]
|
|
[InlineData("fi-FI")]
|
|
[InlineData("th-TH")]
|
|
[InlineData("ar-SA")]
|
|
public void FormatTimestamp_IsIso8601_RegardlessOfCulture(string culture)
|
|
{
|
|
var previous = CultureInfo.CurrentCulture;
|
|
try
|
|
{
|
|
CultureInfo.CurrentCulture = new CultureInfo(culture);
|
|
Assert.Equal("1970-01-01T00:00:00.000Z", CrowdSecReporter.FormatTimestamp(DateTime.UnixEpoch));
|
|
}
|
|
finally
|
|
{
|
|
CultureInfo.CurrentCulture = previous;
|
|
}
|
|
}
|
|
|
|
/// <summary>A non-UTC input must still be stamped as UTC — the trailing 'Z' is a literal, not a claim.</summary>
|
|
[Fact]
|
|
public void FormatTimestamp_ConvertsNonUtcInput()
|
|
{
|
|
var local = new DateTimeOffset(1970, 1, 1, 2, 0, 0, TimeSpan.FromHours(2)).LocalDateTime;
|
|
|
|
Assert.Equal("1970-01-01T00:00:00.000Z", CrowdSecReporter.FormatTimestamp(local));
|
|
}
|
|
|
|
[Fact]
|
|
public void FormatDuration_UsesSeconds_FloorsAtOne()
|
|
{
|
|
Assert.Equal("3600s", CrowdSecReporter.FormatDuration(TimeSpan.FromHours(1)));
|
|
Assert.Equal("1s", CrowdSecReporter.FormatDuration(TimeSpan.Zero));
|
|
Assert.Equal("1s", CrowdSecReporter.FormatDuration(TimeSpan.FromMilliseconds(10)));
|
|
}
|
|
|
|
[Fact]
|
|
public void Report_WhenQueueFull_DropsAndCounts()
|
|
{
|
|
var reporter = new CrowdSecReporter(new NullAlertClient(), new CrowdSecSettings
|
|
{
|
|
MachineId = "shard",
|
|
Password = "secret",
|
|
MaxQueue = 2
|
|
});
|
|
// Do NOT Start() the drain — so the queue fills and overflows deterministically.
|
|
|
|
for (var i = 0; i < 10; i++)
|
|
{
|
|
reporter.Report(IPAddress.Parse("4.4.4." + i), TimeSpan.FromHours(1), "rate-limit");
|
|
}
|
|
|
|
Assert.True(reporter.DroppedCount >= 8);
|
|
}
|
|
|
|
// Stop() without a prior Start() drives FlushRemainingOnStop() synchronously (no drain task, no
|
|
// Task.Delay backoff involved), so this is deterministic — no wall-clock timing dependency.
|
|
[Fact]
|
|
public void Stop_FlushesQueuedReports_ViaClient()
|
|
{
|
|
var client = new RecordingAlertClient();
|
|
var reporter = new CrowdSecReporter(client, Settings());
|
|
|
|
reporter.Report(IPAddress.Parse("6.6.6.6"), TimeSpan.FromHours(1), "rate-limit");
|
|
reporter.Stop();
|
|
|
|
var posted = Assert.Single(client.Posted);
|
|
Assert.Equal("6.6.6.6", Assert.Single(posted).Source.Value);
|
|
Assert.Equal(0, reporter.SendFailureCount);
|
|
}
|
|
|
|
[Fact]
|
|
public void Stop_FlushesQueuedRetracts_ViaClient()
|
|
{
|
|
var client = new RecordingAlertClient();
|
|
var reporter = new CrowdSecReporter(client, Settings());
|
|
|
|
reporter.Retract(IPAddress.Parse("8.8.8.8"));
|
|
reporter.Stop();
|
|
|
|
Assert.Equal(IPAddress.Parse("8.8.8.8"), Assert.Single(client.Deleted));
|
|
Assert.Equal(0, reporter.SendFailureCount);
|
|
}
|
|
|
|
[Fact]
|
|
public void Stop_WhenFlushSendFails_CountsSendFailure()
|
|
{
|
|
var reporter = new CrowdSecReporter(new ThrowingAlertClient(), Settings());
|
|
|
|
reporter.Report(IPAddress.Parse("7.7.7.7"), TimeSpan.FromHours(1), "rate-limit");
|
|
reporter.Stop();
|
|
|
|
Assert.Equal(1, reporter.SendFailureCount);
|
|
}
|
|
|
|
[Fact]
|
|
public void Stop_WithEmptyQueue_DoesNotInvokeClientOrFail()
|
|
{
|
|
var client = new RecordingAlertClient();
|
|
var reporter = new CrowdSecReporter(client, Settings());
|
|
|
|
reporter.Stop();
|
|
|
|
Assert.Empty(client.Posted);
|
|
Assert.Equal(0, reporter.SendFailureCount);
|
|
}
|
|
|
|
/// <summary>
|
|
/// The drain task must track the loop's lifetime, not just its first await — a ValueTask-returning
|
|
/// drain loop passed to Task.Run yields a Task<ValueTask> that completes at the first await
|
|
/// that suspends, which makes Stop()'s drain-exited handshake a no-op. The flush delay always
|
|
/// suspends before the first post, so once the client sees a post a wrapped task is already done.
|
|
/// </summary>
|
|
[Fact]
|
|
public async Task Start_DrainTaskSpansLoopLifetime_NotJustTheFirstAwait()
|
|
{
|
|
var settings = Settings();
|
|
settings.FlushInterval = TimeSpan.FromMilliseconds(1);
|
|
|
|
var client = new SignalingAlertClient();
|
|
var reporter = new CrowdSecReporter(client, settings);
|
|
using var cts = new CancellationTokenSource();
|
|
|
|
reporter.Start(cts.Token);
|
|
|
|
var drain = reporter.DrainTaskForTesting;
|
|
Assert.NotNull(drain);
|
|
|
|
reporter.Report(IPAddress.Parse("9.9.9.9"), TimeSpan.FromHours(1), "rate-limit");
|
|
await client.Posted.Task.WaitAsync(TimeSpan.FromSeconds(10));
|
|
|
|
Assert.False(drain.IsCompleted, "drain task completed while the loop was still running");
|
|
|
|
reporter.Stop();
|
|
|
|
Assert.True(drain.IsCompleted, "Stop() returned before the drain loop exited");
|
|
}
|
|
|
|
private sealed class SignalingAlertClient : ICrowdSecAlertClient
|
|
{
|
|
public TaskCompletionSource Posted { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
|
|
|
|
public ValueTask PostAlertsAsync(IReadOnlyList<CrowdSecAlert> alerts, CancellationToken token)
|
|
{
|
|
Posted.TrySetResult();
|
|
return ValueTask.CompletedTask;
|
|
}
|
|
|
|
public ValueTask DeleteDecisionsAsync(string origin, IPAddress ip, CancellationToken token) =>
|
|
ValueTask.CompletedTask;
|
|
|
|
public void Dispose() { }
|
|
}
|
|
|
|
private sealed class NullAlertClient : ICrowdSecAlertClient
|
|
{
|
|
public ValueTask PostAlertsAsync(IReadOnlyList<CrowdSecAlert> alerts, CancellationToken token) =>
|
|
ValueTask.CompletedTask;
|
|
|
|
public ValueTask DeleteDecisionsAsync(string origin, IPAddress ip, CancellationToken token) =>
|
|
ValueTask.CompletedTask;
|
|
|
|
public void Dispose() { }
|
|
}
|
|
|
|
private sealed class RecordingAlertClient : ICrowdSecAlertClient
|
|
{
|
|
public List<IReadOnlyList<CrowdSecAlert>> Posted { get; } = [];
|
|
public List<IPAddress> Deleted { get; } = [];
|
|
|
|
public ValueTask PostAlertsAsync(IReadOnlyList<CrowdSecAlert> alerts, CancellationToken token)
|
|
{
|
|
Posted.Add(alerts);
|
|
return ValueTask.CompletedTask;
|
|
}
|
|
|
|
public ValueTask DeleteDecisionsAsync(string origin, IPAddress ip, CancellationToken token)
|
|
{
|
|
Deleted.Add(ip);
|
|
return ValueTask.CompletedTask;
|
|
}
|
|
|
|
public void Dispose() { }
|
|
}
|
|
|
|
private sealed class ThrowingAlertClient : ICrowdSecAlertClient
|
|
{
|
|
public ValueTask PostAlertsAsync(IReadOnlyList<CrowdSecAlert> alerts, CancellationToken token) =>
|
|
throw new InvalidOperationException("simulated LAPI outage");
|
|
|
|
public ValueTask DeleteDecisionsAsync(string origin, IPAddress ip, CancellationToken token) =>
|
|
ValueTask.CompletedTask;
|
|
|
|
public void Dispose() { }
|
|
}
|
|
}
|