wood/webp_server_go
1
0
Fork 0
mirror of https://github.com/woodchen-ink/webp_server_go.git synced 2025-07-19 14:12:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(router): enhance file processing and redirection logic

Browse Source
This commit is contained in:
wood chen 2024-10-23 05:38:11 +08:00
parent 317ff650e3
commit 603efd67e5
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
handler/router.go
View File

@ -79,12 +79,20 @@ func Convert(c *fiber.Ctx) error {
// 使用 sync.Once 确保并发安全 // 使用 sync.Once 确保并发安全
var once sync.Once var once sync.Once
var processErr error var processErr error
var fileStatus struct {
isAllowed bool
isLocal bool
path string
needRedirect bool
}
processImage := func() { processImage := func() {
once.Do(func() { once.Do(func() {
// 文件不在 EXHAUST_PATH 中，需要处理 // 文件不在 EXHAUST_PATH 中，需要处理
isLocalPath := strings.HasPrefix(matchedTarget, "./") || strings.HasPrefix(matchedTarget, "/") isLocalPath := strings.HasPrefix(matchedTarget, "./") || strings.HasPrefix(matchedTarget, "/")
var rawImageAbs string var rawImageAbs string
var isNewDownload bool var isNewDownload bool
var realRemoteAddr string
if isLocalPath { if isLocalPath {
// 处理本地路径 // 处理本地路径
@ -114,7 +122,7 @@ func Convert(c *fiber.Ctx) error {
reqURIwithQuery = strings.TrimPrefix(reqURIwithQuery, "/") reqURIwithQuery = strings.TrimPrefix(reqURIwithQuery, "/")
} }
realRemoteAddr := targetHost + reqURIwithQuery realRemoteAddr = targetHost + reqURIwithQuery
rawImageAbs, isNewDownload, err = fetchRemoteImg(realRemoteAddr, targetHostName) rawImageAbs, isNewDownload, err = fetchRemoteImg(realRemoteAddr, targetHostName)
if err != nil { if err != nil {
@ -127,13 +135,19 @@ func Convert(c *fiber.Ctx) error {
// 检查是否为允许的图片文件 // 检查是否为允许的图片文件
if !helper.IsAllowedImageFile(filename) { if !helper.IsAllowedImageFile(filename) {
log.Infof("不允许的文件类型或非图片文件: %s", reqURI) log.Infof("不允许的文件类型或非图片文件: %s", reqURI)
// 直接复制文件到 EXHAUST_PATH fileStatus.isAllowed = false
if err := helper.CopyFile(rawImageAbs, exhaustFilename); err != nil { fileStatus.isLocal = isLocalPath
processErr = fmt.Errorf("复制不允许处理的文件失败: %v", err) if isLocalPath {
fileStatus.path = rawImageAbs
} else {
fileStatus.path = realRemoteAddr
} }
fileStatus.needRedirect = !isLocalPath
return return
} }
fileStatus.isAllowed = true
// 处理图片 // 处理图片
isSmall, err := helper.IsFileSizeSmall(rawImageAbs, 30*1024) // 30KB isSmall, err := helper.IsFileSizeSmall(rawImageAbs, 30*1024) // 30KB
if err != nil { if err != nil {
@ -178,6 +192,15 @@ func Convert(c *fiber.Ctx) error {
return c.Status(fiber.StatusInternalServerError).SendString(processErr.Error()) return c.Status(fiber.StatusInternalServerError).SendString(processErr.Error())
} }
// 根据文件状态决定如何响应
if !fileStatus.isAllowed {
if fileStatus.isLocal {
return c.SendFile(fileStatus.path)
} else if fileStatus.needRedirect {
return c.Redirect(fileStatus.path, 302)
}
}
// 再次检查文件是否存在（以防并发情况下的竞态条件） // 再次检查文件是否存在（以防并发情况下的竞态条件）
if !helper.FileExists(exhaustFilename) { if !helper.FileExists(exhaustFilename) {
return c.Status(fiber.StatusInternalServerError).SendString("处理后的文件未找到") return c.Status(fiber.StatusInternalServerError).SendString("处理后的文件未找到")