cs2/SimpleAdmin
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

1.7.7-alpha-fix

Browse source 
- Added missing migration
- Added missing ignoredips
This commit is contained in:
Dawid Bepierszcz 2025-05-21 00:38:54 +02:00
parent f69f1277f8
commit d34ca64970
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
CS2-SimpleAdmin/Managers/CacheManager.cs
View file

@ -9,6 +9,7 @@ internal class CacheManager
{
private readonly ConcurrentDictionary<int, BanRecord> _banCache = new();
private readonly ConcurrentDictionary<ulong, (HashSet<string> ips, DateTime used_at)> _playerIpsCache = new();
private readonly HashSet<string> _cachedIgnoredIps = [..CS2_SimpleAdmin.Instance.Config.OtherSettings.IgnoredIps];
private DateTime _lastUpdateTime = DateTime.MinValue;
private bool _isInitialized;
@ -132,7 +133,8 @@ internal class CacheManager
return _banCache.Values.Any(b =>
b.Status == "ACTIVE" &&
!string.IsNullOrEmpty(b.PlayerIp) &&
b.PlayerIp.Equals(ipAddress, StringComparison.OrdinalIgnoreCase));
b.PlayerIp.Equals(ipAddress, StringComparison.OrdinalIgnoreCase) &&
!_cachedIgnoredIps.Contains(ipAddress));
}
public bool IsPlayerBanned(string? steamId, string? ipAddress) =>
@ -143,7 +145,8 @@ internal class CacheManager
b.PlayerSteamId.Equals(steamId, StringComparison.OrdinalIgnoreCase)) ||
(ipAddress != null &&
b.PlayerIp != null &&
b.PlayerIp.Equals(ipAddress, StringComparison.OrdinalIgnoreCase))
b.PlayerIp.Equals(ipAddress, StringComparison.OrdinalIgnoreCase) &&
!_cachedIgnoredIps.Contains(ipAddress))
));
public bool IsPlayerOrAnyIpBanned(ulong steamId)
@ -155,8 +158,9 @@ internal class CacheManager
{
return true;
}
return _playerIpsCache.TryGetValue(steamId, out var ipList) && ipList.ips.Any(IsIpBanned);
return _playerIpsCache.TryGetValue(steamId, out var ipList) && ipList.ips.Any(ip =>
!_cachedIgnoredIps.Contains(ip) && IsIpBanned(ip));
}
public bool HasIpForPlayer(ulong steamId, string ipAddress)