Update _customcallbacks.gsc

Possibility of an exploiter killing an enemy and disconnecting within the `wait` window to trigger an infinite loop.

Application/Commands/ClearAllReportsCommand.cs

@@ -0,0 +1,31 @@
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands;
+
+public class ClearAllReportsCommand : Command
+{
+    public ClearAllReportsCommand(CommandConfiguration config, ITranslationLookup layout) : base(config, layout)
+    {
+        Name = "clearallreports";
+        Description = _translationLookup["COMMANDS_REPORTS_CLEAR_DESC"];
+        Alias = "car";
+        Permission = EFClient.Permission.Administrator;
+        RequiresTarget = false;
+    }
+
+    public override Task ExecuteAsync(GameEvent gameEvent)
+    {
+        foreach (var server in gameEvent.Owner.Manager.GetServers())
+        {
+            server.Reports.Clear();
+        }
+
+        gameEvent.Origin.Tell(_translationLookup["COMMANDS_REPORTS_CLEAR_SUCCESS"]);
+
+        return Task.CompletedTask;
+    }
+}

Application/QueryHelpers/ClientResourceQueryHelper.cs

@@ -8,9 +8,11 @@ using Data.Abstractions;
 using Data.Models;
 using Microsoft.EntityFrameworkCore;
 using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
+using WebfrontCore.Permissions;
 using WebfrontCore.QueryHelpers.Models;
 using EFClient = Data.Models.Client.EFClient;
 
@@ -18,6 +20,7 @@ namespace IW4MAdmin.Application.QueryHelpers;
 
 public class ClientResourceQueryHelper : IResourceQueryHelper<ClientResourceRequest, ClientResourceResponse>
 {
+    public ApplicationConfiguration _appConfig { get; }
     private readonly IDatabaseContextFactory _contextFactory;
     private readonly IGeoLocationService _geoLocationService;
 
@@ -27,8 +30,10 @@ public class ClientResourceQueryHelper : IResourceQueryHelper<ClientResourceRequ
         public EFAlias Alias { get; set; }
     }
 
-    public ClientResourceQueryHelper(IDatabaseContextFactory contextFactory, IGeoLocationService geoLocationService)
+    public ClientResourceQueryHelper(IDatabaseContextFactory contextFactory, IGeoLocationService geoLocationService,
+        ApplicationConfiguration appConfig)
     {
+        _appConfig = appConfig;
         _contextFactory = contextFactory;
         _geoLocationService = geoLocationService;
     }
@@ -75,7 +80,9 @@ public class ClientResourceQueryHelper : IResourceQueryHelper<ClientResourceRequ
 
         if (!string.IsNullOrWhiteSpace(query.ClientIp))
         {
-            clientAliases = SearchByIp(query, clientAliases);
+            clientAliases = SearchByIp(query, clientAliases,
+                _appConfig.HasPermission(query.RequesterPermission, WebfrontEntity.ClientIPAddress,
+                    WebfrontPermission.Read));
         }
 
         var iqGroupedClientAliases = clientAliases.GroupBy(a => new { a.Client.ClientId, a.Client.LastConnection });
@@ -203,7 +210,7 @@ public class ClientResourceQueryHelper : IResourceQueryHelper<ClientResourceRequ
     }
 
     private static IQueryable<ClientAlias> SearchByIp(ClientResourceRequest query,
-        IQueryable<ClientAlias> clientAliases)
+        IQueryable<ClientAlias> clientAliases, bool canSearchIP)
     {
         var ipString = query.ClientIp.Trim();
         var ipAddress = ipString.ConvertToIP();
@@ -213,7 +220,7 @@ public class ClientResourceQueryHelper : IResourceQueryHelper<ClientResourceRequ
             clientAliases = clientAliases.Where(clientAlias =>
                 clientAlias.Alias.IPAddress != null && clientAlias.Alias.IPAddress == ipAddress);
         }
-        else
+        else if(canSearchIP)
         {
             clientAliases = clientAliases.Where(clientAlias =>
                 EF.Functions.Like(clientAlias.Alias.SearchableIPAddress, $"{ipString}%"));

GameFiles/AntiCheat/IW5/storage/iw5/scripts/_customcallbacks.gsc

@@ -137,6 +137,8 @@ waitForFrameThread()
 
 waitForAdditionalAngles( logString, beforeFrameCount, afterFrameCount )
 {
+	self endon( "disconnect" );
+
 	currentIndex = self.currentAnglePosition;
 	wait( 0.05 * afterFrameCount );
 	
@@ -246,4 +248,4 @@ Callback_PlayerDisconnect()
 {
 	level notify( "disconnected", self );
 	self maps\mp\gametypes\_playerlogic::Callback_PlayerDisconnect();
-}
+}

GameFiles/AntiCheat/PT6/storage/t6/scripts/mp/_customcallbacks.gsc

@@ -143,6 +143,8 @@ waitForFrameThread()
 
 waitForAdditionalAngles( logString, beforeFrameCount, afterFrameCount )
 {
+	self endon( "disconnect" );
+
 	currentIndex = self.currentAnglePosition;
 	wait( 0.05 * afterFrameCount );
 
@@ -260,4 +262,4 @@ Callback_PlayerDisconnect()
 {
 	level notify( "disconnected", self );
 	self [[maps\mp\gametypes\_globallogic_player::callback_playerdisconnect]]();
-}
+}

WebfrontCore/Controllers/Client/ClientController.cs

@@ -249,7 +249,8 @@ namespace WebfrontCore.Controllers
         {
             ViewBag.Title = Localization["WEBFRONT_SEARCH_RESULTS_TITLE"];
             ViewBag.ClientResourceRequest = request;
-            
+
+            request.RequesterPermission = Client.Level;
             var response = await _clientResourceHelper.QueryResource(request);
             return request.Offset > 0
                 ? PartialView("Find/_AdvancedFindList", response.Results)

WebfrontCore/QueryHelpers/Models/ClientResourceRequest.cs

@@ -16,7 +16,9 @@ public class ClientResourceRequest : ClientPaginationRequest
     public EFClient.Permission? ClientLevel { get; set; }
     public Reference.Game? GameName { get; set; }
     public bool IncludeGeolocationData { get; set; } = true;
-
+    
+    public EFClient.Permission RequesterPermission { get; set; } = EFClient.Permission.User;
+    
     public bool HasData => !string.IsNullOrEmpty(ClientName) || !string.IsNullOrEmpty(ClientIp) ||
-                           !string.IsNullOrEmpty(ClientGuid) || ClientLevel is not null || GameName is not null;
+                                                                         !string.IsNullOrEmpty(ClientGuid) || ClientLevel is not null || GameName is not null;
 }