update plugins to support command interception

Application/IW4MServer.cs

@@ -158,8 +158,6 @@ namespace IW4MAdmin
                     await E.Origin.Lock();
                 }
 
-                var canExecuteCommand = true;
-
                 try
                 {
                     if (!await ProcessEvent(E))
@@ -188,32 +186,31 @@ namespace IW4MAdmin
                         }
                     }
 
+                    var canExecuteCommand = Manager.CommandInterceptors.All(interceptor =>
+                    {
                         try
                         {
-                        var loginPlugin = Manager.Plugins.FirstOrDefault(plugin => plugin.Name == "Login");
+                            return interceptor(E);
-
-                        if (loginPlugin != null)
-                        {
-                            await loginPlugin.OnEventAsync(E, this);
                         }
+                        catch
+                        {
+                            return true;
+                        }
+                    });
+
+                    if (!canExecuteCommand)
+                    {
+                        E.Origin.Tell(_translationLookup["SERVER_COMMANDS_INTERCEPTED"]);
                     }
 
-                    catch (AuthorizationException e)
+                    else if (E.Type == GameEvent.EventType.Command && E.Extra is Command cmd)
                     {
-                        E.Origin.Tell($"{loc["COMMAND_NOTAUTHORIZED"]} - {e.Message}");
+                        ServerLogger.LogInformation("Executing command {Command} for {Client}", cmd.Name,
-                        canExecuteCommand = false;
+                            E.Origin.ToString());
-                    }
-
-                    // hack: this prevents commands from getting executing that 'shouldn't' be
-                    if (E.Type == GameEvent.EventType.Command && E.Extra is Command cmd &&
-                        (canExecuteCommand || E.Origin?.Level == Permission.Console))
-                    {
-                        ServerLogger.LogInformation("Executing command {Command} for {Client}", cmd.Name, E.Origin.ToString());
                         await cmd.ExecuteAsync(E);
                     }
 
                     var pluginTasks = Manager.Plugins
-                        .Where(plugin => plugin.Name != "Login")
                         .Select(async plugin => await CreatePluginTask(plugin, E));
                     
                     await Task.WhenAll(pluginTasks);

Data/Data.csproj

@@ -8,7 +8,7 @@
     <PackageId>RaidMax.IW4MAdmin.Data</PackageId>
     <Title>RaidMax.IW4MAdmin.Data</Title>
     <Authors />
-    <PackageVersion>1.2.0</PackageVersion>
+    <PackageVersion>2022.10.11.1</PackageVersion>
   </PropertyGroup>
   
   <ItemGroup>

Plugins/AutomessageFeed/AutomessageFeed.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.9.8.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.10.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/LiveRadar/LiveRadar.csproj

@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.9.8.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.10.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Login/Login.csproj

@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.9.8.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.10.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Login/Plugin.cs

@@ -26,47 +26,20 @@ namespace IW4MAdmin.Plugins.Login
             _configHandler = configurationHandlerFactory.GetConfigurationHandler<Configuration>("LoginPluginSettings");
         }
 
-        public Task OnEventAsync(GameEvent E, Server S)
+        public Task OnEventAsync(GameEvent gameEvent, Server server)
         {
-            if (E.IsRemote || _configHandler.Configuration().RequirePrivilegedClientLogin == false)
+            if (gameEvent.IsRemote || _configHandler.Configuration().RequirePrivilegedClientLogin == false)
                 return Task.CompletedTask;
 
-            if (E.Type == GameEvent.EventType.Connect)
+            if (gameEvent.Type == GameEvent.EventType.Connect)
             {
-                AuthorizedClients.TryAdd(E.Origin.ClientId, false);
+                AuthorizedClients.TryAdd(gameEvent.Origin.ClientId, false);
-                E.Origin.SetAdditionalProperty("IsLoggedIn", false);
+                gameEvent.Origin.SetAdditionalProperty("IsLoggedIn", false);
             }
 
-            if (E.Type == GameEvent.EventType.Disconnect)
+            if (gameEvent.Type == GameEvent.EventType.Disconnect)
             {
-                AuthorizedClients.TryRemove(E.Origin.ClientId, out bool value);
+                AuthorizedClients.TryRemove(gameEvent.Origin.ClientId, out _);
-            }
-
-            if (E.Type == GameEvent.EventType.Command)
-            {
-                if (E.Origin.Level < EFClient.Permission.Moderator ||
-                    E.Origin.Level == EFClient.Permission.Console)
-                    return Task.CompletedTask;
-
-                if (E.Extra.GetType() == typeof(SetPasswordCommand) &&
-                    E.Origin?.Password == null)
-                    return Task.CompletedTask;
-
-                if (E.Extra.GetType() == typeof(LoginCommand))
-                    return Task.CompletedTask;
-
-                if (E.Extra.GetType() == typeof(RequestTokenCommand))
-                    return Task.CompletedTask;
-
-                if (!AuthorizedClients[E.Origin.ClientId])
-                {
-                    throw new AuthorizationException(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_LOGIN_AUTH"]);
-                }
-
-                else
-                {
-                    E.Origin.SetAdditionalProperty("IsLoggedIn", true);
-                }
             }
             
             return Task.CompletedTask;
@@ -76,6 +49,36 @@ namespace IW4MAdmin.Plugins.Login
         {
             AuthorizedClients = new ConcurrentDictionary<int, bool>();
 
+            manager.CommandInterceptors.Add(gameEvent =>
+            {
+                if (gameEvent.Type != GameEvent.EventType.Command)
+                {
+                    return true;
+                }
+
+                if (gameEvent.Origin.Level < EFClient.Permission.Moderator ||
+                    gameEvent.Origin.Level == EFClient.Permission.Console)
+                    return true;
+
+                if (gameEvent.Extra.GetType() == typeof(SetPasswordCommand) &&
+                    gameEvent.Origin?.Password == null)
+                    return true;
+
+                if (gameEvent.Extra.GetType() == typeof(LoginCommand))
+                    return true;
+
+                if (gameEvent.Extra.GetType() == typeof(RequestTokenCommand))
+                    return true;
+
+                if (!AuthorizedClients[gameEvent.Origin.ClientId])
+                {
+                    return false;
+                }
+
+                gameEvent.Origin.SetAdditionalProperty("IsLoggedIn", true);
+                return true;
+            });
+
             await _configHandler.BuildAsync();
             if (_configHandler.Configuration() == null)
             {

Plugins/Mute/Mute.csproj

@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.9.8.1" PrivateAssets="All"/>
+        <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.10.11.1" PrivateAssets="All"/>
     </ItemGroup>
 
     <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/ProfanityDeterment/ProfanityDeterment.csproj

@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.9.8.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.10.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Stats/Stats.csproj

@@ -17,7 +17,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.9.8.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.10.11.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Welcome/Welcome.csproj

@@ -20,7 +20,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.9.8.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.10.11.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

SharedLibraryCore/SharedLibraryCore.csproj

@@ -4,7 +4,7 @@
         <OutputType>Library</OutputType>
         <TargetFramework>net6.0</TargetFramework>
         <PackageId>RaidMax.IW4MAdmin.SharedLibraryCore</PackageId>
-        <Version>2022.9.8.1</Version>
+        <Version>2022.10.11.1</Version>
         <Authors>RaidMax</Authors>
         <Company>Forever None</Company>
         <Configurations>Debug;Release;Prerelease</Configurations>
@@ -19,7 +19,7 @@
         <IsPackable>true</IsPackable>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <Description>Shared Library for IW4MAdmin</Description>
-        <PackageVersion>2022.9.8.1</PackageVersion>
+        <PackageVersion>2022.10.11.1</PackageVersion>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591</NoWarn>
     </PropertyGroup>