日志中错误信息内含敏感信息修复

ywmoyue · Jul 3, 2024 · aa5e7d2 · aa5e7d2
1 parent 420570f
commit aa5e7d2
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/BiliLite.UWP/Services/LogService.cs b/src/BiliLite.UWP/Services/LogService.cs
@@ -46,7 +46,12 @@ public static void Init()
                 Name = "logfile",
                 CreateDirs = true,
                 FileName = storageFolder.Path + @"\log\" + DateTime.Now.ToString("yyyyMMdd") + ".log",
-                Layout = "${longdate}|${level:uppercase=true}|${threadid}|${event-properties:item=type}.${event-properties:item=method}|${message}|${exception:format=Message,StackTrace}"
+                Layout = "${longdate}" +
+                         "|${level:uppercase=true}" +
+                         "|${threadid}" +
+                         "|${event-properties:item=type}.${event-properties:item=method}" +
+                         "|${message}" +
+                         "|${event-properties:item=exception}"
             };
             config.AddRule(LogLevel.Trace, LogLevel.Trace, logfile);
             config.AddRule(LogLevel.Debug, LogLevel.Debug, logfile);
@@ -94,6 +99,12 @@ public static void Log(string message, LogType type, Exception ex = null, [Calle
             if ((int)type < LogLowestLevel) return;
             if (IsProtectLogInfo)
                 message = message.ProtectValues("access_key", "csrf", "access_token", "sign");
+            var exception = "";
+            if (ex != null && IsProtectLogInfo)
+            {
+                exception = ex.Message.ProtectValues("access_key", "csrf", "access_token", "sign") + "\n"
+                    + ex.StackTrace.ProtectValues("access_key", "csrf", "access_token", "sign");
+            }
 
             var logEvent = new LogEventInfo(LogLevel.Info, null, message);
             switch (type)
@@ -109,15 +120,15 @@ public static void Log(string message, LogType type, Exception ex = null, [Calle
                     break;
                 case LogType.Warn:
                     logEvent.Level = LogLevel.Warn;
-                    logEvent.Exception = ex;
+                    logEvent.Properties["exception"] = exception;
                     break;
                 case LogType.Error:
                     logEvent.Level = LogLevel.Error;
-                    logEvent.Exception = ex;
+                    logEvent.Properties["exception"] = exception;
                     break;
                 case LogType.Fatal:
                     logEvent.Level = LogLevel.Fatal;
-                    logEvent.Exception = ex;
+                    logEvent.Properties["exception"] = exception;
                     break;
                 case LogType.Necessary:
                     logEvent.Level = LogLevel.Info;