From 2d7effadf9dc41444d0bc815d0b82112903b15ac Mon Sep 17 00:00:00 2001 From: "2248356998 qq.com" <2248356998@qq.com> Date: Thu, 21 Aug 2025 21:13:18 +0800 Subject: [PATCH] 10.11.4 --- .../Controller/FileController.cs | 3 +-- src/Directory.Build.props | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Admin/ThingsGateway.Admin.Application/Controller/FileController.cs b/src/Admin/ThingsGateway.Admin.Application/Controller/FileController.cs index 8c6ba1b30..c025dff4d 100644 --- a/src/Admin/ThingsGateway.Admin.Application/Controller/FileController.cs +++ b/src/Admin/ThingsGateway.Admin.Application/Controller/FileController.cs @@ -37,9 +37,8 @@ public class FileController : ControllerBase var root = Directory.GetCurrentDirectory(); var wwwroot = Path.Combine(root, "wwwroot"); var filePath = Path.Combine(wwwroot, fileName); - // 防止路径穿越攻击 #pragma warning disable CA3003 - if ((!fileName.StartsWith(@"..\Logs\") && filePath.Contains("..")) || !System.IO.File.Exists(filePath)) + if ((!(fileName.StartsWith(@"../Logs") || fileName.StartsWith(@"..\Logs")) && filePath.Contains("..")) || !System.IO.File.Exists(filePath)) { return NotFound(); } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 1a5bf9ab5..2202c0e59 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,9 +1,9 @@ - 10.11.2 - 10.11.2 - 10.11.2 + 10.11.4 + 10.11.4 + 10.11.4 10.11.2 10.11.2 8.0.19