feat: customize proxy ignore headers (close #2763 pr #2766)

EzraRT · xhofe · web-flow · commit 146619134dc9 · 2022-12-20T16:08:32.000+08:00
* clean referer when use proxy

* feat: customize proxy ignore headers

Co-authored-by: Noah Hsu &lt;i@nn.ci&gt;
diff --git a/internal/bootstrap/data/setting.go b/internal/bootstrap/data/setting.go
@@ -97,6 +97,7 @@ func InitialSettings() []model.SettingItem {
 		{Key: conf.ImageTypes, Value: "jpg,tiff,jpeg,png,gif,bmp,svg,ico,swf,webp", Type: conf.TypeText, Group: model.PREVIEW, Flag: model.PRIVATE},
 		//{Key: conf.OfficeTypes, Value: "doc,docx,xls,xlsx,ppt,pptx", Type: conf.TypeText, Group: model.PREVIEW, Flag: model.PRIVATE},
 		{Key: conf.ProxyTypes, Value: "m3u8", Type: conf.TypeText, Group: model.PREVIEW, Flag: model.PRIVATE},
+		{Key: conf.ProxyIgnoreHeaders, Value: "authorization,referer", Type: conf.TypeText, Group: model.PRIVATE, Flag: model.PRIVATE},
 		{Key: "external_previews", Value: `{}`, Type: conf.TypeText, Group: model.PREVIEW},
 		{Key: "iframe_previews", Value: `{
 	"doc,docx,xls,xlsx,ppt,pptx": {
diff --git a/internal/conf/const.go b/internal/conf/const.go
@@ -15,23 +15,21 @@ const (
 	BasePath     = "base_path"
 	SiteTitle    = "site_title"
 	Announcement = "announcement"
-	AllowIndexed   = "allow_indexed"
+	AllowIndexed = "allow_indexed"
 
 	Logo      = "logo"
 	Favicon   = "favicon"
 	MainColor = "main_color"
 
 	// preview
-	TextTypes  = "text_types"
-	AudioTypes = "audio_types"
-	VideoTypes = "video_types"
-	ImageTypes = "image_types"
-	// OfficeTypes   = "office_types"
-	ProxyTypes    = "proxy_types"
-	OfficeViewers = "office_viewers"
-	PdfViewers    = "pdf_viewers"
-	AudioAutoplay = "audio_autoplay"
-	VideoAutoplay = "video_autoplay"
+	TextTypes          = "text_types"
+	AudioTypes         = "audio_types"
+	VideoTypes         = "video_types"
+	ImageTypes         = "image_types"
+	ProxyTypes         = "proxy_types"
+	ProxyIgnoreHeaders = "proxy_ignore_headers"
+	AudioAutoplay      = "audio_autoplay"
+	VideoAutoplay      = "video_autoplay"
 
 	// global
 	HideFiles           = "hide_files"
diff --git a/internal/conf/var.go b/internal/conf/var.go
@@ -15,7 +15,7 @@ var (
 	Conf *Config
 )
 
-var TypesMap = make(map[string][]string)
+var SlicesMap = make(map[string][]string)
 var FilenameCharMap = make(map[string]string)
 var PrivacyReg []*regexp.Regexp
 
diff --git a/internal/op/hook.go b/internal/op/hook.go
@@ -33,26 +33,29 @@ type SettingItemHook func(item *model.SettingItem) error
 
 var settingItemHooks = map[string]SettingItemHook{
 	conf.VideoTypes: func(item *model.SettingItem) error {
-		conf.TypesMap[conf.VideoTypes] = strings.Split(item.Value, ",")
+		conf.SlicesMap[conf.VideoTypes] = strings.Split(item.Value, ",")
 		return nil
 	},
 	conf.AudioTypes: func(item *model.SettingItem) error {
-		conf.TypesMap[conf.AudioTypes] = strings.Split(item.Value, ",")
+		conf.SlicesMap[conf.AudioTypes] = strings.Split(item.Value, ",")
 		return nil
 	},
 	conf.ImageTypes: func(item *model.SettingItem) error {
-		conf.TypesMap[conf.ImageTypes] = strings.Split(item.Value, ",")
+		conf.SlicesMap[conf.ImageTypes] = strings.Split(item.Value, ",")
 		return nil
 	},
 	conf.TextTypes: func(item *model.SettingItem) error {
-		conf.TypesMap[conf.TextTypes] = strings.Split(item.Value, ",")
+		conf.SlicesMap[conf.TextTypes] = strings.Split(item.Value, ",")
 		return nil
 	},
 	conf.ProxyTypes: func(item *model.SettingItem) error {
-		conf.TypesMap[conf.ProxyTypes] = strings.Split(item.Value, ",")
+		conf.SlicesMap[conf.ProxyTypes] = strings.Split(item.Value, ",")
+		return nil
+	},
+	conf.ProxyIgnoreHeaders: func(item *model.SettingItem) error {
+		conf.SlicesMap[conf.ProxyIgnoreHeaders] = strings.Split(item.Value, ",")
 		return nil
 	},
-
 	conf.PrivacyRegs: func(item *model.SettingItem) error {
 		regStrs := strings.Split(item.Value, "\n")
 		regs := make([]*regexp.Regexp, 0, len(regStrs))
diff --git a/pkg/utils/file.go b/pkg/utils/file.go
@@ -119,19 +119,16 @@ func CreateTempFile(r io.ReadCloser) (*os.File, error) {
 // GetFileType get file type
 func GetFileType(filename string) int {
 	ext := strings.ToLower(Ext(filename))
-	//if SliceContains(conf.TypesMap[conf.OfficeTypes], ext) {
-	//	return conf.OFFICE
-	//}
-	if SliceContains(conf.TypesMap[conf.AudioTypes], ext) {
+	if SliceContains(conf.SlicesMap[conf.AudioTypes], ext) {
 		return conf.AUDIO
 	}
-	if SliceContains(conf.TypesMap[conf.VideoTypes], ext) {
+	if SliceContains(conf.SlicesMap[conf.VideoTypes], ext) {
 		return conf.VIDEO
 	}
-	if SliceContains(conf.TypesMap[conf.ImageTypes], ext) {
+	if SliceContains(conf.SlicesMap[conf.ImageTypes], ext) {
 		return conf.IMAGE
 	}
-	if SliceContains(conf.TypesMap[conf.TextTypes], ext) {
+	if SliceContains(conf.SlicesMap[conf.TextTypes], ext) {
 		return conf.TEXT
 	}
 	return conf.UNKNOWN
diff --git a/server/common/proxy.go b/server/common/proxy.go
@@ -10,7 +10,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 )
@@ -67,7 +69,7 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.
 			return err
 		}
 		for h, val := range r.Header {
-			if strings.ToLower(h) == "authorization" {
+			if utils.SliceContains(conf.SlicesMap[conf.ProxyIgnoreHeaders], strings.ToLower(h)) {
 				continue
 			}
 			req.Header[h] = val
diff --git a/server/handles/down.go b/server/handles/down.go
@@ -91,7 +91,7 @@ func shouldProxy(storage driver.Driver, filename string) bool {
 	if storage.Config().MustProxy() || storage.GetStorage().WebProxy {
 		return true
 	}
-	if utils.SliceContains(conf.TypesMap[conf.ProxyTypes], utils.Ext(filename)) {
+	if utils.SliceContains(conf.SlicesMap[conf.ProxyTypes], utils.Ext(filename)) {
 		return true
 	}
 	return false
@@ -108,10 +108,10 @@ func canProxy(storage driver.Driver, filename string) bool {
 	if storage.Config().MustProxy() || storage.GetStorage().WebProxy || storage.GetStorage().WebdavProxy() {
 		return true
 	}
-	if utils.SliceContains(conf.TypesMap[conf.ProxyTypes], utils.Ext(filename)) {
+	if utils.SliceContains(conf.SlicesMap[conf.ProxyTypes], utils.Ext(filename)) {
 		return true
 	}
-	if utils.SliceContains(conf.TypesMap[conf.TextTypes], utils.Ext(filename)) {
+	if utils.SliceContains(conf.SlicesMap[conf.TextTypes], utils.Ext(filename)) {
 		return true
 	}
 	return false

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ var (`
`15`	`15`	`Conf *Config`
`16`	`16`	`)`
`17`	`17`
`18`		`-var TypesMap = make(map[string][]string)`
	`18`	`+var SlicesMap = make(map[string][]string)`
`19`	`19`	`var FilenameCharMap = make(map[string]string)`
`20`	`20`	`var PrivacyReg []*regexp.Regexp`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -119,19 +119,16 @@ func CreateTempFile(r io.ReadCloser) (*os.File, error) {`
`119`	`119`	`// GetFileType get file type`
`120`	`120`	`func GetFileType(filename string) int {`
`121`	`121`	`ext := strings.ToLower(Ext(filename))`
`122`		`- //if SliceContains(conf.TypesMap[conf.OfficeTypes], ext) {`
`123`		`- // return conf.OFFICE`
`124`		`- //}`
`125`		`- if SliceContains(conf.TypesMap[conf.AudioTypes], ext) {`
	`122`	`+ if SliceContains(conf.SlicesMap[conf.AudioTypes], ext) {`
`126`	`123`	`return conf.AUDIO`
`127`	`124`	`}`
`128`		`- if SliceContains(conf.TypesMap[conf.VideoTypes], ext) {`
	`125`	`+ if SliceContains(conf.SlicesMap[conf.VideoTypes], ext) {`
`129`	`126`	`return conf.VIDEO`
`130`	`127`	`}`
`131`		`- if SliceContains(conf.TypesMap[conf.ImageTypes], ext) {`
	`128`	`+ if SliceContains(conf.SlicesMap[conf.ImageTypes], ext) {`
`132`	`129`	`return conf.IMAGE`
`133`	`130`	`}`
`134`		`- if SliceContains(conf.TypesMap[conf.TextTypes], ext) {`
	`131`	`+ if SliceContains(conf.SlicesMap[conf.TextTypes], ext) {`
`135`	`132`	`return conf.TEXT`
`136`	`133`	`}`
`137`	`134`	`return conf.UNKNOWN`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,9 @@ import (`
`10`	`10`	`"strconv"`
`11`	`11`	`"strings"`
`12`	`12`
	`13`	`+ "github.com/alist-org/alist/v3/internal/conf"`
`13`	`14`	`"github.com/alist-org/alist/v3/internal/model"`
	`15`	`+ "github.com/alist-org/alist/v3/pkg/utils"`
`14`	`16`	`"github.com/pkg/errors"`
`15`	`17`	`log "github.com/sirupsen/logrus"`
`16`	`18`	`)`
`@@ -67,7 +69,7 @@ func Proxy(w http.ResponseWriter, r http.Request, link model.Link, file model.`
`67`	`69`	`return err`
`68`	`70`	`}`
`69`	`71`	`for h, val := range r.Header {`
`70`		`- if strings.ToLower(h) == "authorization" {`
	`72`	`+ if utils.SliceContains(conf.SlicesMap[conf.ProxyIgnoreHeaders], strings.ToLower(h)) {`
`71`	`73`	`continue`
`72`	`74`	`}`
`73`	`75`	`req.Header[h] = val`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func shouldProxy(storage driver.Driver, filename string) bool {`
`91`	`91`	`if storage.Config().MustProxy() \|\| storage.GetStorage().WebProxy {`
`92`	`92`	`return true`
`93`	`93`	`}`
`94`		`- if utils.SliceContains(conf.TypesMap[conf.ProxyTypes], utils.Ext(filename)) {`
	`94`	`+ if utils.SliceContains(conf.SlicesMap[conf.ProxyTypes], utils.Ext(filename)) {`
`95`	`95`	`return true`
`96`	`96`	`}`
`97`	`97`	`return false`
`@@ -108,10 +108,10 @@ func canProxy(storage driver.Driver, filename string) bool {`
`108`	`108`	`if storage.Config().MustProxy() \|\| storage.GetStorage().WebProxy \|\| storage.GetStorage().WebdavProxy() {`
`109`	`109`	`return true`
`110`	`110`	`}`
`111`		`- if utils.SliceContains(conf.TypesMap[conf.ProxyTypes], utils.Ext(filename)) {`
	`111`	`+ if utils.SliceContains(conf.SlicesMap[conf.ProxyTypes], utils.Ext(filename)) {`
`112`	`112`	`return true`
`113`	`113`	`}`
`114`		`- if utils.SliceContains(conf.TypesMap[conf.TextTypes], utils.Ext(filename)) {`
	`114`	`+ if utils.SliceContains(conf.SlicesMap[conf.TextTypes], utils.Ext(filename)) {`
`115`	`115`	`return true`
`116`	`116`	`}`
`117`	`117`	`return false`