From ab4d896efcaa4d4331e97fabd6c9bfaf53e0e5b5 Mon Sep 17 00:00:00 2001 From: naiba Date: Thu, 28 Nov 2024 20:38:02 +0800 Subject: [PATCH] Revert "Fix code scanning alert no. 23: Uncontrolled data used in path expression (#486)" This reverts commit c2b3d19a5101d4a849ae2425a1cf5564a8b0ab94. --- cmd/dashboard/controller/controller.go | 29 +++++++------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/cmd/dashboard/controller/controller.go b/cmd/dashboard/controller/controller.go index 9421b91..48f555f 100644 --- a/cmd/dashboard/controller/controller.go +++ b/cmd/dashboard/controller/controller.go @@ -213,33 +213,20 @@ func fallbackToFrontend(c *gin.Context) { c.JSON(http.StatusOK, newErrorResponse(errors.New("404 Not Found"))) return } - const safeDirAdmin = "./admin-dist" - const safeDirUser = "user-dist" - if strings.HasPrefix(c.Request.URL.Path, "/dashboard") { stripPath := strings.TrimPrefix(c.Request.URL.Path, "/dashboard") - localFilePath := filepath.Join(safeDirAdmin, stripPath) - absPath, err := filepath.Abs(localFilePath) - if err != nil || !strings.HasPrefix(absPath, safeDirAdmin) { - c.JSON(http.StatusBadRequest, newErrorResponse(errors.New("Invalid file path"))) + localFilePath := filepath.Join("./admin-dist", stripPath) + if _, err := os.Stat(localFilePath); err == nil { + c.File(localFilePath) return } - if _, err := os.Stat(absPath); err == nil { - c.File(absPath) - return - } - c.File(filepath.Join(safeDirAdmin, "index.html")) + c.File("admin-dist/index.html") return } - localFilePath := filepath.Join(safeDirUser, c.Request.URL.Path) - absPath, err := filepath.Abs(localFilePath) - if err != nil || !strings.HasPrefix(absPath, safeDirUser) { - c.JSON(http.StatusBadRequest, newErrorResponse(errors.New("Invalid file path"))) + localFilePath := filepath.Join("user-dist", c.Request.URL.Path) + if _, err := os.Stat(localFilePath); err == nil { + c.File(localFilePath) return } - if _, err := os.Stat(absPath); err == nil { - c.File(absPath) - return - } - c.File(filepath.Join(safeDirUser, "index.html")) + c.File("user-dist/index.html") }