bd44ef4026
Contributing a ban to CrowdSec failed against a real LAPI. Three independent
defects, each sufficient on its own:
scenario_hash / scenario_version were never serialized. LAPI dereferences both
unconditionally when persisting an alert, so omitting them is a nil deref and a
500 rather than a validation error. Both are now emitted with the values a
watcher without a hub scenario is expected to send ("" and "1.0").
start_at/stop_at were formatted without an IFormatProvider. ':' is the time
separator *specifier* in a custom .NET format string, not a literal, so a shard
running under a culture like fi-FI emitted "T15.04.05.123Z" -- which Go's
time.RFC3339 rejects, producing another 500. Non-Gregorian cultures (th-TH,
ar-SA) would also shift the year. Formatting is now pinned to InvariantCulture
in FormatTimestamp, which additionally converts non-UTC input, since the
trailing 'Z' is a literal and was previously an unchecked claim.
The User-Agent was a plain product string. LAPI's default watcher profile
matches the "crowdsec/" prefix and answers 401 without it, so the header is a
protocol constraint; it is now an internal const carrying that reason.
Also fixes the same culture bug in the login-expiry parse: a bare
DateTime.TryParse on LAPI's RFC3339 expire silently fails under a mismatched
culture and falls back to a fabricated UtcNow+1h, pushing re-auth past the real
expiry and costing a 401-relogin round trip on every send.
capacity now defaults to 1 instead of 0, matching the one-decision-per-alert
shape actually being sent.
The resulting payload is field-for-field identical to a hand-verified request
that LAPI accepts. Regression tests assert the required scenario fields on the
serialized JSON rather than the DTO, since the DTO is not what goes on the
wire, and cover the timestamp across fi-FI/th-TH/ar-SA.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
62 lines
2.7 KiB
C#
62 lines
2.7 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2026 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: CrowdSecAlertClientTests.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.Bans.CrowdSec;
|
|
using Xunit;
|
|
|
|
namespace Server.Tests.Network.Bans;
|
|
|
|
public class CrowdSecAlertClientTests
|
|
{
|
|
/// <summary>
|
|
/// LAPI's default watcher profile matches the <c>crowdsec/</c> prefix and answers 401 without it, so
|
|
/// this is a protocol constraint rather than a cosmetic product string.
|
|
/// </summary>
|
|
[Fact]
|
|
public void UserAgent_IsPrefixedForTheWatcherProfile()
|
|
{
|
|
Assert.StartsWith("crowdsec/", CrowdSecAlertClient.UserAgent, StringComparison.Ordinal);
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildDeleteQuery_EscapesOrigin()
|
|
{
|
|
// origin is operator-controlled config (crowdsec.json), so it must be treated as untrusted
|
|
// input going into the URL, same as any other interpolated value.
|
|
var query = CrowdSecAlertClient.BuildDeleteQuery("modern uo/test&x=1", IPAddress.Parse("1.2.3.4"));
|
|
|
|
Assert.Equal("/v1/decisions?origin=modern%20uo%2Ftest%26x%3D1&ip=1.2.3.4", query);
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildDeleteQuery_PlainOrigin_Ipv4()
|
|
{
|
|
var query = CrowdSecAlertClient.BuildDeleteQuery("modernuo", IPAddress.Parse("192.168.1.1"));
|
|
|
|
Assert.Equal("/v1/decisions?origin=modernuo&ip=192.168.1.1", query);
|
|
}
|
|
|
|
[Fact]
|
|
public void BuildDeleteQuery_Ipv6_IsEscaped()
|
|
{
|
|
// IPv6 textual form contains ':', which Uri.EscapeDataString percent-encodes like any other
|
|
// reserved character — confirms the escaping is applied uniformly, not just for IPv4.
|
|
var query = CrowdSecAlertClient.BuildDeleteQuery("modernuo", IPAddress.Parse("2001:db8::1"));
|
|
|
|
Assert.Equal("/v1/decisions?origin=modernuo&ip=2001%3Adb8%3A%3A1", query);
|
|
}
|
|
}
|