From 490a59be62bb4bc461d03cd1e66cbe5b38895099 Mon Sep 17 00:00:00 2001 From: linmeideli <2558527373@qq.com> Date: Sat, 29 Aug 2026 16:28:01 +0800 Subject: [PATCH] Improve file formal and clear program self --- marketplace/Empostor.Plugins.Monitor.dll | Bin 0 -> 14848 bytes marketplace/Empostor.Plugins.PlayerLog.dll | Bin 0 -> 21504 bytes marketplace/Empostor.Plugins.Privacy.dll | Bin 0 -> 18432 bytes marketplace/plugins.json | 39 ++ .../Empostor.Plugins.Monitor.csproj | 14 + .../MonitorController.cs | 3 +- src/Empostor.Plugins.Monitor/MonitorPlugin.cs | 24 + .../MonitorPluginStartup.cs | 22 + .../packages.lock.json | 137 +++++ .../Empostor.Plugins.PlayerLog.csproj | 13 + .../PlayerLogAdminExtension.cs | 74 +++ .../PlayerLogListener.cs | 3 +- .../PlayerLogPlugin.cs | 24 + .../PlayerLogPluginStartup.cs | 19 + .../PlayerLogStore.cs | 16 +- .../packages.lock.json | 495 ++++++++++++++++++ .../Empostor.Plugins.Privacy.csproj | 14 + .../PrivacyAdminExtension.cs | 44 ++ .../PrivacyController.cs | 60 +++ src/Empostor.Plugins.Privacy/PrivacyPlugin.cs | 24 + .../PrivacyPluginStartup.cs | 24 + .../PrivacyStore.cs} | 78 +-- .../packages.lock.json | 137 +++++ .../Commands/Commands/BanCommand.cs | 6 +- src/Empostor.Server/Http/AdminController.cs | 124 +---- src/Empostor.Server/Http/HplpController.cs | 2 +- src/Empostor.Server/Net/Client.cs | 2 +- .../Net/Manager/ClientManager.cs | 3 +- .../Net/State/Game.Incoming.cs | 2 +- src/Empostor.Server/Program.cs | 7 +- .../Recorder/ClientRecorder.cs | 2 +- .../Service/Admin/Ban/BanStore.cs | 244 --------- src/Empostor.Server/Service/ClientIdStore.cs | 10 +- .../Ban => Shared}/BanEnforcementListener.cs | 6 +- .../Service/Shared/BanStore.cs | 205 ++++++++ .../Shared}/IpGeolocationService.cs | 78 +-- .../ReactorHandshakeListener.cs | 2 +- .../ReactorModExtensions.cs | 2 +- .../{Admin/Report => Shared}/ReportStore.cs | 2 +- src/Empostor.sln | 45 ++ 40 files changed, 1495 insertions(+), 511 deletions(-) create mode 100644 marketplace/Empostor.Plugins.Monitor.dll create mode 100644 marketplace/Empostor.Plugins.PlayerLog.dll create mode 100644 marketplace/Empostor.Plugins.Privacy.dll create mode 100644 src/Empostor.Plugins.Monitor/Empostor.Plugins.Monitor.csproj rename src/{Empostor.Server/Http => Empostor.Plugins.Monitor}/MonitorController.cs (98%) create mode 100644 src/Empostor.Plugins.Monitor/MonitorPlugin.cs create mode 100644 src/Empostor.Plugins.Monitor/MonitorPluginStartup.cs create mode 100644 src/Empostor.Plugins.Monitor/packages.lock.json create mode 100644 src/Empostor.Plugins.PlayerLog/Empostor.Plugins.PlayerLog.csproj create mode 100644 src/Empostor.Plugins.PlayerLog/PlayerLogAdminExtension.cs rename src/{Empostor.Server/Service/Stat => Empostor.Plugins.PlayerLog}/PlayerLogListener.cs (98%) create mode 100644 src/Empostor.Plugins.PlayerLog/PlayerLogPlugin.cs create mode 100644 src/Empostor.Plugins.PlayerLog/PlayerLogPluginStartup.cs rename src/{Empostor.Server/Service/Stat => Empostor.Plugins.PlayerLog}/PlayerLogStore.cs (84%) create mode 100644 src/Empostor.Plugins.PlayerLog/packages.lock.json create mode 100644 src/Empostor.Plugins.Privacy/Empostor.Plugins.Privacy.csproj create mode 100644 src/Empostor.Plugins.Privacy/PrivacyAdminExtension.cs create mode 100644 src/Empostor.Plugins.Privacy/PrivacyController.cs create mode 100644 src/Empostor.Plugins.Privacy/PrivacyPlugin.cs create mode 100644 src/Empostor.Plugins.Privacy/PrivacyPluginStartup.cs rename src/{Empostor.Server/Http/PrivacyController.cs => Empostor.Plugins.Privacy/PrivacyStore.cs} (58%) create mode 100644 src/Empostor.Plugins.Privacy/packages.lock.json delete mode 100644 src/Empostor.Server/Service/Admin/Ban/BanStore.cs rename src/Empostor.Server/Service/{Admin/Ban => Shared}/BanEnforcementListener.cs (95%) create mode 100644 src/Empostor.Server/Service/Shared/BanStore.cs rename src/Empostor.Server/{Utils => Service/Shared}/IpGeolocationService.cs (52%) rename src/Empostor.Server/Service/{Admin/Reactor => Shared}/ReactorHandshakeListener.cs (99%) rename src/Empostor.Server/Service/{Admin/Reactor => Shared}/ReactorModExtensions.cs (93%) rename src/Empostor.Server/Service/{Admin/Report => Shared}/ReportStore.cs (97%) diff --git a/marketplace/Empostor.Plugins.Monitor.dll b/marketplace/Empostor.Plugins.Monitor.dll new file mode 100644 index 0000000000000000000000000000000000000000..84084cc90be7bd2bc6b32d2a814289c0c8039359 GIT binary patch literal 14848 zcmeHOdw5*Mbw6`=_wH(Ct+Xq@EzAldv$pVBeuBYvte0&C%Qlv5UN+KdbuBMm?Opa^ ztU88uA@p-7U*iyx@Mvp7TA+l0zd{?5KVg+))0?}A zHYg8GId#jA-P%sj1<_j7MudM9aJcVm#50O}5I0eS;D+NjGuVH*4g-SEmxl&F%&Ppa z^3)`=a6JUOn;01+nqD@-41JY|CINl8m#E+6{XWlV*>%wlfL>o!E?%(q7MNa$JBpjz zs{IBgR}@~wbNO5nl=wCX#KgTAch$89!xhh2X&Z{{E0u7wtxIuNU2BLssz^b<$Nh?n zeKW{MlP)5-2}8%O>I@v=6^H#X8hYPMCWbY`Zw2B z8L-cT%GH`(DR0ka_WZ^+KMhH{DLgp`AF|W$tcOc2Q=RIA5o);+F){1U87%P5o!nY` zdMe}g`7rS5mT68SYa^=VMjz`jaP=5>^kPwH&%fS?HRFkH_UwlZFZu#1-uc`YK6(Px zd(amYy8ueT*c`x{!SKc|1XgS8<05to@E9~(CmH*=u#M3Q#xT^ab$JY$*^=u)E9^QB zlNPbj=!^Jr*MJ#|LDfd{Ac?5hJWw~-VTUwl&4|H|V8n!^l})1NR*IOp9b9q&I3OU4 zSId&)WeDU-xm1-bhR_b$jgC)fziCf#@I}nWc(Shu>7b2~XM73c7%kwYy%a>0r}qul z=?4!gL;-sl>tQ57)ZC09@wP0OHuq*2@t!s>2RpwU3N0m;#9*M+M*p*}jd>BY(Zg)z zW>i#Na3vR9Aq80yLpQg^FzH&k^G#~>hP`

tN+DeOlKc?mts4u;9djdHtTIf&S) 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 Dwtd4K literal 0 HcmV?d00001 diff --git a/marketplace/Empostor.Plugins.PlayerLog.dll b/marketplace/Empostor.Plugins.PlayerLog.dll new file mode 100644 index 0000000000000000000000000000000000000000..28dfbef3f24e06971e119f48e32952da3c5a9af1 GIT binary patch literal 21504 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 CkF=uz literal 0 HcmV?d00001 diff --git a/marketplace/plugins.json b/marketplace/plugins.json index eb8638d..625e992 100644 --- a/marketplace/plugins.json +++ b/marketplace/plugins.json @@ -193,5 +193,44 @@ "download_url": "https://raw.githubusercontent.com/Empostor/Empostor/main/marketplace/Empostor.Plugins.PlayerStats.dll" } ] + }, + { + "id": "gg.empostor.playerlog", + "name": "Player Log", + "description": "Logs all player activity (chat, kills, meetings, joins, leaves) and provides an admin panel to view, search, and export logs.", + "author": "Empostor", + "versions": [ + { + "version": "1.0.0", + "empostor_version": "2.0.0", + "download_url": "https://raw.githubusercontent.com/Empostor/Empostor/main/marketplace/Empostor.Plugins.PlayerLog.dll" + } + ] + }, + { + "id": "gg.empostor.monitor", + "name": "Monitor", + "description": "Provides /api/monitor/status and /api/monitor/health endpoints for server health checks and uptime monitoring.", + "author": "Empostor", + "versions": [ + { + "version": "1.0.0", + "empostor_version": "2.0.0", + "download_url": "https://raw.githubusercontent.com/Empostor/Empostor/main/marketplace/Empostor.Plugins.Monitor.dll" + } + ] + }, + { + "id": "gg.empostor.privacy", + "name": "Privacy Policy", + "description": "Serves a customizable privacy policy page at /privacy with an admin panel editor.", + "author": "Empostor", + "versions": [ + { + "version": "1.0.0", + "empostor_version": "2.0.0", + "download_url": "https://raw.githubusercontent.com/Empostor/Empostor/main/marketplace/Empostor.Plugins.Privacy.dll" + } + ] } ] diff --git a/src/Empostor.Plugins.Monitor/Empostor.Plugins.Monitor.csproj b/src/Empostor.Plugins.Monitor/Empostor.Plugins.Monitor.csproj new file mode 100644 index 0000000..0678f83 --- /dev/null +++ b/src/Empostor.Plugins.Monitor/Empostor.Plugins.Monitor.csproj @@ -0,0 +1,14 @@ + + + net8.0 + Empostor.Plugins.Monitor + enable + + + + + + + + + diff --git a/src/Empostor.Server/Http/MonitorController.cs b/src/Empostor.Plugins.Monitor/MonitorController.cs similarity index 98% rename from src/Empostor.Server/Http/MonitorController.cs rename to src/Empostor.Plugins.Monitor/MonitorController.cs index a846f60..2d31994 100644 --- a/src/Empostor.Server/Http/MonitorController.cs +++ b/src/Empostor.Plugins.Monitor/MonitorController.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Text.Json.Serialization; @@ -9,7 +8,7 @@ using Empostor.Api.Games.Managers; using Empostor.Api.Net.Manager; using Microsoft.AspNetCore.Mvc; -namespace Empostor.Server.Http; +namespace Empostor.Plugins.Monitor; [ApiController] public sealed class MonitorController : ControllerBase diff --git a/src/Empostor.Plugins.Monitor/MonitorPlugin.cs b/src/Empostor.Plugins.Monitor/MonitorPlugin.cs new file mode 100644 index 0000000..6bee4a5 --- /dev/null +++ b/src/Empostor.Plugins.Monitor/MonitorPlugin.cs @@ -0,0 +1,24 @@ +using System.Threading.Tasks; +using Empostor.Api.Plugins; +using Microsoft.Extensions.Logging; + +namespace Empostor.Plugins.Monitor; + +[EmpostorPlugin("gg.empostor.monitor")] +public sealed class MonitorPlugin : PluginBase +{ + private readonly ILogger _logger; + + public MonitorPlugin(ILogger logger) + { + _logger = logger; + } + + public override ValueTask EnableAsync() + { + _logger.LogInformation("[Monitor] Enabled. Status API at /api/monitor/status, health at /api/monitor/health"); + return default; + } + + public override ValueTask DisableAsync() => default; +} diff --git a/src/Empostor.Plugins.Monitor/MonitorPluginStartup.cs b/src/Empostor.Plugins.Monitor/MonitorPluginStartup.cs new file mode 100644 index 0000000..0a7d90e --- /dev/null +++ b/src/Empostor.Plugins.Monitor/MonitorPluginStartup.cs @@ -0,0 +1,22 @@ +using Empostor.Api.Plugins; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; + +namespace Empostor.Plugins.Monitor; + +public sealed class MonitorPluginStartup : IPluginStartup, IPluginHttpStartup +{ + public void ConfigureHost(IHostBuilder host) { } + + public void ConfigureServices(IServiceCollection services) + { + services.AddControllers() + .AddApplicationPart(typeof(MonitorPluginStartup).Assembly); + } + + public void ConfigureWebApplication(IApplicationBuilder app) + { + } +} diff --git a/src/Empostor.Plugins.Monitor/packages.lock.json b/src/Empostor.Plugins.Monitor/packages.lock.json new file mode 100644 index 0000000..ac11d80 --- /dev/null +++ b/src/Empostor.Plugins.Monitor/packages.lock.json @@ -0,0 +1,137 @@ +{ + "version": 1, + "dependencies": { + "net8.0": { + "BouncyCastle.Cryptography": { + "type": "Transitive", + "resolved": "2.6.1", + "contentHash": "vZsG2YILhthgRqO+ZVgRff4ZFKKTl0v7kqaVBLCtRvpREhfBP33pcWrdA3PRYgWuFL1RxiUFvjMUHTdBZlJcoA==" + }, + "Microsoft.AspNetCore.Http.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "Nxs7Z1q3f1STfLYKJSVXCs1iBl+Ya6E8o4Oy1bCxJ/rNI44E/0f6tbsrVqAWfB7jlnJfyaAtIalBVxPKUPQb4Q==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.2.0", + "System.Text.Encodings.Web": "4.5.0" + } + }, + "Microsoft.AspNetCore.Http.Features": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "ziFz5zH8f33En4dX81LW84I6XrYXKf9jg6aM39cM+LffN9KJahViKZ61dGMSO2gd3e+qe5yBRwsesvyqlZaSMg==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "9.0.6", + "contentHash": "0Zn6nR/6g+90MxskZyOOMPQvnPnrrGu6bytPwkV+azDcTtCSuQ1+GJUrg8Klmnrjk1i6zMpw2lXijl+tw7Q3kA==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } + }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.ObjectPool": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "X21b8D6z58EG34OMLH955750mFaEaGs5xLGe9Vyi3059Cgb3sk+p2k/JlQXaieEBRrk+SVlFzDei3Q6PdVzJOA==" + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + }, + "Serilog": { + "type": "Transitive", + "resolved": "4.3.1-dev-02373", + "contentHash": "f0HNPaleOox5++8zqxAdi9afnUUkoznLOmd0ur/UnLbzl8bIaPyyBGOpbIJmC1kz2vHfkQ0fXh6KXMdlz7bcLQ==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "Xg4G4Indi4dqP1iuAiMSwpiWS54ZghzR644OtsRCm/m/lBMG8dUBhLVN7hLm8NNrNTR+iGbshCPTwrvxZPlm4g==" + }, + "empostor.api": { + "type": "Project", + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "[2.2.0, )", + "Microsoft.Extensions.Hosting.Abstractions": "[8.0.0, )", + "Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )", + "NextFast.Hazel": "[1.0.2-dev, )", + "NextFast.Hazel.Abstractions": "[1.0.2-dev, )" + } + }, + "NextFast.Hazel": { + "type": "Project", + "dependencies": { + "BouncyCastle.Cryptography": "[2.6.1, )", + "Microsoft.Extensions.DependencyInjection.Abstractions": "[9.0.6, )", + "Microsoft.Extensions.ObjectPool": "[8.0.1, )", + "NextFast.Hazel.Abstractions": "[1.0.2-dev, )", + "Serilog": "[4.3.1-dev-02373, )" + } + }, + "NextFast.Hazel.Abstractions": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/Empostor.Plugins.PlayerLog/Empostor.Plugins.PlayerLog.csproj b/src/Empostor.Plugins.PlayerLog/Empostor.Plugins.PlayerLog.csproj new file mode 100644 index 0000000..68b176c --- /dev/null +++ b/src/Empostor.Plugins.PlayerLog/Empostor.Plugins.PlayerLog.csproj @@ -0,0 +1,13 @@ + + + net8.0 + Empostor.Plugins.PlayerLog + enable + + + + + + + + diff --git a/src/Empostor.Plugins.PlayerLog/PlayerLogAdminExtension.cs b/src/Empostor.Plugins.PlayerLog/PlayerLogAdminExtension.cs new file mode 100644 index 0000000..0bf44b5 --- /dev/null +++ b/src/Empostor.Plugins.PlayerLog/PlayerLogAdminExtension.cs @@ -0,0 +1,74 @@ +using System.Linq; +using Empostor.Api.Admin; + +namespace Empostor.Plugins.PlayerLog; + +public sealed class PlayerLogAdminExtension : IAdminExtension +{ + private readonly PlayerLogStore _store; + + public PlayerLogAdminExtension(PlayerLogStore store) + { + _store = store; + } + + public string Id => "player-log"; + + public string Title => "Player Log"; + + public string Icon => "list"; + + public string Section => "Server"; + + public void Build(AdminPanelBuilder b) + { + var recent = _store.GetAll().Take(50).ToList(); + + b.RegisterTable(t => + { + t.Columns = new() { "Time", "Type", "Player", "Friend Code", "Game", "Detail" }; + foreach (var e in recent) + { + t.Rows.Add(new() + { + new() { Text = e.Time.ToString("MM-dd HH:mm:ss") }, + new() { Text = e.Type }, + new() { Text = e.PlayerName ?? "—" }, + new() { Text = e.FriendCode ?? "—" }, + new() { Text = e.GameCode ?? "—" }, + new() { Text = e.Detail ?? "—" }, + }); + } + }); + + b.RegisterText(txt => + { + txt.Content = $"Total entries: {_store.GetAll().Count}"; + txt.Tone = "muted"; + }); + + b.RegisterButton(btn => + { + btn.Label = "Export as JSON"; + btn.Icon = "download"; + btn.Style = "secondary"; + btn.OnClick(async ctx => + { + var data = _store.ExportJson(); + return AdminActionResult.Ok($"Exported {data.Length} bytes. Download via /api/admin/player/logs/export"); + }); + }); + + b.RegisterButton(btn => + { + btn.Label = "Clear All Logs"; + btn.Icon = "trash"; + btn.Style = "danger"; + btn.OnClick(async ctx => + { + _store.Clear(); + return AdminActionResult.Ok("All player logs cleared."); + }); + }); + } +} diff --git a/src/Empostor.Server/Service/Stat/PlayerLogListener.cs b/src/Empostor.Plugins.PlayerLog/PlayerLogListener.cs similarity index 98% rename from src/Empostor.Server/Service/Stat/PlayerLogListener.cs rename to src/Empostor.Plugins.PlayerLog/PlayerLogListener.cs index 0c4a1ab..984ce43 100644 --- a/src/Empostor.Server/Service/Stat/PlayerLogListener.cs +++ b/src/Empostor.Plugins.PlayerLog/PlayerLogListener.cs @@ -2,8 +2,9 @@ using Empostor.Api.Events; using Empostor.Api.Events.Client; using Empostor.Api.Events.Meeting; using Empostor.Api.Events.Player; +using Empostor.Api.Innersloth; -namespace Empostor.Server.Service.Stat; +namespace Empostor.Plugins.PlayerLog; internal sealed class PlayerLogListener : IEventListener { diff --git a/src/Empostor.Plugins.PlayerLog/PlayerLogPlugin.cs b/src/Empostor.Plugins.PlayerLog/PlayerLogPlugin.cs new file mode 100644 index 0000000..12fa59a --- /dev/null +++ b/src/Empostor.Plugins.PlayerLog/PlayerLogPlugin.cs @@ -0,0 +1,24 @@ +using System.Threading.Tasks; +using Empostor.Api.Plugins; +using Microsoft.Extensions.Logging; + +namespace Empostor.Plugins.PlayerLog; + +[EmpostorPlugin("gg.empostor.playerlog")] +public sealed class PlayerLogPlugin : PluginBase +{ + private readonly ILogger _logger; + + public PlayerLogPlugin(ILogger logger) + { + _logger = logger; + } + + public override ValueTask EnableAsync() + { + _logger.LogInformation("[PlayerLog] Enabled. Player activity logs are available in the admin panel."); + return default; + } + + public override ValueTask DisableAsync() => default; +} diff --git a/src/Empostor.Plugins.PlayerLog/PlayerLogPluginStartup.cs b/src/Empostor.Plugins.PlayerLog/PlayerLogPluginStartup.cs new file mode 100644 index 0000000..563483a --- /dev/null +++ b/src/Empostor.Plugins.PlayerLog/PlayerLogPluginStartup.cs @@ -0,0 +1,19 @@ +using Empostor.Api.Admin; +using Empostor.Api.Events; +using Empostor.Api.Plugins; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; + +namespace Empostor.Plugins.PlayerLog; + +public sealed class PlayerLogPluginStartup : IPluginStartup +{ + public void ConfigureHost(IHostBuilder host) { } + + public void ConfigureServices(IServiceCollection services) + { + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + } +} diff --git a/src/Empostor.Server/Service/Stat/PlayerLogStore.cs b/src/Empostor.Plugins.PlayerLog/PlayerLogStore.cs similarity index 84% rename from src/Empostor.Server/Service/Stat/PlayerLogStore.cs rename to src/Empostor.Plugins.PlayerLog/PlayerLogStore.cs index a2fbdd1..fd7143f 100644 --- a/src/Empostor.Server/Service/Stat/PlayerLogStore.cs +++ b/src/Empostor.Plugins.PlayerLog/PlayerLogStore.cs @@ -8,7 +8,7 @@ using System.Threading; using Empostor.Api.Service; using Microsoft.Extensions.Logging; -namespace Empostor.Server.Service.Stat; +namespace Empostor.Plugins.PlayerLog; public sealed class PlayerLogEntry { @@ -77,32 +77,18 @@ public sealed class PlayerLogStore : JsonDataStore> .DefaultIfEmpty(0) .Max(); - /// - /// Returns the most recent non-empty player name recorded for a client. - /// Used by the admin panel so disconnected players still show their - /// original name instead of a generic "Disconnected" label. - /// public string? GetLatestName(int clientId) => _entries.Where(e => e.ClientId == clientId) .OrderByDescending(e => e.Time) .Select(e => e.PlayerName) .FirstOrDefault(n => !string.IsNullOrEmpty(n)); - /// - /// Returns the most recent non-empty friend code recorded for a client. - /// public string? GetLatestFriendCode(int clientId) => _entries.Where(e => e.ClientId == clientId) .OrderByDescending(e => e.Time) .Select(e => e.FriendCode) .FirstOrDefault(f => !string.IsNullOrEmpty(f)); - /// - /// Removes logged entries and persists the store. - /// When is set, only entries strictly older - /// than the cutoff are removed (recent entries are kept); otherwise all - /// entries are removed. - /// public void Clear(DateTime? olderThan = null) { if (olderThan.HasValue) diff --git a/src/Empostor.Plugins.PlayerLog/packages.lock.json b/src/Empostor.Plugins.PlayerLog/packages.lock.json new file mode 100644 index 0000000..1ba9ee7 --- /dev/null +++ b/src/Empostor.Plugins.PlayerLog/packages.lock.json @@ -0,0 +1,495 @@ +{ + "version": 1, + "dependencies": { + "net8.0": { + "BouncyCastle.Cryptography": { + "type": "Transitive", + "resolved": "2.6.1", + "contentHash": "vZsG2YILhthgRqO+ZVgRff4ZFKKTl0v7kqaVBLCtRvpREhfBP33pcWrdA3PRYgWuFL1RxiUFvjMUHTdBZlJcoA==" + }, + "Microsoft.AspNetCore.Http.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "Nxs7Z1q3f1STfLYKJSVXCs1iBl+Ya6E8o4Oy1bCxJ/rNI44E/0f6tbsrVqAWfB7jlnJfyaAtIalBVxPKUPQb4Q==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.2.0", + "System.Text.Encodings.Web": "4.5.0" + } + }, + "Microsoft.AspNetCore.Http.Features": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "ziFz5zH8f33En4dX81LW84I6XrYXKf9jg6aM39cM+LffN9KJahViKZ61dGMSO2gd3e+qe5yBRwsesvyqlZaSMg==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "mBMoXLsr5s1y2zOHWmKsE9veDcx8h1x/c3rz4baEdQKTeDcmQAPNbB54Pi/lhFO3K431eEq6PFbMgLaa6PHFfA==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.CommandLine": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "NZuZMz3Q8Z780nKX3ifV1fE7lS+6pynDHK71OfU4OZ1ItgvDOhyOC7E6z+JMZrAj63zRpwbdldYFk499t3+1dQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.EnvironmentVariables": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "plvZ0ZIpq+97gdPNNvhwvrEZ92kNml9hd1pe3idMA7svR0PztdzVLkoWLcRFgySYXUJc3kSM3Xw3mNFMo/bxRA==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.FileExtensions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "McP+Lz/EKwvtCv48z0YImw+L1gi1gy5rHhNaNIY2CrjloV+XY8gydT8DjMR6zWeL13AFK+DioVpppwAuO1Gi1w==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Physical": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.Json": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "C2wqUoh9OmRL1akaCcKSTmRU8z0kckfImG7zLNI8uyi47Lp+zd5LWAD17waPQEqCz3ioWOCrFUo+JJuoeZLOBw==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.FileExtensions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "System.Text.Json": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.UserSecrets": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "ihDHu2dJYQird9pl2CbdwuNDfvCZdOS0S7SPlNfhPt0B81UTT+yyZKz2pimFZGUp3AfuBRnqUCxB2SjsZKHVUw==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Json": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Physical": "8.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "9.0.6", + "contentHash": "0Zn6nR/6g+90MxskZyOOMPQvnPnrrGu6bytPwkV+azDcTtCSuQ1+GJUrg8Klmnrjk1i6zMpw2lXijl+tw7Q3kA==" + }, + "Microsoft.Extensions.DependencyModel": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "NSmDw3K0ozNDgShSIpsZcbFIzBX4w28nDag+TfaQujkXGazBm+lid5onlWoCBy4VsLxqnnKjEBbGSJVWJMf43g==", + "dependencies": { + "System.Text.Encodings.Web": "8.0.0", + "System.Text.Json": "8.0.0" + } + }, + "Microsoft.Extensions.Diagnostics": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3PZp/YSkIXrF7QK7PfC1bkyRYwqOHpWFad8Qx+4wkuumAeXo1NHaxpS9LboNA9OvNSAu+QOVlXbMyoY+pHSqcw==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } + }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.FileProviders.Physical": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.FileSystemGlobbing": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ==" + }, + "Microsoft.Extensions.Hosting": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "ItYHpdqVp5/oFLT5QqbopnkKlyFG9EW/9nhM6/yfObeKt6Su0wkBio6AizgRHGNwhJuAtlE5VIjow5JOTrip6w==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.Configuration.CommandLine": "8.0.0", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "8.0.0", + "Microsoft.Extensions.Configuration.FileExtensions": "8.0.0", + "Microsoft.Extensions.Configuration.Json": "8.0.0", + "Microsoft.Extensions.Configuration.UserSecrets": "8.0.0", + "Microsoft.Extensions.DependencyInjection": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Physical": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Configuration": "8.0.0", + "Microsoft.Extensions.Logging.Console": "8.0.0", + "Microsoft.Extensions.Logging.Debug": "8.0.0", + "Microsoft.Extensions.Logging.EventLog": "8.0.0", + "Microsoft.Extensions.Logging.EventSource": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" + } + }, + "Microsoft.Extensions.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.Http": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "cWz4caHwvx0emoYe7NkHPxII/KkTI8R/LC9qdqJqnKv2poTJ4e2qqPGQqvRoQ5kaSA4FU5IV3qFAuLuOhoqULQ==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" + } + }, + "Microsoft.Extensions.Logging": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.Logging.Configuration": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "ixXXV0G/12g6MXK65TLngYN9V5hQQRuV+fZi882WIoVJT7h5JvoYoxTEwCgdqwLjSneqh1O+66gM8sMr9z/rsQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" + } + }, + "Microsoft.Extensions.Logging.Console": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "e+48o7DztoYog+PY430lPxrM4mm3PbA6qucvQtUDDwVo4MO+ejMw7YGc/o2rnxbxj4isPxdfKFzTxvXMwAz83A==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Configuration": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Text.Json": "8.0.0" + } + }, + "Microsoft.Extensions.Logging.Debug": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dt0x21qBdudHLW/bjMJpkixv858RRr8eSomgVbU8qljOyfrfDGi1JQvpF9w8S7ziRPtRKisuWaOwFxJM82GxeA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.Logging.EventLog": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3X9D3sl7EmOu7vQp5MJrmIJBl5XSdOhZPYXUeFfYa6Nnm9+tok8x3t3IVPLhm7UJtPOU61ohFchw8rNm9tIYOQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.EventLog": "8.0.0" + } + }, + "Microsoft.Extensions.Logging.EventSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "oKcPMrw+luz2DUAKhwFXrmFikZWnyc8l2RKoQwqU3KIZZjcfoJE0zRHAnqATfhRZhtcbjl/QkiY2Xjxp0xu+6w==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0", + "System.Text.Json": "8.0.0" + } + }, + "Microsoft.Extensions.ObjectPool": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "X21b8D6z58EG34OMLH955750mFaEaGs5xLGe9Vyi3059Cgb3sk+p2k/JlQXaieEBRrk+SVlFzDei3Q6PdVzJOA==" + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Options.ConfigurationExtensions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "0f4DMRqEd50zQh+UyJc+/HiBsZ3vhAQALgdkcQEalSH1L2isdC7Yj54M3cyo5e+BeO5fcBQ7Dxly8XiBBcvRgw==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "7.6.2", + "contentHash": "ULeyJwfYTMHOAArrBZorjPyM/BL5PFfwRzDtxlOxawO9vB/wVmHmbzZnOyHCOLJjel7XiVNmVnAs3H0jh4/9jQ==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "7.6.2", + "contentHash": "ySbY72MsWw7BnSZw0fCsmp/oMou8ntJkfuZUBcplV3ncXMzxcXCn3fK6Gg2YLnTT6F2G9JXl9zc2lwfVfGOWEA==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "7.6.2" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "7.6.2", + "contentHash": "0brV311MYxGz7Numa+pbVsxbz5tfe2nbAig1b5tQb3h/L1y5lkoPyOgD0qAfI0iX1njbwr8l9NdxIT1cDbzWKA==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "7.6.2" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "7.6.2", + "contentHash": "pLnhCq9UNKWkn83zutkObYuzA+sOzx6VZpPI8hB8gD/vAXVt14D0SJ0sKPftwufvAbYGSNRda1vw/IFLbkjxNg==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "7.6.2" + } + }, + "Serilog": { + "type": "Transitive", + "resolved": "4.3.1-dev-02373", + "contentHash": "f0HNPaleOox5++8zqxAdi9afnUUkoznLOmd0ur/UnLbzl8bIaPyyBGOpbIJmC1kz2vHfkQ0fXh6KXMdlz7bcLQ==" + }, + "Serilog.Extensions.Hosting": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "db0OcbWeSCvYQkHWu6n0v40N4kKaTAXNjlM3BKvcbwvNzYphQFcBR+36eQ/7hMMwOkJvAyLC2a9/jNdUL5NjtQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Hosting.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0", + "Serilog": "3.1.1", + "Serilog.Extensions.Logging": "8.0.0" + } + }, + "Serilog.Extensions.Logging": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "YEAMWu1UnWgf1c1KP85l1SgXGfiVo0Rz6x08pCiPOIBt2Qe18tcZLvdBUuV5o1QHvrs8FAry9wTIhgBRtjIlEg==", + "dependencies": { + "Microsoft.Extensions.Logging": "8.0.0", + "Serilog": "3.1.1" + } + }, + "Serilog.Settings.Configuration": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "nR0iL5HwKj5v6ULo3/zpP8NMcq9E2pxYA6XKTSWCbugVs4YqPyvaqaKOY+OMpPivKp7zMEpax2UKHnDodbRB0Q==", + "dependencies": { + "Microsoft.Extensions.Configuration.Binder": "8.0.0", + "Microsoft.Extensions.DependencyModel": "8.0.0", + "Serilog": "3.1.1" + } + }, + "Serilog.Sinks.Console": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "6Jt8jl9y2ey8VV7nVEUAyjjyxjAQuvd5+qj4XYAT9CwcsvR70HHULGBeD+K2WCALFXf7CFsNQT4lON6qXcu2AA==", + "dependencies": { + "Serilog": "3.1.1" + } + }, + "Serilog.Sinks.File": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "lxjg89Y8gJMmFxVkbZ+qDgjl+T4yC5F7WSLTvA+5q0R04tfKVLRL/EHpYoJ/MEQd2EeCKDuylBIVnAYMotmh2A==", + "dependencies": { + "Serilog": "4.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" + }, + "System.Diagnostics.EventLog": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "7.6.2", + "contentHash": "dyvPIzxohovbECESKj9ep7yShujU5oN9dKYR3ivvoTM7nLANNrBC5jN9ysZfY5Hp/Xs0R1b79IsdHuu6D4xwow==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "7.6.2", + "Microsoft.IdentityModel.Tokens": "7.6.2" + } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "dependencies": { + "System.Text.Encodings.Web": "8.0.0" + } + }, + "empostor.api": { + "type": "Project", + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "[2.2.0, )", + "Microsoft.Extensions.Hosting.Abstractions": "[8.0.0, )", + "Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )", + "NextFast.Hazel": "[1.0.2-dev, )", + "NextFast.Hazel.Abstractions": "[1.0.2-dev, )" + } + }, + "empostor.api.innersloth.generator": { + "type": "Project" + }, + "empostor.server": { + "type": "Project", + "dependencies": { + "Empostor.Api": "[2.0.0-dev, )", + "Empostor.Api.Innersloth.Generator": "[2.0.0-dev, )", + "Microsoft.Extensions.FileSystemGlobbing": "[8.0.0, )", + "Microsoft.Extensions.Hosting": "[8.0.0, )", + "Microsoft.Extensions.Http": "[8.0.0, )", + "Microsoft.Extensions.ObjectPool": "[8.0.1, )", + "NextFast.Hazel": "[1.0.2-dev, )", + "NextFast.Hazel.Abstractions": "[1.0.2-dev, )", + "Serilog.Extensions.Hosting": "[8.0.0, )", + "Serilog.Settings.Configuration": "[8.0.0, )", + "Serilog.Sinks.Console": "[5.0.1, )", + "Serilog.Sinks.File": "[6.0.0, )", + "System.IdentityModel.Tokens.Jwt": "[7.6.2, )" + } + }, + "NextFast.Hazel": { + "type": "Project", + "dependencies": { + "BouncyCastle.Cryptography": "[2.6.1, )", + "Microsoft.Extensions.DependencyInjection.Abstractions": "[9.0.6, )", + "Microsoft.Extensions.ObjectPool": "[8.0.1, )", + "NextFast.Hazel.Abstractions": "[1.0.2-dev, )", + "Serilog": "[4.3.1-dev-02373, )" + } + }, + "NextFast.Hazel.Abstractions": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/Empostor.Plugins.Privacy/Empostor.Plugins.Privacy.csproj b/src/Empostor.Plugins.Privacy/Empostor.Plugins.Privacy.csproj new file mode 100644 index 0000000..d1ea3fe --- /dev/null +++ b/src/Empostor.Plugins.Privacy/Empostor.Plugins.Privacy.csproj @@ -0,0 +1,14 @@ + + + net8.0 + Empostor.Plugins.Privacy + enable + + + + + + + + + diff --git a/src/Empostor.Plugins.Privacy/PrivacyAdminExtension.cs b/src/Empostor.Plugins.Privacy/PrivacyAdminExtension.cs new file mode 100644 index 0000000..96ff56c --- /dev/null +++ b/src/Empostor.Plugins.Privacy/PrivacyAdminExtension.cs @@ -0,0 +1,44 @@ +using System.Text.Json; +using Empostor.Api.Admin; + +namespace Empostor.Plugins.Privacy; + +public sealed class PrivacyAdminExtension : IAdminExtension +{ + private readonly PrivacyStore _store; + + public PrivacyAdminExtension(PrivacyStore store) + { + _store = store; + } + + public string Id => "privacy-policy"; + + public string Title => "Privacy Policy"; + + public string Icon => "shield"; + + public string Section => "Server"; + + public void Build(AdminPanelBuilder b) + { + b.RegisterTextbox(t => + { + t.Label = "Privacy Policy HTML"; + t.Value = _store.GetContent(); + t.Multiline = true; + t.SubmitOnChange = true; + t.OnSubmit(async ctx => + { + _store.SaveContent(ctx.Value ?? string.Empty); + return AdminActionResult.Ok("Privacy policy saved."); + }); + }); + + b.RegisterText(txt => + { + txt.Content = "The privacy policy is served at /privacy. Edit the HTML above to update it."; + txt.Tone = "muted"; + }); + } +} diff --git a/src/Empostor.Plugins.Privacy/PrivacyController.cs b/src/Empostor.Plugins.Privacy/PrivacyController.cs new file mode 100644 index 0000000..33c5f48 --- /dev/null +++ b/src/Empostor.Plugins.Privacy/PrivacyController.cs @@ -0,0 +1,60 @@ +using System; +using System.IO; +using System.Text.Json; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; + +namespace Empostor.Plugins.Privacy; + +[ApiController] +[Route("/privacy")] +public sealed class PrivacyController : ControllerBase +{ + private readonly PrivacyStore _store; + private readonly ILogger _logger; + + public PrivacyController(PrivacyStore store, ILogger logger) + { + _store = store; + _logger = logger; + } + + [HttpGet] + public IActionResult GetPrivacy() + { + var html = _store.GetContent(); + return Content(html, "text/html; charset=utf-8"); + } + + [HttpPost] + [Route("/admin/api/privacy")] + public async Task UpdatePrivacy() + { + using var reader = new StreamReader(Request.Body); + var body = await reader.ReadToEndAsync(); + + try + { + var doc = JsonDocument.Parse(body); + var content = doc.RootElement.GetProperty("content").GetString() ?? string.Empty; + var token = doc.RootElement.GetProperty("token").GetString() ?? string.Empty; + + var adminToken = Environment.GetEnvironmentVariable("EMP_HTTP_TOKEN") + ?? Environment.GetEnvironmentVariable("EMP_ADMIN_TOKEN") + ?? "empostor"; + + if (token != adminToken) + { + return Unauthorized(new { error = "Invalid token." }); + } + + _store.SaveContent(content); + return Ok(new { success = true }); + } + catch (Exception ex) + { + return BadRequest(new { error = ex.Message }); + } + } +} diff --git a/src/Empostor.Plugins.Privacy/PrivacyPlugin.cs b/src/Empostor.Plugins.Privacy/PrivacyPlugin.cs new file mode 100644 index 0000000..849a33f --- /dev/null +++ b/src/Empostor.Plugins.Privacy/PrivacyPlugin.cs @@ -0,0 +1,24 @@ +using System.Threading.Tasks; +using Empostor.Api.Plugins; +using Microsoft.Extensions.Logging; + +namespace Empostor.Plugins.Privacy; + +[EmpostorPlugin("gg.empostor.privacy")] +public sealed class PrivacyPlugin : PluginBase +{ + private readonly ILogger _logger; + + public PrivacyPlugin(ILogger logger) + { + _logger = logger; + } + + public override ValueTask EnableAsync() + { + _logger.LogInformation("[Privacy] Enabled. Privacy policy page at /privacy"); + return default; + } + + public override ValueTask DisableAsync() => default; +} diff --git a/src/Empostor.Plugins.Privacy/PrivacyPluginStartup.cs b/src/Empostor.Plugins.Privacy/PrivacyPluginStartup.cs new file mode 100644 index 0000000..821259b --- /dev/null +++ b/src/Empostor.Plugins.Privacy/PrivacyPluginStartup.cs @@ -0,0 +1,24 @@ +using Empostor.Api.Admin; +using Empostor.Api.Plugins; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; + +namespace Empostor.Plugins.Privacy; + +public sealed class PrivacyPluginStartup : IPluginStartup, IPluginHttpStartup +{ + public void ConfigureHost(IHostBuilder host) { } + + public void ConfigureServices(IServiceCollection services) + { + services.AddSingleton(); + services.AddSingleton(); + services.AddControllers() + .AddApplicationPart(typeof(PrivacyPluginStartup).Assembly); + } + + public void ConfigureWebApplication(IApplicationBuilder app) + { + } +} diff --git a/src/Empostor.Server/Http/PrivacyController.cs b/src/Empostor.Plugins.Privacy/PrivacyStore.cs similarity index 58% rename from src/Empostor.Server/Http/PrivacyController.cs rename to src/Empostor.Plugins.Privacy/PrivacyStore.cs index 131795d..13fbfbd 100644 --- a/src/Empostor.Server/Http/PrivacyController.cs +++ b/src/Empostor.Plugins.Privacy/PrivacyStore.cs @@ -1,70 +1,42 @@ using System; using System.IO; +using System.Text.Json; using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; +using Empostor.Api.Admin; using Microsoft.Extensions.Logging; -namespace Empostor.Server.Http; +namespace Empostor.Plugins.Privacy; -[ApiController] -[Route("/privacy")] -public sealed class PrivacyController : ControllerBase +public sealed class PrivacyStore { private static readonly string PagesDir = Path.Combine(Directory.GetCurrentDirectory(), "Pages"); private static readonly string PrivacyFile = Path.Combine(PagesDir, "privacy.html"); - private static bool _initialized; - private static readonly object _initLock = new(); - private readonly ILogger _logger; + private readonly ILogger _logger; + private bool _initialized; + private readonly object _initLock = new(); - public PrivacyController(ILogger logger) + public PrivacyStore(ILogger logger) { _logger = logger; + } + + public string GetContent() + { EnsureFile(); + if (!File.Exists(PrivacyFile)) + { + return DefaultPrivacyHtml(); + } + + return File.ReadAllText(PrivacyFile); } - [HttpGet] - public IActionResult GetPrivacy() + public void SaveContent(string content) { - if (!System.IO.File.Exists(PrivacyFile)) - { - return Content(DefaultPrivacyHtml(), "text/html; charset=utf-8"); - } - - var html = System.IO.File.ReadAllText(PrivacyFile); - return Content(html, "text/html; charset=utf-8"); - } - - [HttpPost] - [Route("/admin/api/privacy")] - public async Task UpdatePrivacy() - { - using var reader = new StreamReader(Request.Body); - var body = await reader.ReadToEndAsync(); - - try - { - var doc = System.Text.Json.JsonDocument.Parse(body); - var content = doc.RootElement.GetProperty("content").GetString() ?? string.Empty; - var token = doc.RootElement.GetProperty("token").GetString() ?? string.Empty; - - var adminToken = Environment.GetEnvironmentVariable("EMP_HTTP_TOKEN") - ?? Environment.GetEnvironmentVariable("EMP_ADMIN_TOKEN") - ?? "empostor"; - - if (token != adminToken) - { - return Unauthorized(new { error = "Invalid token." }); - } - - System.IO.File.WriteAllText(PrivacyFile, content); - _logger.LogInformation("PrivacyControllerPrivacy policy updated."); - return Ok(new { success = true }); - } - catch (Exception ex) - { - return BadRequest(new { error = ex.Message }); - } + EnsureFile(); + File.WriteAllText(PrivacyFile, content); + _logger.LogInformation("Privacy policy updated."); } private void EnsureFile() @@ -88,10 +60,10 @@ public sealed class PrivacyController : ControllerBase Directory.CreateDirectory(PagesDir); } - if (!System.IO.File.Exists(PrivacyFile)) + if (!File.Exists(PrivacyFile)) { - System.IO.File.WriteAllText(PrivacyFile, DefaultPrivacyHtml()); - _logger.LogInformation("PrivacyControllerWritten default Pages/privacy.html"); + File.WriteAllText(PrivacyFile, DefaultPrivacyHtml()); + _logger.LogInformation("Written default Pages/privacy.html"); } } } diff --git a/src/Empostor.Plugins.Privacy/packages.lock.json b/src/Empostor.Plugins.Privacy/packages.lock.json new file mode 100644 index 0000000..ac11d80 --- /dev/null +++ b/src/Empostor.Plugins.Privacy/packages.lock.json @@ -0,0 +1,137 @@ +{ + "version": 1, + "dependencies": { + "net8.0": { + "BouncyCastle.Cryptography": { + "type": "Transitive", + "resolved": "2.6.1", + "contentHash": "vZsG2YILhthgRqO+ZVgRff4ZFKKTl0v7kqaVBLCtRvpREhfBP33pcWrdA3PRYgWuFL1RxiUFvjMUHTdBZlJcoA==" + }, + "Microsoft.AspNetCore.Http.Abstractions": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "Nxs7Z1q3f1STfLYKJSVXCs1iBl+Ya6E8o4Oy1bCxJ/rNI44E/0f6tbsrVqAWfB7jlnJfyaAtIalBVxPKUPQb4Q==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.2.0", + "System.Text.Encodings.Web": "4.5.0" + } + }, + "Microsoft.AspNetCore.Http.Features": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "ziFz5zH8f33En4dX81LW84I6XrYXKf9jg6aM39cM+LffN9KJahViKZ61dGMSO2gd3e+qe5yBRwsesvyqlZaSMg==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.2.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "9.0.6", + "contentHash": "0Zn6nR/6g+90MxskZyOOMPQvnPnrrGu6bytPwkV+azDcTtCSuQ1+GJUrg8Klmnrjk1i6zMpw2lXijl+tw7Q3kA==" + }, + "Microsoft.Extensions.Diagnostics.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Options": "8.0.0", + "System.Diagnostics.DiagnosticSource": "8.0.0" + } + }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.Logging.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.ObjectPool": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "X21b8D6z58EG34OMLH955750mFaEaGs5xLGe9Vyi3059Cgb3sk+p2k/JlQXaieEBRrk+SVlFzDei3Q6PdVzJOA==" + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + }, + "Serilog": { + "type": "Transitive", + "resolved": "4.3.1-dev-02373", + "contentHash": "f0HNPaleOox5++8zqxAdi9afnUUkoznLOmd0ur/UnLbzl8bIaPyyBGOpbIJmC1kz2vHfkQ0fXh6KXMdlz7bcLQ==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "Xg4G4Indi4dqP1iuAiMSwpiWS54ZghzR644OtsRCm/m/lBMG8dUBhLVN7hLm8NNrNTR+iGbshCPTwrvxZPlm4g==" + }, + "empostor.api": { + "type": "Project", + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "[2.2.0, )", + "Microsoft.Extensions.Hosting.Abstractions": "[8.0.0, )", + "Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )", + "NextFast.Hazel": "[1.0.2-dev, )", + "NextFast.Hazel.Abstractions": "[1.0.2-dev, )" + } + }, + "NextFast.Hazel": { + "type": "Project", + "dependencies": { + "BouncyCastle.Cryptography": "[2.6.1, )", + "Microsoft.Extensions.DependencyInjection.Abstractions": "[9.0.6, )", + "Microsoft.Extensions.ObjectPool": "[8.0.1, )", + "NextFast.Hazel.Abstractions": "[1.0.2-dev, )", + "Serilog": "[4.3.1-dev-02373, )" + } + }, + "NextFast.Hazel.Abstractions": { + "type": "Project" + } + } + } +} \ No newline at end of file diff --git a/src/Empostor.Server/Commands/Commands/BanCommand.cs b/src/Empostor.Server/Commands/Commands/BanCommand.cs index feae10f..e5e5c4f 100644 --- a/src/Empostor.Server/Commands/Commands/BanCommand.cs +++ b/src/Empostor.Server/Commands/Commands/BanCommand.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Empostor.Api.Commands; using Empostor.Api.Net; -using Empostor.Server.Service.Admin.Ban; +using Empostor.Server.Service.Shared; using Next.Hazel; namespace Empostor.Server.Commands.Commands; @@ -64,14 +64,14 @@ public sealed class BanCommand : ICommand // Ban by friend code if available if (!string.IsNullOrEmpty(fc)) { - _banStore.BanFriendCode(fc, reason); + _banStore.BanFriendCode(fc, reason, null); } // Ban by IP var ip = target.Client.Connection?.EndPoint?.Address; if (ip != null) { - _banStore.BanIp(ip, reason); + _banStore.BanIp(ip, reason, null); } await target.Client.DisconnectAsync(DisconnectReason.Banned, reason); diff --git a/src/Empostor.Server/Http/AdminController.cs b/src/Empostor.Server/Http/AdminController.cs index ec2affc..5391bcc 100644 --- a/src/Empostor.Server/Http/AdminController.cs +++ b/src/Empostor.Server/Http/AdminController.cs @@ -16,11 +16,8 @@ using Empostor.Api.Games.Managers; using Empostor.Api.Net; using Empostor.Api.Net.Manager; using Empostor.Server.Http.Admin; -using Empostor.Server.Service.Admin.Ban; -using Empostor.Server.Service.Admin.Reactor; -using Empostor.Server.Service.Admin.Report; using Empostor.Server.Service.Api; -using Empostor.Server.Service.Stat; +using Empostor.Server.Service.Shared; using Empostor.Server.Utils; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -45,7 +42,6 @@ namespace Empostor.Server.Http private readonly BanStore _bans; private readonly AdminConfig _config; private readonly ReportStore _reportStore; - private readonly PlayerLogStore _playerLogs; private readonly HplpStore _hplpStore; private readonly IOptions _serverConfig; private readonly IOptions _httpServerConfig; @@ -62,7 +58,6 @@ namespace Empostor.Server.Http BanStore bans, IOptions config, ReportStore reportStore, - PlayerLogStore playerLogs, HplpStore hplpStore, IOptions serverConfig, IOptions httpServerConfig, @@ -76,7 +71,6 @@ namespace Empostor.Server.Http _bans = bans; _config = config.Value; _reportStore = reportStore; - _playerLogs = playerLogs; _hplpStore = hplpStore; _serverConfig = serverConfig; _httpServerConfig = httpServerConfig; @@ -505,7 +499,7 @@ namespace Empostor.Server.Http } } - return Ok(new { banned = entry.Value, disconnected = kicked }); + return Ok(new { banned = entry, disconnected = kicked }); } [HttpPost("/api/admin/ban/fc")] @@ -538,7 +532,7 @@ namespace Empostor.Server.Http } } - return Ok(new { banned = entry.Value, disconnected = kicked }); + return Ok(new { banned = entry, disconnected = kicked }); } [HttpPost("/api/admin/unban/ip")] @@ -549,7 +543,12 @@ namespace Empostor.Server.Http return Unauthorized(); } - return Ok(new { removed = _bans.UnbanIp(req.Value) }); + if (!IPAddress.TryParse(req.Value, out var ip)) + { + return BadRequest(Err("Invalid IP")); + } + + return Ok(new { removed = _bans.UnbanIp(ip) }); } [HttpPost("/api/admin/unban/fc")] @@ -626,111 +625,6 @@ namespace Empostor.Server.Http })); } - [HttpGet("/api/admin/player/logs/clients")] - public IActionResult GetPlayerLogClients() - { - if (!IsAuthenticated()) - { - return Unauthorized(); - } - - return Ok(_playerLogs.GetLoggedClientIds().Select(id => new - { - clientId = id, - name = FindClient(id)?.Name ?? _playerLogs.GetLatestName(id) ?? "Disconnected", - friendCode = FindClient(id)?.FriendCode ?? _playerLogs.GetLatestFriendCode(id) ?? "—", - })); - } - - [HttpPost("/api/admin/player/logs/clear")] - public IActionResult ClearPlayerLogs([FromQuery] string? olderThan) - { - if (!IsAuthenticated()) - { - return Unauthorized(); - } - - DateTime? cutoff = null; - if (!string.IsNullOrEmpty(olderThan) - && !olderThan.Equals("all", StringComparison.OrdinalIgnoreCase)) - { - cutoff = ParseLogCutoff(olderThan); - if (cutoff == null) - { - return BadRequest(new { error = "Invalid time range." }); - } - } - - _playerLogs.Clear(cutoff); - _logger.LogInformation("Admin cleared player logs (olderThan: {OlderThan})", olderThan ?? "all"); - return Ok(new { cleared = true }); - } - - private static DateTime? ParseLogCutoff(string value) - { - var now = DateTime.UtcNow; - switch (value.Trim().ToLowerInvariant()) - { - case "1h": - return now.AddHours(-1); - case "24h": - return now.AddDays(-1); - case "7d": - return now.AddDays(-7); - case "30d": - return now.AddDays(-30); - default: - return DateTime.TryParse( - value, - null, - System.Globalization.DateTimeStyles.AssumeUniversal - | System.Globalization.DateTimeStyles.AdjustToUniversal, - out var dt) - ? dt.ToUniversalTime() - : (DateTime?)null; - } - } - - [HttpGet("/api/admin/player/logs")] - public IActionResult GetPlayerLogs([FromQuery] int? clientId) - { - if (!IsAuthenticated()) - { - return Unauthorized(); - } - - var logs = clientId.HasValue - ? _playerLogs.GetByClient(clientId.Value) - : _playerLogs.GetAll(); - return Ok(logs.Select(e => new - { - time = e.Time.ToString("yyyy-MM-dd HH:mm:ss"), - type = e.Type, - clientId = e.ClientId, - playerName = e.PlayerName ?? "—", - friendCode = e.FriendCode ?? "—", - gameCode = e.GameCode ?? "—", - detail = e.Detail ?? "—", - })); - } - - [HttpGet("/api/admin/player/logs/export")] - public IActionResult ExportPlayerLogs([FromQuery] int? clientId) - { - if (!IsAuthenticated()) - { - return Unauthorized(); - } - - var data = clientId.HasValue - ? _playerLogs.ExportJson(clientId.Value) - : _playerLogs.ExportJson(); - var name = clientId.HasValue - ? $"player_{clientId}_logs.json" - : "all_player_logs.json"; - return File(data, "application/json; charset=utf-8", name); - } - [HttpGet("/api/admin/hplp")] public IActionResult GetHplp() { diff --git a/src/Empostor.Server/Http/HplpController.cs b/src/Empostor.Server/Http/HplpController.cs index b476bb6..0baf2f6 100644 --- a/src/Empostor.Server/Http/HplpController.cs +++ b/src/Empostor.Server/Http/HplpController.cs @@ -4,7 +4,7 @@ using Empostor.Api.Config; using Empostor.Api.Games; using Empostor.Api.Games.Managers; using Empostor.Api.Innersloth; -using Empostor.Server.Service.Admin.Reactor; +using Empostor.Server.Service.Shared; using Empostor.Server.Service.Api; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; diff --git a/src/Empostor.Server/Net/Client.cs b/src/Empostor.Server/Net/Client.cs index b308746..6a96222 100644 --- a/src/Empostor.Server/Net/Client.cs +++ b/src/Empostor.Server/Net/Client.cs @@ -13,7 +13,7 @@ using Empostor.Api.Net.Messages.C2S; using Empostor.Api.Net.Messages.S2C; using Empostor.Server.Events.Player; using Empostor.Server.Net.Manager; -using Empostor.Server.Service.Admin.Report; +using Empostor.Server.Service.Shared; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Next.Hazel; diff --git a/src/Empostor.Server/Net/Manager/ClientManager.cs b/src/Empostor.Server/Net/Manager/ClientManager.cs index 9f5c491..a4de028 100644 --- a/src/Empostor.Server/Net/Manager/ClientManager.cs +++ b/src/Empostor.Server/Net/Manager/ClientManager.cs @@ -14,9 +14,10 @@ using Empostor.Api.Service; using Empostor.Server.Events.Client; using Empostor.Server.Net.Factories; using Empostor.Server.Service; -using Empostor.Server.Service.Admin.Reactor; +using Empostor.Server.Service.Shared; using Empostor.Server.Service.Auth; using Empostor.Server.Utils; + using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Next.Hazel; diff --git a/src/Empostor.Server/Net/State/Game.Incoming.cs b/src/Empostor.Server/Net/State/Game.Incoming.cs index 7b0d167..b7bde99 100644 --- a/src/Empostor.Server/Net/State/Game.Incoming.cs +++ b/src/Empostor.Server/Net/State/Game.Incoming.cs @@ -6,7 +6,7 @@ using Empostor.Api.Games; using Empostor.Api.Net; using Next.Hazel; using Empostor.Server.Events; -using Empostor.Server.Service.Admin.Reactor; +using Empostor.Server.Service.Shared; using Empostor.Server.Utils; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/src/Empostor.Server/Program.cs b/src/Empostor.Server/Program.cs index e83d8f1..323de58 100644 --- a/src/Empostor.Server/Program.cs +++ b/src/Empostor.Server/Program.cs @@ -25,14 +25,11 @@ using Empostor.Server.Net.Manager; using Empostor.Server.Net.Messages; using Empostor.Server.Plugins; using Empostor.Server.Recorder; -using Empostor.Server.Service.Admin.Ban; -using Empostor.Server.Service.Admin.Reactor; -using Empostor.Server.Service.Admin.Report; +using Empostor.Server.Service.Shared; using Empostor.Server.Service.Api; using Empostor.Api.Service; using Empostor.Server.Service.Auth; using Empostor.Server.Service.Firewall; -using Empostor.Server.Service.Stat; using Empostor.Server.Utils; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -199,8 +196,6 @@ namespace Empostor.Server services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/src/Empostor.Server/Recorder/ClientRecorder.cs b/src/Empostor.Server/Recorder/ClientRecorder.cs index a96dbf1..febde25 100644 --- a/src/Empostor.Server/Recorder/ClientRecorder.cs +++ b/src/Empostor.Server/Recorder/ClientRecorder.cs @@ -6,7 +6,7 @@ using Empostor.Api.Net.Messages; using Empostor.Server.Net; using Empostor.Server.Net.Hazel; using Empostor.Server.Net.Manager; -using Empostor.Server.Service.Admin.Report; +using Empostor.Server.Service.Shared; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Empostor.Server/Service/Admin/Ban/BanStore.cs b/src/Empostor.Server/Service/Admin/Ban/BanStore.cs deleted file mode 100644 index 8c25b94..0000000 --- a/src/Empostor.Server/Service/Admin/Ban/BanStore.cs +++ /dev/null @@ -1,244 +0,0 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Text.Json.Serialization; -using System.Text.RegularExpressions; -using Empostor.Api.Service; -using Microsoft.Extensions.Logging; - -namespace Empostor.Server.Service.Admin.Ban -{ - public sealed class BanStore : JsonDataStore - { - private ConcurrentDictionary _ips = new(); - private ConcurrentDictionary _friendCodes = new(); - - public BanStore(ILogger logger) - : base(logger, legacyPath: "bans.json") - { - Load(); - } - - public bool IsIpBanned(IPAddress ip) => GetIpBan(ip) != null; - - public bool IsFriendCodeBanned(string? fc) => GetFriendCodeBan(fc) != null; - - public BanEntry? GetIpBan(IPAddress ip) - { - var key = Normalize(ip); - if (!_ips.TryGetValue(key, out var entry)) - { - return null; - } - - if (!entry.IsExpired) - { - return entry; - } - - _ips.TryRemove(key, out _); - SaveFireAndForget(); - return null; - } - - public BanEntry? GetFriendCodeBan(string? fc) - { - if (fc == null || !_friendCodes.TryGetValue(fc, out var entry)) - { - return null; - } - - if (!entry.IsExpired) - { - return entry; - } - - _friendCodes.TryRemove(fc, out _); - SaveFireAndForget(); - return null; - } - - public BanEntry BanIp(IPAddress ip, string reason, DateTime? bannedUntil = null) - { - var key = Normalize(ip); - var entry = new BanEntry { Value = key, Reason = reason, BannedAt = DateTime.UtcNow, BannedUntil = bannedUntil }; - _ips[key] = entry; - SaveFireAndForget(); - return entry; - } - - public bool UnbanIp(string key) - { - var r = _ips.TryRemove(key, out _); - if (r) - { - SaveFireAndForget(); - } - - return r; - } - - public BanEntry BanFriendCode(string fc, string reason, DateTime? bannedUntil = null) - { - var entry = new BanEntry { Value = fc, Reason = reason, BannedAt = DateTime.UtcNow, BannedUntil = bannedUntil }; - _friendCodes[fc] = entry; - SaveFireAndForget(); - return entry; - } - - public bool UnbanFriendCode(string key) - { - var r = _friendCodes.TryRemove(key, out _); - if (r) - { - SaveFireAndForget(); - } - - return r; - } - - public IReadOnlyList AllIpBans() - { - if (PruneExpired()) - { - SaveFireAndForget(); - } - - return _ips.Values.OrderByDescending(b => b.BannedAt).ToList(); - } - - public IReadOnlyList AllFriendCodeBans() - { - if (PruneExpired()) - { - SaveFireAndForget(); - } - - return _friendCodes.Values.OrderByDescending(b => b.BannedAt).ToList(); - } - - public (int IpCount, int FcCount) Stats() - { - if (PruneExpired()) - { - SaveFireAndForget(); - } - - return (_ips.Count, _friendCodes.Count); - } - - /// - /// Parses a ban duration string into a UTC expiry timestamp. - /// Supported formats: "permanent"/"forever" (or empty) for a permanent ban, - /// or "<number><unit>" where unit is h (hours), d (days), mo (months) or y (years). - /// Returns null for a permanent ban. - /// - public static DateTime? ParseDuration(string? duration) - { - if (string.IsNullOrWhiteSpace(duration)) - { - return null; - } - - var value = duration.Trim(); - if (value.Equals("permanent", StringComparison.OrdinalIgnoreCase) - || value.Equals("forever", StringComparison.OrdinalIgnoreCase) - || value.Equals("perm", StringComparison.OrdinalIgnoreCase)) - { - return null; - } - - var match = Regex.Match(value, @"^(\d+)(h|d|mo|y)$", RegexOptions.IgnoreCase); - if (!match.Success) - { - return null; - } - - var amount = int.Parse(match.Groups[1].Value); - var unit = match.Groups[2].Value.ToLowerInvariant(); - var now = DateTime.UtcNow; - - return unit switch - { - "h" => now.AddHours(amount), - "d" => now.AddDays(amount), - "mo" => now.AddMonths(amount), - "y" => now.AddYears(amount), - _ => null, - }; - } - - protected override BanData GetSnapshot() - { - PruneExpired(); - return new() - { - Ips = new(_ips), - FriendCodes = new(_friendCodes), - }; - } - - protected override void ApplySnapshot(BanData data) - { - _ips = new(data.Ips ?? new()); - _friendCodes = new(data.FriendCodes ?? new()); - } - - private bool PruneExpired() - { - var changed = false; - foreach (var (key, entry) in _ips) - { - if (entry.IsExpired && _ips.TryRemove(key, out _)) - { - changed = true; - } - } - - foreach (var (key, entry) in _friendCodes) - { - if (entry.IsExpired && _friendCodes.TryRemove(key, out _)) - { - changed = true; - } - } - - return changed; - } - - private static string Normalize(IPAddress ip) - => ip.IsIPv4MappedToIPv6 ? ip.MapToIPv4().ToString() : ip.ToString(); - - public sealed class BanData - { - [JsonPropertyName("ips")] - public Dictionary? Ips { get; set; } - - [JsonPropertyName("friendCodes")] - public Dictionary? FriendCodes { get; set; } - } - } - - public sealed class BanEntry - { - [JsonPropertyName("value")] - public required string Value { get; init; } - - [JsonPropertyName("reason")] - public required string Reason { get; init; } - - [JsonPropertyName("bannedAt")] - public required DateTime BannedAt { get; init; } - - [JsonPropertyName("bannedUntil")] - public DateTime? BannedUntil { get; init; } - - [JsonIgnore] - public bool IsExpired => BannedUntil.HasValue && BannedUntil.Value <= DateTime.UtcNow; - - [JsonIgnore] - public bool IsPermanent => !BannedUntil.HasValue; - } -} diff --git a/src/Empostor.Server/Service/ClientIdStore.cs b/src/Empostor.Server/Service/ClientIdStore.cs index a59eebc..e59cdc5 100644 --- a/src/Empostor.Server/Service/ClientIdStore.cs +++ b/src/Empostor.Server/Service/ClientIdStore.cs @@ -1,5 +1,4 @@ using Empostor.Api.Service; -using Empostor.Server.Service.Stat; using Microsoft.Extensions.Logging; namespace Empostor.Server.Service; @@ -16,14 +15,17 @@ public sealed class ClientIdStore : JsonDataStore { private long _lastId; - public ClientIdStore(ILogger logger, PlayerLogStore playerLogs) + public ClientIdStore(ILogger logger) : base(logger) { Load(); + } - _lastId = System.Math.Max(_lastId, playerLogs.GetMaxClientId()); - if (_lastId > 0) + public void InitializeWithMaxId(long maxId) + { + if (maxId > _lastId) { + _lastId = maxId; SaveFireAndForget(); } } diff --git a/src/Empostor.Server/Service/Admin/Ban/BanEnforcementListener.cs b/src/Empostor.Server/Service/Shared/BanEnforcementListener.cs similarity index 95% rename from src/Empostor.Server/Service/Admin/Ban/BanEnforcementListener.cs rename to src/Empostor.Server/Service/Shared/BanEnforcementListener.cs index 9ea1db6..d5c5b9d 100644 --- a/src/Empostor.Server/Service/Admin/Ban/BanEnforcementListener.cs +++ b/src/Empostor.Server/Service/Shared/BanEnforcementListener.cs @@ -5,7 +5,7 @@ using Empostor.Api.Events.Client; using Empostor.Api.Languages; using Microsoft.Extensions.Logging; -namespace Empostor.Server.Service.Admin.Ban; +namespace Empostor.Server.Service.Shared; public sealed class BanEnforcementListener : IEventListener { @@ -26,7 +26,7 @@ public sealed class BanEnforcementListener : IEventListener var client = e.Client; var ip = client.Connection?.EndPoint?.Address; - // IP 封禁检查 + // IP ban check if (ip != null && _bans.GetIpBan(ip) is { } ipBan) { _logger.LogWarning("BanRejecting banned IP {Ip} ({Name})", ip, client.Name); @@ -34,7 +34,7 @@ public sealed class BanEnforcementListener : IEventListener return; } - // FriendCode 封禁检查 + // FriendCode ban check if (_bans.GetFriendCodeBan(client.FriendCode) is { } fcBan) { _logger.LogWarning("BanRejecting banned FriendCode {FC} ({Name})", client.FriendCode, client.Name); diff --git a/src/Empostor.Server/Service/Shared/BanStore.cs b/src/Empostor.Server/Service/Shared/BanStore.cs new file mode 100644 index 0000000..3074df2 --- /dev/null +++ b/src/Empostor.Server/Service/Shared/BanStore.cs @@ -0,0 +1,205 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Text.Json.Serialization; +using System.Text.RegularExpressions; +using Empostor.Api.Service; +using Microsoft.Extensions.Logging; + +namespace Empostor.Server.Service.Shared +{ + public sealed class BanStore : JsonDataStore + { + private ConcurrentDictionary _ips = new(); + private ConcurrentDictionary _friendCodes = new(); + + public BanStore(ILogger logger) + : base(logger, legacyPath: "bans.json") + { + Load(); + } + + public bool IsIpBanned(IPAddress ip) => GetIpBan(ip) != null; + + public bool IsFriendCodeBanned(string? fc) => GetFriendCodeBan(fc) != null; + + public BanEntry? GetIpBan(IPAddress ip) + { + var key = Normalize(ip); + if (!_ips.TryGetValue(key, out var entry)) + { + return null; + } + + if (!entry.IsExpired) + { + return entry; + } + + _ips.TryRemove(key, out _); + SaveFireAndForget(); + return null; + } + + public BanEntry? GetFriendCodeBan(string? fc) + { + if (fc == null || !_friendCodes.TryGetValue(fc, out var entry)) + { + return null; + } + + if (!entry.IsExpired) + { + return entry; + } + + _friendCodes.TryRemove(fc, out _); + SaveFireAndForget(); + return null; + } + + public BanEntry BanIp(IPAddress ip, string reason, DateTime? expiresAt) + { + var key = Normalize(ip); + var entry = new BanEntry { Reason = reason, BannedAt = DateTime.UtcNow, BannedUntil = expiresAt }; + _ips[key] = entry; + SaveFireAndForget(); + return entry; + } + + public BanEntry BanFriendCode(string fc, string reason, DateTime? expiresAt) + { + var entry = new BanEntry { Reason = reason, BannedAt = DateTime.UtcNow, BannedUntil = expiresAt }; + _friendCodes[fc] = entry; + SaveFireAndForget(); + return entry; + } + + public bool UnbanIp(IPAddress ip) + { + var key = Normalize(ip); + var removed = _ips.TryRemove(key, out _); + if (removed) + { + SaveFireAndForget(); + } + + return removed; + } + + public bool UnbanFriendCode(string fc) + { + var removed = _friendCodes.TryRemove(fc, out _); + if (removed) + { + SaveFireAndForget(); + } + + return removed; + } + + public (int IpCount, int FriendCodeCount) Stats() + { + CleanExpired(); + return (_ips.Count, _friendCodes.Count); + } + + public List AllIpBans() + { + CleanExpired(); + return _ips.Values.ToList(); + } + + public List AllFriendCodeBans() + { + CleanExpired(); + return _friendCodes.Values.ToList(); + } + + private void CleanExpired() + { + foreach (var kv in _ips) + { + if (kv.Value.IsExpired) + { + _ips.TryRemove(kv.Key, out _); + } + } + + foreach (var kv in _friendCodes) + { + if (kv.Value.IsExpired) + { + _friendCodes.TryRemove(kv.Key, out _); + } + } + } + + private static string Normalize(IPAddress ip) + => ip.IsIPv4MappedToIPv6 ? ip.MapToIPv4().ToString() : ip.ToString(); + + public static DateTime? ParseDuration(string? duration) + { + if (string.IsNullOrWhiteSpace(duration)) + { + return null; + } + + var match = Regex.Match(duration.Trim(), @"^(\d+)([smhd])$", RegexOptions.IgnoreCase); + if (!match.Success) + { + return null; + } + + var value = int.Parse(match.Groups[1].Value); + var unit = match.Groups[2].Value.ToLowerInvariant()[0]; + var span = unit switch + { + 's' => TimeSpan.FromSeconds(value), + 'm' => TimeSpan.FromMinutes(value), + 'h' => TimeSpan.FromHours(value), + 'd' => TimeSpan.FromDays(value), + _ => TimeSpan.Zero, + }; + + return DateTime.UtcNow.Add(span); + } + + protected override BanData GetSnapshot() + { + CleanExpired(); + return new BanData + { + Ips = _ips.ToDictionary(kv => kv.Key, kv => kv.Value), + FriendCodes = _friendCodes.ToDictionary(kv => kv.Key, kv => kv.Value), + }; + } + + protected override void ApplySnapshot(BanData data) + { + _ips = new ConcurrentDictionary(data.Ips ?? new Dictionary()); + _friendCodes = new ConcurrentDictionary(data.FriendCodes ?? new Dictionary()); + } + + public sealed class BanData + { + public Dictionary Ips { get; set; } = new(); + + public Dictionary FriendCodes { get; set; } = new(); + } + + public sealed class BanEntry + { + public string Reason { get; set; } = string.Empty; + + public DateTime BannedAt { get; set; } + + public DateTime? BannedUntil { get; set; } + + [JsonIgnore] + public bool IsExpired => BannedUntil.HasValue && DateTime.UtcNow > BannedUntil.Value; + } + } +} diff --git a/src/Empostor.Server/Utils/IpGeolocationService.cs b/src/Empostor.Server/Service/Shared/IpGeolocationService.cs similarity index 52% rename from src/Empostor.Server/Utils/IpGeolocationService.cs rename to src/Empostor.Server/Service/Shared/IpGeolocationService.cs index 128e900..7353731 100644 --- a/src/Empostor.Server/Utils/IpGeolocationService.cs +++ b/src/Empostor.Server/Service/Shared/IpGeolocationService.cs @@ -7,7 +7,7 @@ using System.Text.Json; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -namespace Empostor.Server.Utils +namespace Empostor.Server.Service.Shared { public class IpGeolocationService { @@ -48,84 +48,48 @@ namespace Empostor.Server.Utils { var normalizedIp = ip.IsIPv4MappedToIPv6 ? ip.MapToIPv4() : ip; var url = string.Format(ApiUrl, normalizedIp); - using var client = _httpClientFactory.CreateClient("ipgeo"); - using var cts = new System.Threading.CancellationTokenSource(TimeSpan.FromSeconds(3)); - var json = await client.GetStringAsync(url, cts.Token); - - using var doc = JsonDocument.Parse(json); - var root = doc.RootElement; - - if (root.TryGetProperty("status", out var status) && status.GetString() == "success") + var response = await client.GetStringAsync(url); + using var doc = JsonDocument.Parse(response); + var status = doc.RootElement.GetProperty("status").GetString(); + if (status != "success") { - var country = root.TryGetProperty("country", out var c) ? c.GetString() ?? string.Empty : string.Empty; - var region = root.TryGetProperty("regionName", out var r) ? r.GetString() ?? string.Empty : string.Empty; - var city = root.TryGetProperty("city", out var ct) ? ct.GetString() ?? string.Empty : string.Empty; - - if (string.IsNullOrEmpty(country) && string.IsNullOrEmpty(city)) - { - return string.Empty; - } - - var parts = country != city - ? (region != city ? $"{country} {region} {city}" : $"{country} {city}") - : country; - - return parts.Trim(); + return string.Empty; } - return string.Empty; + var country = doc.RootElement.TryGetProperty("country", out var c) ? c.GetString() : string.Empty; + var region = doc.RootElement.TryGetProperty("regionName", out var r) ? r.GetString() : string.Empty; + var city = doc.RootElement.TryGetProperty("city", out var ci) ? ci.GetString() : string.Empty; + + return $"{country} {region} {city}".Trim(); } catch (Exception ex) { - _logger.LogDebug(ex, "IP geolocation lookup failed for {Ip}", ip); + _logger.LogDebug(ex, "IP geolocation query failed for {Ip}", ip); return string.Empty; } } private static bool IsPrivateIp(IPAddress ip) { - if (ip.IsIPv4MappedToIPv6) + if (IPAddress.IsLoopback(ip)) { - ip = ip.MapToIPv4(); + return true; } if (ip.AddressFamily != AddressFamily.InterNetwork) { - return true; // Don't query non-IPv4 for now + return true; } var bytes = ip.GetAddressBytes(); - if (bytes.Length != 4) + return bytes[0] switch { - return true; - } - - // 127.0.0.0/8 - if (bytes[0] == 127) - { - return true; - } - - // 10.0.0.0/8 - if (bytes[0] == 10) - { - return true; - } - - // 172.16.0.0/12 - if (bytes[0] == 172 && bytes[1] >= 16 && bytes[1] <= 31) - { - return true; - } - - // 192.168.0.0/16 - if (bytes[0] == 192 && bytes[1] == 168) - { - return true; - } - - return false; + 10 => true, + 172 => bytes[1] >= 16 && bytes[1] <= 31, + 192 => bytes[1] == 168, + _ => false, + }; } } } diff --git a/src/Empostor.Server/Service/Admin/Reactor/ReactorHandshakeListener.cs b/src/Empostor.Server/Service/Shared/ReactorHandshakeListener.cs similarity index 99% rename from src/Empostor.Server/Service/Admin/Reactor/ReactorHandshakeListener.cs rename to src/Empostor.Server/Service/Shared/ReactorHandshakeListener.cs index 3cda876..3ffeba5 100644 --- a/src/Empostor.Server/Service/Admin/Reactor/ReactorHandshakeListener.cs +++ b/src/Empostor.Server/Service/Shared/ReactorHandshakeListener.cs @@ -4,7 +4,7 @@ using Empostor.Api.Events; using Empostor.Api.Events.Client; using Microsoft.Extensions.Logging; -namespace Empostor.Server.Service.Admin.Reactor +namespace Empostor.Server.Service.Shared { // Based on Reactor.Empostor protocol: // https://github.com/NuclearPowered/Reactor.Empostor diff --git a/src/Empostor.Server/Service/Admin/Reactor/ReactorModExtensions.cs b/src/Empostor.Server/Service/Shared/ReactorModExtensions.cs similarity index 93% rename from src/Empostor.Server/Service/Admin/Reactor/ReactorModExtensions.cs rename to src/Empostor.Server/Service/Shared/ReactorModExtensions.cs index 4e9df1c..1505fb9 100644 --- a/src/Empostor.Server/Service/Admin/Reactor/ReactorModExtensions.cs +++ b/src/Empostor.Server/Service/Shared/ReactorModExtensions.cs @@ -1,7 +1,7 @@ using System.Runtime.CompilerServices; using Empostor.Api.Net; -namespace Empostor.Server.Service.Admin.Reactor +namespace Empostor.Server.Service.Shared { public static class ReactorModExtensions diff --git a/src/Empostor.Server/Service/Admin/Report/ReportStore.cs b/src/Empostor.Server/Service/Shared/ReportStore.cs similarity index 97% rename from src/Empostor.Server/Service/Admin/Report/ReportStore.cs rename to src/Empostor.Server/Service/Shared/ReportStore.cs index 3b4be26..7380cc7 100644 --- a/src/Empostor.Server/Service/Admin/Report/ReportStore.cs +++ b/src/Empostor.Server/Service/Shared/ReportStore.cs @@ -4,7 +4,7 @@ using System.Linq; using Empostor.Api.Service; using Microsoft.Extensions.Logging; -namespace Empostor.Server.Service.Admin.Report +namespace Empostor.Server.Service.Shared { public sealed class ReportStore : JsonDataStore> { diff --git a/src/Empostor.sln b/src/Empostor.sln index 51b3ef5..bc81fec 100644 --- a/src/Empostor.sln +++ b/src/Empostor.sln @@ -47,6 +47,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.ChatFilter EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.PlayerStats", "Empostor.Plugins.PlayerStats\Empostor.Plugins.PlayerStats.csproj", "{2C33B35B-3A9F-4EBA-A7FA-5264E083BBB2}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.PlayerLog", "Empostor.Plugins.PlayerLog\Empostor.Plugins.PlayerLog.csproj", "{135D8F7F-C330-444E-94D4-D2D3944F688A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.Monitor", "Empostor.Plugins.Monitor\Empostor.Plugins.Monitor.csproj", "{B50665B5-AEDB-4F56-B54A-542863EDB009}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.Privacy", "Empostor.Plugins.Privacy\Empostor.Plugins.Privacy.csproj", "{959879FE-2FE0-4FD8-A706-0FA1B3138F45}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -297,6 +303,42 @@ Global {2C33B35B-3A9F-4EBA-A7FA-5264E083BBB2}.Release|x64.Build.0 = Release|Any CPU {2C33B35B-3A9F-4EBA-A7FA-5264E083BBB2}.Release|x86.ActiveCfg = Release|Any CPU {2C33B35B-3A9F-4EBA-A7FA-5264E083BBB2}.Release|x86.Build.0 = Release|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Debug|x64.ActiveCfg = Debug|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Debug|x64.Build.0 = Debug|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Debug|x86.ActiveCfg = Debug|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Debug|x86.Build.0 = Debug|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Release|Any CPU.Build.0 = Release|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Release|x64.ActiveCfg = Release|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Release|x64.Build.0 = Release|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Release|x86.ActiveCfg = Release|Any CPU + {135D8F7F-C330-444E-94D4-D2D3944F688A}.Release|x86.Build.0 = Release|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Debug|x64.ActiveCfg = Debug|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Debug|x64.Build.0 = Debug|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Debug|x86.ActiveCfg = Debug|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Debug|x86.Build.0 = Debug|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Release|Any CPU.Build.0 = Release|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Release|x64.ActiveCfg = Release|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Release|x64.Build.0 = Release|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Release|x86.ActiveCfg = Release|Any CPU + {B50665B5-AEDB-4F56-B54A-542863EDB009}.Release|x86.Build.0 = Release|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Debug|Any CPU.Build.0 = Debug|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Debug|x64.ActiveCfg = Debug|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Debug|x64.Build.0 = Debug|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Debug|x86.ActiveCfg = Debug|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Debug|x86.Build.0 = Debug|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Release|Any CPU.ActiveCfg = Release|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Release|Any CPU.Build.0 = Release|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Release|x64.ActiveCfg = Release|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Release|x64.Build.0 = Release|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Release|x86.ActiveCfg = Release|Any CPU + {959879FE-2FE0-4FD8-A706-0FA1B3138F45}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -319,6 +361,9 @@ Global {70582074-88B9-419C-85ED-46536AE2D6AA} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {AF4C4FF8-47C8-4E89-9DD4-3BD1781E18CD} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {2C33B35B-3A9F-4EBA-A7FA-5264E083BBB2} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} + {135D8F7F-C330-444E-94D4-D2D3944F688A} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} + {B50665B5-AEDB-4F56-B54A-542863EDB009} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} + {959879FE-2FE0-4FD8-A706-0FA1B3138F45} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DAF5625C-7E46-4DCC-AF2C-11D20D965454}