🚧 support proxy

server/controllers/down.go

@@ -47,22 +47,29 @@ func Proxy(c *gin.Context) {
 		common.ErrorResp(c, err, 500)
 		return
 	}
+	// 只有三种情况允许中转：
+	// 1. 账号开启中转
+	// 2. driver只能中转
+	// 3. 是文本类型文件
+	if !account.Proxy && !driver.Config().OnlyProxy && utils.GetFileType(filepath.Ext(rawPath)) != conf.TEXT {
+		common.ErrorResp(c, fmt.Errorf("[%s] not allowed proxy", account.Name), 403)
+		return
+	}
+	// 中转时有中转机器使用中转机器
 	if account.ProxyUrl != "" {
 		name := utils.Base(rawPath)
 		link := fmt.Sprintf("%s%s?sign=%s", account.ProxyUrl, rawPath, utils.SignWithToken(name, conf.Token))
 		c.Redirect(302, link)
 		return
 	}
-	if !account.Proxy && utils.GetFileType(filepath.Ext(rawPath)) != conf.TEXT {
-		common.ErrorResp(c, fmt.Errorf("[%s] not allowed proxy", account.Name), 403)
-		return
-	}
 	link, err := driver.Link(path, account)
 	if err != nil {
 		common.ErrorResp(c, err, 500)
 		return
 	}
+	// 本机文件直接返回文件
 	if account.Type == "Native" {
+		// 对于名称为index.html的文件需要特殊处理
 		if utils.Base(rawPath) == "index.html" {
 			file, err := os.Open(link)
 			if err != nil {

server/controllers/path.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"fmt"
+	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/model"
 	"github.com/Xhofe/alist/server/common"
 	"github.com/Xhofe/alist/utils"
@@ -37,8 +38,13 @@ func Path(c *gin.Context) {
 		return
 	}
 	if file != nil {
-		if driver.Config().OnlyProxy {
-			file.Url = fmt.Sprintf("//%s/d%s", c.Request.Host, req.Path)
+		// 对于中转文件或只能中转,将链接修改为中转链接
+		if driver.Config().OnlyProxy || account.Proxy {
+			if account.ProxyUrl != "" {
+				file.Url = fmt.Sprintf("%s%s?sign=%s", account.ProxyUrl, req.Path, utils.SignWithToken(file.Name, conf.Token))
+			}else {
+				file.Url = fmt.Sprintf("//%s/d%s", c.Request.Host, req.Path)
+			}
 		}
 		c.JSON(200, common.Resp{
 			Code:    200,