bd187bd252
"File" described the storage, which is the least interesting thing about it. The distinction from LoginAllowlist is provenance: one is declared by an operator, the other is earned by authenticating. Both are IP allowlists, so IpAllowlist would not have separated them either. "Manual" matches vocabulary already in the subsystem -- BanReasons.Manual is the operator-declared ban, and the docs already describe this list as "an operator said so". Also moves both files into Network/ManualAllowlist/, mirroring Network/LoginAllowlist/. They no longer belong under Blocklist/ now that the config is decoupled and BanExemptions is the consumer that cannot be served any other way. Namespace is unchanged, so no using directives move. Configuration/ip-allowlist.json keeps its name: it is named for the ip-allowlist*.txt files it governs, whose names the generator owns, and that grouping is what an operator browsing Configuration/ actually sees. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
61 lines
2.4 KiB
C#
61 lines
2.4 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2026 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: BanExemptions.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;
|
|
|
|
namespace Server.Network;
|
|
|
|
/// <summary>
|
|
/// Combines <see cref="ManualAllowlist"/> and <see cref="LoginAllowlist"/> into the one answer
|
|
/// <see cref="BanChannel.IsExempt"/> asks for, so neither source has to know about the other.
|
|
/// </summary>
|
|
public static class BanExemptions
|
|
{
|
|
public static void Configure()
|
|
{
|
|
BanChannel.IsExempt = IsExempt;
|
|
}
|
|
|
|
public static bool IsExempt(IPAddress address, string reason) =>
|
|
IsExempt(address, reason, LoginAllowlist.IsExemptFromEscalation);
|
|
|
|
/// <summary>
|
|
/// Split for testing. <paramref name="loginAllowlist"/> is stateful — calling it spends a strike — so it
|
|
/// must not be invoked once the answer is already decided.
|
|
/// </summary>
|
|
internal static bool IsExempt(IPAddress address, string reason, Func<IPAddress, string, bool> loginAllowlist)
|
|
{
|
|
if (address == null)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Never suppress an operator's explicit ban. Checked first so it also costs no strike.
|
|
if (!BanReasons.IsBehavioral(reason))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// Deliberate and unconditional, so it wins and must not spend the earned list's strikes.
|
|
if (ManualAllowlist.Contains(address))
|
|
{
|
|
return true;
|
|
}
|
|
|
|
return loginAllowlist(address, reason);
|
|
}
|
|
}
|