99fc33ad47
Firewall.LoadFrom and ToSettings run on the game loop (Configure sweep, the
maintenance timer, Save on shutdown) but read DateTime.UtcNow. ToSettings was
the one that mattered: it derives each persisted expiry as
now + (expiresAtTick - nowTicks) while nowTicks came from Core.TickCount, so
pairing a fresh wall clock with the loop's tick baked the loop's lag into every
saved TTL. Core.Now and Core.TickCount are refreshed together at the top of each
iteration, so taking both keeps the operands on one instant.
Left DateTime.UtcNow in CrowdSecAlertClient and the reporter's flush/drain
paths, which run on the pool and have no loop clock to read.
Neither test fixture seeded Core._now, so Core.Now was DateTime.MinValue for the
whole test host -- MinValue.AddHours(-1) throws, and any code correctly reading
the game-thread clock computed nonsense. Seed it as Main.cs does.
Also fixes a dangling collection reference: the firewall tests moved into
UOContent.Tests still declared [Collection("Sequential Server Tests")], which is
only defined in Server.Tests. xUnit matched no fixture and silently skipped the
bootstrap for those tests.
Comment pass over the branch: drop development narration and tighten what stays.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
89 lines
3.7 KiB
C#
89 lines
3.7 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2026 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: FirewallTests.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 Server.Network;
|
|
using Xunit;
|
|
|
|
namespace Server.Tests.Network.Firewall;
|
|
|
|
[Collection("Sequential UOContent Tests")]
|
|
public class FirewallTests
|
|
{
|
|
private static IPAddress Ip(string s) => IPAddress.Parse(s);
|
|
|
|
[Fact]
|
|
public void Add_ThenIsBlocked_SingleIp()
|
|
{
|
|
Server.Network.Firewall.ResetForTesting();
|
|
Assert.True(Server.Network.Firewall.Add(new SingleIpFirewallEntry(Ip("1.2.3.4"))));
|
|
Assert.True(Server.Network.Firewall.IsBlocked(Ip("1.2.3.4")));
|
|
Assert.False(Server.Network.Firewall.IsBlocked(Ip("1.2.3.5")));
|
|
}
|
|
|
|
[Fact]
|
|
public void Add_Range_BlocksInside_NotOutside()
|
|
{
|
|
Server.Network.Firewall.ResetForTesting();
|
|
Server.Network.Firewall.Add(new CidrFirewallEntry(Ip("10.0.0.0"), Ip("10.0.0.255")));
|
|
Assert.True(Server.Network.Firewall.IsBlocked(Ip("10.0.0.7")));
|
|
Assert.False(Server.Network.Firewall.IsBlocked(Ip("10.0.1.0")));
|
|
}
|
|
|
|
[Fact]
|
|
public void Remove_Unblocks()
|
|
{
|
|
Server.Network.Firewall.ResetForTesting();
|
|
var entry = new SingleIpFirewallEntry(Ip("1.2.3.4"));
|
|
Server.Network.Firewall.Add(entry);
|
|
Assert.True(Server.Network.Firewall.Remove(entry));
|
|
Assert.False(Server.Network.Firewall.IsBlocked(Ip("1.2.3.4")));
|
|
}
|
|
|
|
[Fact]
|
|
public void ExpireEntries_RemovesExpired_KeepsPermanent()
|
|
{
|
|
Server.Network.Firewall.ResetForTesting();
|
|
var permanent = new SingleIpFirewallEntry(Ip("1.1.1.1"));
|
|
var temporary = new SingleIpFirewallEntry(Ip("2.2.2.2"));
|
|
Server.Network.Firewall.Add(permanent); // no ttl
|
|
Server.Network.Firewall.Add(temporary, TimeSpan.FromMilliseconds(50)); // ttl
|
|
|
|
Server.Network.Firewall.ExpireEntries(Core.TickCount + 100); // past the ttl
|
|
|
|
Assert.True(Server.Network.Firewall.IsBlocked(Ip("1.1.1.1")));
|
|
Assert.False(Server.Network.Firewall.IsBlocked(Ip("2.2.2.2")));
|
|
}
|
|
|
|
[Fact]
|
|
public void ToFirewallEntry_ParsesForms()
|
|
{
|
|
Assert.IsType<SingleIpFirewallEntry>(Server.Network.Firewall.ToFirewallEntry("1.2.3.4"));
|
|
Assert.IsType<CidrFirewallEntry>(Server.Network.Firewall.ToFirewallEntry("10.0.0.0/24"));
|
|
Assert.IsType<CidrFirewallEntry>(Server.Network.Firewall.ToFirewallEntry("10.0.0.0-10.0.0.255"));
|
|
Assert.Null(Server.Network.Firewall.ToFirewallEntry("not-an-ip"));
|
|
}
|
|
|
|
[Fact]
|
|
public void ReadFirewallSet_SurfacesAddedEntries()
|
|
{
|
|
Server.Network.Firewall.ResetForTesting();
|
|
var entry = new SingleIpFirewallEntry(Ip("1.2.3.4"));
|
|
Server.Network.Firewall.Add(entry);
|
|
|
|
Server.Network.Firewall.ReadFirewallSet(set => Assert.Contains(entry, set));
|
|
}
|
|
}
|