diff --git a/kernel/server/serve.go b/kernel/server/serve.go index 08e6e1182..a974d91a1 100644 --- a/kernel/server/serve.go +++ b/kernel/server/serve.go @@ -41,31 +41,12 @@ import ( var cookieStore = cookie.NewStore([]byte("ATN51UlxVq1Gcvdf")) -func CORSMiddleware() gin.HandlerFunc { - return func(c *gin.Context) { - - c.Header("Access-Control-Allow-Origin", "*") - c.Header("Access-Control-Allow-Credentials", "true") - c.Header("Access-Control-Allow-Headers", "origin, Content-Length, Content-Type, Authorization") - c.Header("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS") - - if c.Request.Method == "OPTIONS" { - c.AbortWithStatus(204) - return - } - - c.Next() - } -} - func Serve(fastMode bool) { gin.SetMode(gin.ReleaseMode) ginServer := gin.New() ginServer.MaxMultipartMemory = 1024 * 1024 * 32 // 插入较大的资源文件时内存占用较大 https://github.com/siyuan-note/siyuan/issues/5023 ginServer.Use(gin.Recovery()) - // 跨域支持验证 - // ginServer.Use(cors.Default()) - ginServer.Use(CORSMiddleware()) + ginServer.Use(corsMiddleware()) // 后端服务支持 CORS 预检请求验证 https://github.com/siyuan-note/siyuan/pull/5593 ginServer.Use(gzip.Gzip(gzip.DefaultCompression, gzip.WithExcludedExtensions([]string{".pdf", ".mp3", ".wav", ".ogg", ".mov", ".weba", ".mkv", ".mp4", ".webm"}))) cookieStore.Options(sessions.Options{ @@ -379,3 +360,20 @@ func shortReqMsg(msg []byte) []byte { } return msg } + +func corsMiddleware() gin.HandlerFunc { + return func(c *gin.Context) { + + c.Header("Access-Control-Allow-Origin", "*") + c.Header("Access-Control-Allow-Credentials", "true") + c.Header("Access-Control-Allow-Headers", "origin, Content-Length, Content-Type, Authorization") + c.Header("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS") + + if c.Request.Method == "OPTIONS" { + c.AbortWithStatus(204) + return + } + + c.Next() + } +}