merge(feat): database sink

GZTimeWalker · Dec 31, 2023 · 22cf843 · 22cf843
2 parents da794cc + 23f1d38
commit 22cf843
Show file tree

Hide file tree

Showing 24 changed files with 151 additions and 95 deletions.
diff --git a/README.md b/README.md
@@ -99,6 +99,7 @@ GZ::CTF 是一个基于 ASP.NET Core 的开源 CTF 平台。
 - **湖南衡阳师范学院玄天网安实验室招新赛 HYNUCTF 2023**
 - **南阳师范学院招新赛 NYNUCTF S4**
 - **商丘师范学院首届网络安全新生挑战赛**
+- **苏州市职业大学 2023 年冬季新生赛 [SVUCTF-WINTER-2023](https://github.com/SVUCTF/SVUCTF-WINTER-2023)**
 
 _排名不分先后，欢迎提交 PR 进行补充。_
 

diff --git a/docs/pages/thanks.zh.mdx b/docs/pages/thanks.zh.mdx
@@ -23,6 +23,7 @@
 - **湖南衡阳师范学院玄天网安实验室招新赛 HYNUCTF 2023** (题目数量: 88, 参赛人数: 90+, 时长: 三周)
 - **南阳师范学院招新赛 NYNUCTF S4** (题目数量: 50, 参赛人数: 121, 时长: 9天)
 - **商丘师范学院首届网络安全新生赛 SQNU-TYCTF** (题目数量: 55, 参赛人数: 200+, 时长: 48小时)
+- **苏州市职业大学 2023 年冬季新生赛 SVUCTF-WINTER-2023** (题目数量: 20, 参数人数: 16, 时长: 一周)
 
 _排名不分先后，欢迎提交 PR 进行补充。_
 

diff --git a/src/GZCTF/Controllers/GameController.cs b/src/GZCTF/Controllers/GameController.cs
@@ -916,7 +916,8 @@ public async Task<IActionResult> CreateContainer([FromRoute] int id, [FromRoute]
 
         if (DateTimeOffset.UtcNow - instance.LastContainerOperation < TimeSpan.FromSeconds(10))
             return new JsonResult(new RequestResponse(localizer[nameof(Resources.Program.Game_OperationTooFrequent)],
-                StatusCodes.Status429TooManyRequests)) { StatusCode = StatusCodes.Status429TooManyRequests };
+                StatusCodes.Status429TooManyRequests))
+            { StatusCode = StatusCodes.Status429TooManyRequests };
 
         if (instance.Container is not null)
         {
@@ -929,15 +930,15 @@ public async Task<IActionResult> CreateContainer([FromRoute] int id, [FromRoute]
 
         return await gameInstanceRepository.CreateContainer(instance, context.Participation!.Team, context.User!,
                 context.Game!.ContainerCountLimit, token) switch
-            {
-                null or (TaskStatus.Failed, null) => BadRequest(
-                    new RequestResponse(localizer[nameof(Resources.Program.Game_ContainerCreationFailed)])),
-                (TaskStatus.Denied, null) => BadRequest(
-                    new RequestResponse(localizer[nameof(Resources.Program.Game_ContainerNumberLimitExceeded),
-                        context.Game.ContainerCountLimit])),
-                (TaskStatus.Success, var x) => Ok(ContainerInfoModel.FromContainer(x!)),
-                _ => throw new UnreachableException()
-            };
+        {
+            null or (TaskStatus.Failed, null) => BadRequest(
+                new RequestResponse(localizer[nameof(Resources.Program.Game_ContainerCreationFailed)])),
+            (TaskStatus.Denied, null) => BadRequest(
+                new RequestResponse(localizer[nameof(Resources.Program.Game_ContainerNumberLimitExceeded),
+                    context.Game.ContainerCountLimit])),
+            (TaskStatus.Success, var x) => Ok(ContainerInfoModel.FromContainer(x!)),
+            _ => throw new UnreachableException()
+        };
     }
 
     /// <summary>
@@ -1030,7 +1031,8 @@ public async Task<IActionResult> DeleteContainer([FromRoute] int id, [FromRoute]
 
         if (DateTimeOffset.UtcNow - instance.LastContainerOperation < TimeSpan.FromSeconds(10))
             return new JsonResult(new RequestResponse(localizer[nameof(Resources.Program.Game_OperationTooFrequent)],
-                StatusCodes.Status429TooManyRequests)) { StatusCode = StatusCodes.Status429TooManyRequests };
+                StatusCodes.Status429TooManyRequests))
+            { StatusCode = StatusCodes.Status429TooManyRequests };
 
         var destroyId = instance.Container.ContainerId;
 
@@ -1064,7 +1066,8 @@ async Task<ContextInfo> GetContextInfo(int id, int challengeId = 0, bool withFla
     {
         ContextInfo res = new()
         {
-            User = await userManager.GetUserAsync(User), Game = await gameRepository.GetGameById(id, token)
+            User = await userManager.GetUserAsync(User),
+            Game = await gameRepository.GetGameById(id, token)
         };
 
         if (res.Game is null)

diff --git a/src/GZCTF/Controllers/ProxyController.cs b/src/GZCTF/Controllers/ProxyController.cs
@@ -173,7 +173,8 @@ async Task<IActionResult> DoContainerProxy(Guid id, IPEndPoint client, IPEndPoin
                 TaskStatus.Failed, LogLevel.Debug);
             return new JsonResult(new RequestResponse(
                 localizer[nameof(Resources.Program.Proxy_ContainerConnectionFailed), e.SocketErrorCode],
-                StatusCodes.Status418ImATeapot)) { StatusCode = StatusCodes.Status418ImATeapot };
+                StatusCodes.Status418ImATeapot))
+            { StatusCode = StatusCodes.Status418ImATeapot };
         }
 
         using WebSocket ws = await HttpContext.WebSockets.AcceptWebSocketAsync();

diff --git a/src/GZCTF/Controllers/TeamController.cs b/src/GZCTF/Controllers/TeamController.cs
@@ -143,7 +143,8 @@ public async Task<IActionResult> UpdateTeam([FromRoute] int id, [FromBody] TeamU
 
         if (team.CaptainId != user!.Id)
             return new JsonResult(new RequestResponse(localizer[nameof(Resources.Program.Auth_AccessForbidden)],
-                StatusCodes.Status403Forbidden)) { StatusCode = StatusCodes.Status403Forbidden };
+                StatusCodes.Status403Forbidden))
+            { StatusCode = StatusCodes.Status403Forbidden };
 
         team.UpdateInfo(model);
 
@@ -182,7 +183,8 @@ public async Task<IActionResult> Transfer([FromRoute] int id, [FromBody] TeamTra
 
         if (team.CaptainId != user!.Id)
             return new JsonResult(new RequestResponse(localizer[nameof(Resources.Program.Auth_AccessForbidden)],
-                StatusCodes.Status403Forbidden)) { StatusCode = StatusCodes.Status403Forbidden };
+                StatusCodes.Status403Forbidden))
+            { StatusCode = StatusCodes.Status403Forbidden };
 
         if (team.Locked && await teamRepository.AnyActiveGame(team, token))
             return BadRequest(new RequestResponse(localizer[nameof(Resources.Program.Team_Locked)]));
@@ -230,7 +232,8 @@ public async Task<IActionResult> InviteCode([FromRoute] int id, CancellationToke
 
         if (team.CaptainId != user!.Id)
             return new JsonResult(new RequestResponse(localizer[nameof(Resources.Program.Auth_AccessForbidden)],
-                StatusCodes.Status403Forbidden)) { StatusCode = StatusCodes.Status403Forbidden };
+                StatusCodes.Status403Forbidden))
+            { StatusCode = StatusCodes.Status403Forbidden };
 
         return Ok(team.InviteCode);
     }
@@ -263,7 +266,8 @@ public async Task<IActionResult> UpdateInviteToken([FromRoute] int id, Cancellat
 
         if (team.CaptainId != user!.Id)
             return new JsonResult(new RequestResponse(localizer[nameof(Resources.Program.Auth_AccessForbidden)],
-                StatusCodes.Status403Forbidden)) { StatusCode = StatusCodes.Status403Forbidden };
+                StatusCodes.Status403Forbidden))
+            { StatusCode = StatusCodes.Status403Forbidden };
 
         team.UpdateInviteToken();
 
@@ -301,7 +305,8 @@ public async Task<IActionResult> KickUser([FromRoute] int id, [FromRoute] Guid u
 
         if (team.CaptainId != user!.Id)
             return new JsonResult(new RequestResponse(localizer[nameof(Resources.Program.Auth_AccessForbidden)],
-                StatusCodes.Status403Forbidden)) { StatusCode = StatusCodes.Status403Forbidden };
+                StatusCodes.Status403Forbidden))
+            { StatusCode = StatusCodes.Status403Forbidden };
 
         IDbContextTransaction trans = await teamRepository.BeginTransactionAsync(token);
 
@@ -487,7 +492,8 @@ public async Task<IActionResult> Avatar([FromRoute] int id, IFormFile file, Canc
 
         if (team.CaptainId != user!.Id)
             return new JsonResult(new RequestResponse(localizer[nameof(Resources.Program.Auth_AccessForbidden)],
-                StatusCodes.Status403Forbidden)) { StatusCode = StatusCodes.Status403Forbidden };
+                StatusCodes.Status403Forbidden))
+            { StatusCode = StatusCodes.Status403Forbidden };
 
         if (file.Length == 0)
             return BadRequest(new RequestResponse(localizer[nameof(Resources.Program.File_SizeZero)]));
@@ -539,7 +545,8 @@ public async Task<IActionResult> DeleteTeam(int id, CancellationToken token)
 
         if (team.CaptainId != user!.Id)
             return new JsonResult(new RequestResponse(localizer[nameof(Resources.Program.Auth_AccessForbidden)],
-                StatusCodes.Status403Forbidden)) { StatusCode = StatusCodes.Status403Forbidden };
+                StatusCodes.Status403Forbidden))
+            { StatusCode = StatusCodes.Status403Forbidden };
 
         if (team.Locked && await teamRepository.AnyActiveGame(team, token))
             return BadRequest(new RequestResponse(localizer[nameof(Resources.Program.Team_Locked)]));

diff --git a/src/GZCTF/Extensions/CaptchaExtension.cs b/src/GZCTF/Extensions/CaptchaExtension.cs
@@ -84,7 +84,9 @@ public override async Task<bool> VerifyAsync(ModelWithCaptcha model, HttpContext
 
         TurnstileRequestModel req = new()
         {
-            Secret = Config.SecretKey, Response = model.Challenge, RemoteIp = ip.ToString()
+            Secret = Config.SecretKey,
+            Response = model.Challenge,
+            RemoteIp = ip.ToString()
         };
 
         const string api = "https://challenges.cloudflare.com/turnstile/v0/siteverify";

diff --git a/src/GZCTF/Extensions/DatabaseSinkExtension.cs b/src/GZCTF/Extensions/DatabaseSinkExtension.cs
@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using Serilog;
 using Serilog.Configuration;
 using Serilog.Core;
@@ -12,15 +13,32 @@ public static LoggerConfiguration Database(this LoggerSinkConfiguration loggerCo
         loggerConfiguration.Sink(new DatabaseSink(serviceProvider));
 }
 
-public class DatabaseSink(IServiceProvider serviceProvider) : ILogEventSink
+public class DatabaseSink : ILogEventSink, IDisposable
 {
-    static DateTimeOffset LastFlushTime = DateTimeOffset.FromUnixTimeSeconds(0);
-    static readonly List<LogModel> LockedLogBuffer = new();
-    static readonly List<LogModel> LogBuffer = new();
+    readonly IServiceProvider _serviceProvider;
+
+    DateTimeOffset _lastFlushTime = DateTimeOffset.FromUnixTimeSeconds(0);
+    readonly CancellationTokenSource _tokenSource = new();
+    readonly ConcurrentQueue<LogModel> _logBuffer = [];
+
+    public DatabaseSink(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+        Task.Factory.StartNew(
+            () => WriteToDatabase(_tokenSource.Token),
+            _tokenSource.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+    }
+
+    public void Dispose()
+    {
+        _tokenSource.Cancel();
+        GC.SuppressFinalize(this);
+    }
 
     public void Emit(LogEvent logEvent)
     {
-        if (logEvent.Level < LogEventLevel.Information) return;
+        if (logEvent.Level < LogEventLevel.Information)
+            return;
 
         LogModel logModel = new()
         {
@@ -34,28 +52,41 @@ public void Emit(LogEvent logEvent)
             Exception = logEvent.Exception?.ToString()
         };
 
-        lock (LogBuffer)
-        {
-            LogBuffer.Add(logModel);
+        _logBuffer.Enqueue(logModel);
+    }
 
-            var needFlush = DateTimeOffset.Now - LastFlushTime > TimeSpan.FromSeconds(10);
-            if (!needFlush && LogBuffer.Count < 100) return;
+    async Task WriteToDatabase(CancellationToken token = default)
+    {
+        List<LogModel> lockedLogBuffer = [];
 
-            LockedLogBuffer.AddRange(LogBuffer);
-            LogBuffer.Clear();
+        try
+        {
+            while (!token.IsCancellationRequested)
+            {
+                while (_logBuffer.TryDequeue(out LogModel? logModel))
+                    lockedLogBuffer.Add(logModel);
 
-            Task.Run(Flush);
-        }
-    }
+                if (lockedLogBuffer.Count > 50 || DateTimeOffset.Now - _lastFlushTime > TimeSpan.FromSeconds(10))
+                {
+                    await using AsyncServiceScope scope = _serviceProvider.CreateAsyncScope();
 
-    async Task Flush()
-    {
-        using var scope = serviceProvider.CreateScope();
-        var dbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-        await dbContext.Logs.AddRangeAsync(LockedLogBuffer);
-        await dbContext.SaveChangesAsync();
+                    var dbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+                    await dbContext.Logs.AddRangeAsync(lockedLogBuffer, token);
 
-        LockedLogBuffer.Clear();
-        LastFlushTime = DateTimeOffset.Now;
+                    try
+                    {
+                        await dbContext.SaveChangesAsync(token);
+                    }
+                    finally
+                    {
+                        lockedLogBuffer.Clear();
+                        _lastFlushTime = DateTimeOffset.Now;
+                    }
+                }
+
+                await Task.Delay(TimeSpan.FromSeconds(1), token);
+            }
+        }
+        catch (TaskCanceledException) { }
     }
 }
diff --git a/src/GZCTF/Extensions/SignalRSinkExtension.cs b/src/GZCTF/Extensions/SignalRSinkExtension.cs
@@ -22,7 +22,8 @@ public class SignalRSink(IServiceProvider serviceProvider) : ILogEventSink
 
     public void Emit(LogEvent logEvent)
     {
-        if (logEvent.Level < LogEventLevel.Information) return;
+        if (logEvent.Level < LogEventLevel.Information)
+            return;
 
         _hubContext ??= serviceProvider.GetRequiredService<IHubContext<AdminHub, IAdminClient>>();
 

diff --git a/src/GZCTF/GZCTF.csproj b/src/GZCTF/GZCTF.csproj
@@ -55,7 +55,6 @@
         <PackageReference Include="Serilog.Sinks.Async" />
         <PackageReference Include="Serilog.Sinks.File" />
         <PackageReference Include="Serilog.Sinks.File.Archive" />
-        <PackageReference Include="Serilog.Sinks.PostgreSQL" />
         <PackageReference Include="MailKit" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
         <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" />

diff --git a/...ons/20231224074254_Initialize.Designer.cs → ...ons/20231231202138_Initialize.Designer.cs b/...ons/20231224074254_Initialize.Designer.cs → ...ons/20231231202138_Initialize.Designer.cs
diff --git a/...F/Migrations/20231224074254_Initialize.cs → ...F/Migrations/20231231202138_Initialize.cs b/...F/Migrations/20231224074254_Initialize.cs → ...F/Migrations/20231231202138_Initialize.cs
@@ -166,7 +166,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     TimeUtc = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
                     Level = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
                     Logger = table.Column<string>(type: "character varying(250)", maxLength: 250, nullable: false),
-                    RemoteIP = table.Column<string>(type: "character varying(25)", maxLength: 25, nullable: true),
+                    RemoteIP = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: true),
                     UserName = table.Column<string>(type: "character varying(25)", maxLength: 25, nullable: true),
                     Message = table.Column<string>(type: "text", nullable: false),
                     Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: true),

diff --git a/src/GZCTF/Migrations/AppDbContextModelSnapshot.cs b/src/GZCTF/Migrations/AppDbContextModelSnapshot.cs
@@ -650,8 +650,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("text");
 
                     b.Property<string>("RemoteIP")
-                        .HasMaxLength(25)
-                        .HasColumnType("character varying(25)");
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)");
 
                     b.Property<string>("Status")
                         .HasMaxLength(20)

diff --git a/src/GZCTF/Models/Data/LogModel.cs b/src/GZCTF/Models/Data/LogModel.cs
@@ -18,7 +18,7 @@ public class LogModel
     [MaxLength(250)]
     public string Logger { get; set; } = string.Empty;
 
-    [MaxLength(25)]
+    [MaxLength(40)]
     public string? RemoteIP { get; set; }
 
     [MaxLength(25)]

diff --git a/src/GZCTF/Program.cs b/src/GZCTF/Program.cs
@@ -369,7 +369,7 @@ ___           ___           ___                       ___
                    \  \:\/:/       |  |::/     \  \:\/:/        \  \:\   \  \:\
                     \  \::/        |  |:/       \  \::/          \__\/    \  \:\
                      \__\/         |__|/         \__\/                     \__\/
-                """;
+                """ + "\n";
             Console.WriteLine(banner);
 
             var versionStr = "";
@@ -396,15 +396,17 @@ public static IActionResult InvalidModelStateHandler(ActionContext context)
                 return new JsonResult(
                     new RequestResponse(errors is [_, ..]
                         ? errors
-                        : StaticLocalizer[nameof(Resources.Program.Model_ValidationFailed)])) { StatusCode = 400 };
+                        : StaticLocalizer[nameof(Resources.Program.Model_ValidationFailed)]))
+                { StatusCode = 400 };
 
             errors = (from val in context.ModelState.Values
-                where val.Errors.Count > 0
-                select val.Errors.FirstOrDefault()?.ErrorMessage).FirstOrDefault();
+                      where val.Errors.Count > 0
+                      select val.Errors.FirstOrDefault()?.ErrorMessage).FirstOrDefault();
 
             return new JsonResult(new RequestResponse(errors is [_, ..]
                 ? errors
-                : StaticLocalizer[nameof(Resources.Program.Model_ValidationFailed)])) { StatusCode = 400 };
+                : StaticLocalizer[nameof(Resources.Program.Model_ValidationFailed)]))
+            { StatusCode = 400 };
         }
     }
-}
+}