viscous/cloudreve
1
0
Fork 0
mirror of https://github.com/cloudreve/cloudreve.git synced 2026-03-03 02:57:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(route): force CORS header for content route with correct header parameters (close #3192)

Browse Source
This commit is contained in:
Aaron Liu
2026-01-23 15:23:09 +08:00
parent a84c5d8e97
commit 864332f2e5
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
middleware/common.go
View File

@@ -16,6 +16,7 @@ import (
"github.com/cloudreve/Cloudreve/v4/pkg/request" "github.com/cloudreve/Cloudreve/v4/pkg/request"
"github.com/cloudreve/Cloudreve/v4/pkg/serializer" "github.com/cloudreve/Cloudreve/v4/pkg/serializer"
"github.com/cloudreve/Cloudreve/v4/pkg/util" "github.com/cloudreve/Cloudreve/v4/pkg/util"
"github.com/gin-contrib/cors"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gofrs/uuid" "github.com/gofrs/uuid"
) )
@@ -157,3 +158,13 @@ func Logging() gin.HandlerFunc {
c.Errors.ByType(gin.ErrorTypePrivate).String(), start) c.Errors.ByType(gin.ErrorTypePrivate).String(), start)
} }
} }
func ContentCORS() gin.HandlerFunc {
return cors.New(cors.Config{
AllowOrigins: []string{"*"},
AllowMethods: []string{"GET", "HEAD", "OPTIONS"},
AllowHeaders: []string{"Range", "If-Range", "Authorization", "Content-Type"},
ExposeHeaders: []string{"Content-Range", "Accept-Ranges", "Content-Length", "Content-Disposition", "Content-Disposition", "ETag"},
AllowCredentials: false,
})
}

9
routers/router.go
View File

@@ -243,7 +243,9 @@ func initMasterRouter(dep dependency.Dep) *gin.Engine {
{ {
// Redirect file source link // Redirect file source link
source := r.Group("f") source := r.Group("f")
source.Use(middleware.ContentCORS())
{ {
source.OPTIONS("*option", middleware.ContentCORS())
source.GET(":id/:name", source.GET(":id/:name",
middleware.HashID(hashid.SourceLinkID), middleware.HashID(hashid.SourceLinkID),
controllers.AnonymousPermLink(false)) controllers.AnonymousPermLink(false))
@@ -632,12 +634,9 @@ func initMasterRouter(dep dependency.Dep) *gin.Engine {
controllers.PutContent) controllers.PutContent)
// Get entity content for preview/download // Get entity content for preview/download
content := file.Group("content") content := file.Group("content")
contentCors := cors.New(cors.Config{ content.Use(middleware.ContentCORS())
AllowOrigins: []string{"*"},
})
content.Use(contentCors)
{ {
content.OPTIONS("*option", contentCors) content.OPTIONS("*option", middleware.ContentCORS())
content.GET(":id/:speed/:name", content.GET(":id/:speed/:name",
middleware.SignRequired(dep.GeneralAuth()), middleware.SignRequired(dep.GeneralAuth()),
middleware.HashID(hashid.EntityID), middleware.HashID(hashid.EntityID),