Infrastructure/Cloudreve
0
Fork 0
Code Issues Pull requests Activity

Fix: cors middleware should be applied directly to root router

Browse source
This commit is contained in:
HFO4 2019-12-29 13:15:09 +08:00
parent ac2de841d2
commit b5ee3ee609
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/conf/conf.go
View file

@ -56,7 +56,6 @@ type thumb struct {
// 跨域配置 // 跨域配置
type cors struct { type cors struct {
AllowAllOrigins bool
AllowOrigins []string AllowOrigins []string
AllowMethods []string AllowMethods []string
AllowHeaders []string AllowHeaders []string

1
pkg/conf/defaults.go
View file

@ -38,7 +38,6 @@ var CaptchaConfig = &captcha{
// CORSConfig 跨域配置 // CORSConfig 跨域配置
var CORSConfig = &cors{ var CORSConfig = &cors{
AllowAllOrigins: false,
AllowOrigins: []string{"UNSET"}, AllowOrigins: []string{"UNSET"},
AllowMethods: []string{"PUT", "POST", "GET", "OPTIONS"}, AllowMethods: []string{"PUT", "POST", "GET", "OPTIONS"},
AllowHeaders: []string{"Cookie", "Content-Length", "Content-Type", "X-Path", "X-FileName"}, AllowHeaders: []string{"Cookie", "Content-Length", "Content-Type", "X-Path", "X-FileName"},

15
routers/router.go
View file

@ -23,9 +23,9 @@ func InitRouter() *gin.Engine {
// InitSlaveRouter 初始化从机模式路由 // InitSlaveRouter 初始化从机模式路由
func InitSlaveRouter() *gin.Engine { func InitSlaveRouter() *gin.Engine {
r := gin.Default() r := gin.Default()
v3 := r.Group("/api/v3/slave")
// 跨域相关 // 跨域相关
InitCORS(v3) InitCORS(r)
v3 := r.Group("/api/v3/slave")
// 鉴权中间件 // 鉴权中间件
v3.Use(middleware.SignRequired()) v3.Use(middleware.SignRequired())
@ -39,12 +39,11 @@ func InitSlaveRouter() *gin.Engine {
} }
// InitCORS 初始化跨域配置 // InitCORS 初始化跨域配置
func InitCORS(group *gin.RouterGroup) { func InitCORS(router *gin.Engine) {
if conf.CORSConfig.AllowOrigins[0] != "UNSET" || conf.CORSConfig.AllowAllOrigins { if conf.CORSConfig.AllowOrigins[0] != "UNSET" {
group.Use(cors.New(cors.Config{ router.Use(cors.New(cors.Config{
AllowOrigins: conf.CORSConfig.AllowOrigins, AllowOrigins: conf.CORSConfig.AllowOrigins,
AllowAllOrigins: conf.CORSConfig.AllowAllOrigins, AllowMethods: conf.CORSConfig.AllowMethods,
AllowMethods: conf.CORSConfig.AllowHeaders,
AllowHeaders: conf.CORSConfig.AllowHeaders, AllowHeaders: conf.CORSConfig.AllowHeaders,
AllowCredentials: conf.CORSConfig.AllowCredentials, AllowCredentials: conf.CORSConfig.AllowCredentials,
ExposeHeaders: conf.CORSConfig.ExposeHeaders, ExposeHeaders: conf.CORSConfig.ExposeHeaders,
@ -67,7 +66,7 @@ func InitMasterRouter() *gin.Engine {
*/ */
v3.Use(middleware.Session(conf.SystemConfig.SessionSecret)) v3.Use(middleware.Session(conf.SystemConfig.SessionSecret))
// 跨域相关 // 跨域相关
InitCORS(v3) InitCORS(r)
// 测试模式加入Mock助手中间件 // 测试模式加入Mock助手中间件
if gin.Mode() == gin.TestMode { if gin.Mode() == gin.TestMode {
v3.Use(middleware.MockHelper()) v3.Use(middleware.MockHelper())

1
service/explorer/file.go
View file

@ -111,6 +111,7 @@ func (service *SingleFileService) CreateDocPreviewSession(ctx context.Context, c
} }
// 生成最终的预览器地址 // 生成最终的预览器地址
// TODO 从配置文件中读取
viewerBase, _ := url.Parse("https://view.officeapps.live.com/op/view.aspx") viewerBase, _ := url.Parse("https://view.officeapps.live.com/op/view.aspx")
params := viewerBase.Query() params := viewerBase.Query()
params.Set("src", downloadURL) params.Set("src", downloadURL)