fix: use LogContext.PushProperty

GZTimeWalker · GZTimeWalker · commit b640ef5660e1 · 2024-02-04T13:23:17.000+08:00
diff --git a/src/GZCTF/Middlewares/PrivilegeAuthentication.cs b/src/GZCTF/Middlewares/PrivilegeAuthentication.cs
@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Localization;
+using Serilog;
 
 namespace GZCTF.Middlewares;
 
@@ -20,6 +21,8 @@ public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
         var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<RequirePrivilegeAttribute>>();
         var dbContext = context.HttpContext.RequestServices.GetRequiredService<AppDbContext>();
         var localizer = context.HttpContext.RequestServices.GetRequiredService<IStringLocalizer<Program>>();
+        var diagnosticContext = context.HttpContext.RequestServices.GetRequiredService<IDiagnosticContext>();
+
         var id = context.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
 
         UserInfo? user = null;
@@ -35,6 +38,10 @@ public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
             return;
         }
 
+        diagnosticContext.Set("UserId", user.Id);
+        diagnosticContext.Set("UserName", user.UserName);
+        diagnosticContext.Set("IP", context.HttpContext.Connection.RemoteIpAddress);
+
         if (DateTimeOffset.UtcNow - user.LastVisitedUtc > TimeSpan.FromSeconds(5))
         {
             user.UpdateByHttpContext(context.HttpContext);
diff --git a/src/GZCTF/Utils/LogHelper.cs b/src/GZCTF/Utils/LogHelper.cs
@@ -2,6 +2,7 @@
 using System.Net;
 using GZCTF.Extensions;
 using Serilog;
+using Serilog.Context;
 using Serilog.Events;
 using Serilog.Filters;
 using Serilog.Sinks.File.Archive;
@@ -16,7 +17,7 @@ public static class LogHelper
     const string LogTemplate = "[{@t:yy-MM-dd HH:mm:ss.fff} {@l:u3}] " +
                                "{Substring(SourceContext, LastIndexOf(SourceContext, '.') + 1)}: " +
                                "{@m} {#if Length(Status) > 0}#{Status} <{UserName}>" +
-                               "{#if Length(IP) > 0}@{IP}{#end}{#end}\n{@x}";
+                               "{#if Length(IP) > 0} @ {IP}{#end}{#end}\n{@x}";
 
     const string InitLogTemplate = "[{@t:yy-MM-dd HH:mm:ss.fff} {@l:u3}] {@m}\n{@x}";
 
@@ -83,7 +84,9 @@ public static void Log<T>(this ILogger<T> logger, string msg, string ip, TaskSta
     public static void Log<T>(this ILogger<T> logger, string msg, string uname, string ip, TaskStatus status,
         LogLevel? level = null)
     {
-        using (logger.BeginScope("{UserName}{Status}{IP}", uname, status, ip))
+        using (LogContext.PushProperty("UserName", uname))
+        using (LogContext.PushProperty("IP", ip))
+        using (LogContext.PushProperty("Status", status.ToString()))
         {
             logger.Log(level ?? LogLevel.Information, "{msg:l}", msg);
         }
@@ -93,15 +96,15 @@ public static void UseRequestLogging(this WebApplication app) =>
         app.UseSerilogRequestLogging(options =>
         {
             options.MessageTemplate =
-                "[{StatusCode}] {Elapsed,8:####0.00}ms HTTP {RequestMethod,-6} {RequestPath} @ {RemoteIP}";
+                "[{StatusCode}] {Elapsed,8:####0.00}ms HTTP {RequestMethod,-6} {RequestPath} @ {IP}";
             options.GetLevel = (context, time, ex) =>
                 context.Response.StatusCode == 204 ? LogEventLevel.Verbose :
                 time > 10000 && context.Response.StatusCode != 101 ? LogEventLevel.Warning :
                 context.Response.StatusCode > 499 || ex is not null ? LogEventLevel.Error : LogEventLevel.Debug;
 
             options.EnrichDiagnosticContext = (diagnosticContext, httpContext) =>
             {
-                diagnosticContext.Set("RemoteIP", httpContext.Connection.RemoteIpAddress);
+                diagnosticContext.Set("IP", httpContext.Connection.RemoteIpAddress);
             };
         });
 
