KJZH001/nezha-2024
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix code scanning alert no. 23: Uncontrolled data used in path expression (#486)"

Browse Source 
This reverts commit c2b3d19a5101d4a849ae2425a1cf5564a8b0ab94.
This commit is contained in:
naiba 2024-11-28 20:38:02 +08:00
parent c2b3d19a51
commit ab4d896efc
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/dashboard/controller/controller.go
View File

@ -213,33 +213,20 @@ func fallbackToFrontend(c *gin.Context) {
c.JSON(http.StatusOK, newErrorResponse(errors.New("404 Not Found"))) c.JSON(http.StatusOK, newErrorResponse(errors.New("404 Not Found")))
return return
} }
const safeDirAdmin = "./admin-dist"
const safeDirUser = "user-dist"
if strings.HasPrefix(c.Request.URL.Path, "/dashboard") { if strings.HasPrefix(c.Request.URL.Path, "/dashboard") {
stripPath := strings.TrimPrefix(c.Request.URL.Path, "/dashboard") stripPath := strings.TrimPrefix(c.Request.URL.Path, "/dashboard")
localFilePath := filepath.Join(safeDirAdmin, stripPath) localFilePath := filepath.Join("./admin-dist", stripPath)
absPath, err := filepath.Abs(localFilePath) if _, err := os.Stat(localFilePath); err == nil {
if err != nil || !strings.HasPrefix(absPath, safeDirAdmin) { c.File(localFilePath)
c.JSON(http.StatusBadRequest, newErrorResponse(errors.New("Invalid file path")))
return return
} }
if _, err := os.Stat(absPath); err == nil { c.File("admin-dist/index.html")
c.File(absPath)
return
}
c.File(filepath.Join(safeDirAdmin, "index.html"))
return return
} }
localFilePath := filepath.Join(safeDirUser, c.Request.URL.Path) localFilePath := filepath.Join("user-dist", c.Request.URL.Path)
absPath, err := filepath.Abs(localFilePath) if _, err := os.Stat(localFilePath); err == nil {
if err != nil || !strings.HasPrefix(absPath, safeDirUser) { c.File(localFilePath)
c.JSON(http.StatusBadRequest, newErrorResponse(errors.New("Invalid file path")))
return return
} }
if _, err := os.Stat(absPath); err == nil { c.File("user-dist/index.html")
c.File(absPath)
return
}
c.File(filepath.Join(safeDirUser, "index.html"))
} }