refactor: pass api_url through context (#457)

* refactor: pass `api_url` through context

* 移除 LinkArgs.HttpReq

* pref(alias): 减少不必要下载代理

* 修复bug

* net: 支持1并发 分片下载

drivers/alias/util.go

@@ -103,7 +103,12 @@ func (d *Alias) link(ctx context.Context, dst, sub string, args model.LinkArgs)
 	if err != nil {
 		return nil, err
 	}
-	if _, ok := storage.(*Alias); !ok && !args.Redirect {
+	useRawLink := len(common.GetApiUrl(ctx)) == 0 // ftp、s3
+	if !useRawLink {
+		_, ok := storage.(*Alias)
+		useRawLink = !ok && !args.Redirect
+	}
+	if useRawLink {
 		link, _, err := op.Link(ctx, storage, reqActualPath, args)
 		return link, err
 	}
@@ -114,13 +119,10 @@ func (d *Alias) link(ctx context.Context, dst, sub string, args model.LinkArgs)
 	if common.ShouldProxy(storage, stdpath.Base(sub)) {
 		link := &model.Link{
 			URL: fmt.Sprintf("%s/p%s?sign=%s",
-				common.GetApiUrl(args.HttpReq),
+				common.GetApiUrl(ctx),
 				utils.EncodePath(reqPath, true),
 				sign.Sign(reqPath)),
 		}
-		if args.HttpReq != nil && d.ProxyRange {
-			link.RangeReadCloser = common.NoProxyRange
-		}
 		return link, nil
 	}
 	link, _, err := op.Link(ctx, storage, reqActualPath, args)
@@ -201,31 +203,24 @@ func (d *Alias) extract(ctx context.Context, dst, sub string, args model.Archive
 	if err != nil {
 		return nil, err
 	}
-	if _, ok := storage.(driver.ArchiveReader); ok {
+	if _, ok := storage.(driver.ArchiveReader); !ok {
-		if _, ok := storage.(*Alias); !ok && !args.Redirect {
+		return nil, errs.NotImplement
-			link, _, err := op.DriverExtract(ctx, storage, reqActualPath, args)
-			return link, err
 	}
+	if args.Redirect && common.ShouldProxy(storage, stdpath.Base(sub)) {
 		_, err = fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
 		if err != nil {
 			return nil, err
 		}
-		if common.ShouldProxy(storage, stdpath.Base(sub)) {
 		link := &model.Link{
 			URL: fmt.Sprintf("%s/ap%s?inner=%s&pass=%s&sign=%s",
-					common.GetApiUrl(args.HttpReq),
+				common.GetApiUrl(ctx),
 				utils.EncodePath(reqPath, true),
 				utils.EncodePath(args.InnerPath, true),
 				url.QueryEscape(args.Password),
 				sign.SignArchive(reqPath)),
 		}
-			if args.HttpReq != nil && d.ProxyRange {
-				link.RangeReadCloser = common.NoProxyRange
-			}
 		return link, nil
 	}
 	link, _, err := op.DriverExtract(ctx, storage, reqActualPath, args)
 	return link, err
 }
-	return nil, errs.NotImplement
-}

drivers/crypt/driver.go

@@ -163,7 +163,7 @@ func (d *Crypt) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 			if d.Thumbnail && thumb == "" {
 				thumbPath := stdpath.Join(args.ReqPath, ".thumbnails", name+".webp")
 				thumb = fmt.Sprintf("%s/d%s?sign=%s",
-					common.GetApiUrl(common.GetHttpReq(ctx)),
+					common.GetApiUrl(ctx),
 					utils.EncodePath(thumbPath, true),
 					sign.Sign(thumbPath))
 			}

drivers/local/driver.go

@@ -139,7 +139,7 @@ func (d *Local) FileInfoToObj(ctx context.Context, f fs.FileInfo, reqPath string
 	if d.Thumbnail {
 		typeName := utils.GetFileType(f.Name())
 		if typeName == conf.IMAGE || typeName == conf.VIDEO {
-			thumb = common.GetApiUrl(common.GetHttpReq(ctx)) + stdpath.Join("/d", reqPath, f.Name())
+			thumb = common.GetApiUrl(ctx) + stdpath.Join("/d", reqPath, f.Name())
 			thumb = utils.EncodePath(thumb, true)
 			thumb += "?type=thumb&sign=" + sign.Sign(stdpath.Join(reqPath, f.Name()))
 		}

drivers/netease_music/driver.go

@@ -76,7 +76,7 @@ func (d *NeteaseMusic) Link(ctx context.Context, file model.Obj, args model.Link
 		if args.Type == "parsed" {
 			return lrc.getLyricLink(), nil
 		} else {
-			return lrc.getProxyLink(args), nil
+			return lrc.getProxyLink(ctx), nil
 		}
 	}
 

drivers/netease_music/types.go

@@ -48,8 +48,8 @@ type LyricObj struct {
 	lyric string
 }
 
-func (lrc *LyricObj) getProxyLink(args model.LinkArgs) *model.Link {
+func (lrc *LyricObj) getProxyLink(ctx context.Context) *model.Link {
-	rawURL := common.GetApiUrl(args.HttpReq) + "/p" + lrc.Path
+	rawURL := common.GetApiUrl(ctx) + "/p" + lrc.Path
 	rawURL = utils.EncodePath(rawURL, true) + "?type=parsed&sign=" + sign.Sign(lrc.Path)
 	return &model.Link{URL: rawURL}
 }

internal/authn/authn.go

@@ -2,17 +2,17 @@ package authn
 
 import (
 	"fmt"
-	"net/http"
 	"net/url"
 
 	"github.com/OpenListTeam/OpenList/internal/conf"
 	"github.com/OpenListTeam/OpenList/internal/setting"
 	"github.com/OpenListTeam/OpenList/server/common"
+	"github.com/gin-gonic/gin"
 	"github.com/go-webauthn/webauthn/webauthn"
 )
 
-func NewAuthnInstance(r *http.Request) (*webauthn.WebAuthn, error) {
+func NewAuthnInstance(c *gin.Context) (*webauthn.WebAuthn, error) {
-	siteUrl, err := url.Parse(common.GetApiUrl(r))
+	siteUrl, err := url.Parse(common.GetApiUrl(c))
 	if err != nil {
 		return nil, err
 	}

internal/conf/const.go

@@ -148,4 +148,5 @@ const (
 // ContextKey is the type of context keys.
 const (
 	NoTaskKey = "no_task"
+	ApiUrlKey = "api_url"
 )

internal/fs/archive.go

@@ -49,7 +49,9 @@ func (t *ArchiveDownloadTask) GetStatus() string {
 }
 
 func (t *ArchiveDownloadTask) Run() error {
-	t.ReinitCtx()
+	if err := t.ReinitCtx(); err != nil {
+		return err
+	}
 	t.ClearEndTime()
 	t.SetStartTime(time.Now())
 	defer func() { t.SetEndTime(time.Now()) }()
@@ -152,7 +154,9 @@ func (t *ArchiveContentUploadTask) GetStatus() string {
 }
 
 func (t *ArchiveContentUploadTask) Run() error {
-	t.ReinitCtx()
+	if err := t.ReinitCtx(); err != nil {
+		return err
+	}
 	t.ClearEndTime()
 	t.SetStartTime(time.Now())
 	defer func() { t.SetEndTime(time.Now()) }()

internal/fs/copy.go

@@ -7,15 +7,15 @@ import (
 	stdpath "path"
 	"time"
 
-	"github.com/OpenListTeam/OpenList/internal/errs"
-
 	"github.com/OpenListTeam/OpenList/internal/conf"
 	"github.com/OpenListTeam/OpenList/internal/driver"
+	"github.com/OpenListTeam/OpenList/internal/errs"
 	"github.com/OpenListTeam/OpenList/internal/model"
 	"github.com/OpenListTeam/OpenList/internal/op"
 	"github.com/OpenListTeam/OpenList/internal/stream"
 	"github.com/OpenListTeam/OpenList/internal/task"
 	"github.com/OpenListTeam/OpenList/pkg/utils"
+	"github.com/OpenListTeam/OpenList/server/common"
 	"github.com/pkg/errors"
 	"github.com/xhofe/tache"
 )
@@ -40,7 +40,9 @@ func (t *CopyTask) GetStatus() string {
 }
 
 func (t *CopyTask) Run() error {
-	t.ReinitCtx()
+	if err := t.ReinitCtx(); err != nil {
+		return err
+	}
 	t.ClearEndTime()
 	t.SetStartTime(time.Now())
 	defer func() { t.SetEndTime(time.Now()) }()
@@ -107,6 +109,7 @@ func _copy(ctx context.Context, srcObjPath, dstDirPath string, lazyCache ...bool
 	t := &CopyTask{
 		TaskExtension: task.TaskExtension{
 			Creator: taskCreator,
+			ApiUrl:  common.GetApiUrl(ctx),
 		},
 		srcStorage:   srcStorage,
 		dstStorage:   dstStorage,
@@ -140,6 +143,7 @@ func copyBetween2Storages(t *CopyTask, srcStorage, dstStorage driver.Driver, src
 			CopyTaskManager.Add(&CopyTask{
 				TaskExtension: task.TaskExtension{
 					Creator: t.GetCreator(),
+					ApiUrl:  t.ApiUrl,
 				},
 				srcStorage:   srcStorage,
 				dstStorage:   dstStorage,

internal/fs/link.go

@@ -7,7 +7,6 @@ import (
 	"github.com/OpenListTeam/OpenList/internal/model"
 	"github.com/OpenListTeam/OpenList/internal/op"
 	"github.com/OpenListTeam/OpenList/server/common"
-	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
 )
 
@@ -21,9 +20,7 @@ func link(ctx context.Context, path string, args model.LinkArgs) (*model.Link, m
 		return nil, nil, errors.WithMessage(err, "failed link")
 	}
 	if l.URL != "" && !strings.HasPrefix(l.URL, "http://") && !strings.HasPrefix(l.URL, "https://") {
-		if c, ok := ctx.(*gin.Context); ok {
+		l.URL = common.GetApiUrl(ctx) + l.URL
-			l.URL = common.GetApiUrl(c.Request) + l.URL
-		}
 	}
 	return l, obj, nil
 }

internal/fs/move.go

@@ -15,6 +15,7 @@ import (
 	"github.com/OpenListTeam/OpenList/internal/stream"
 	"github.com/OpenListTeam/OpenList/internal/task"
 	"github.com/OpenListTeam/OpenList/pkg/utils"
+	"github.com/OpenListTeam/OpenList/server/common"
 	"github.com/pkg/errors"
 	"github.com/xhofe/tache"
 )
@@ -106,7 +107,9 @@ func (t *MoveTask) updateProgress() {
 }
 
 func (t *MoveTask) Run() error {
-	t.ReinitCtx()
+	if err := t.ReinitCtx(); err != nil {
+		return err
+	}
 	t.ClearEndTime()
 	t.SetStartTime(time.Now())
 	defer func() {
@@ -492,6 +495,7 @@ func moveBetween2Storages(t *MoveTask, srcStorage, dstStorage driver.Driver, src
 			MoveTaskManager.Add(&MoveTask{
 				TaskExtension: task.TaskExtension{
 					Creator: t.GetCreator(),
+					ApiUrl:  t.ApiUrl,
 				},
 				srcStorage:   srcStorage,
 				dstStorage:   dstStorage,
@@ -515,13 +519,13 @@ func moveBetween2Storages(t *MoveTask, srcStorage, dstStorage driver.Driver, src
 	}
 }
 
-
 func moveFileBetween2Storages(tsk *MoveTask, srcStorage, dstStorage driver.Driver, srcFilePath, dstDirPath string) error {
 	tsk.Status = "copying file to destination"
 
 	copyTask := &CopyTask{
 		TaskExtension: task.TaskExtension{
 			Creator: tsk.GetCreator(),
+			ApiUrl:  tsk.ApiUrl,
 		},
 		srcStorage:   srcStorage,
 		dstStorage:   dstStorage,
@@ -531,10 +535,8 @@ func moveFileBetween2Storages(tsk *MoveTask, srcStorage, dstStorage driver.Drive
 		DstStorageMp: dstStorage.GetStorage().MountPath,
 	}
 
-
 	copyTask.SetCtx(tsk.Ctx())
 
-
 	err := copyBetween2Storages(copyTask, srcStorage, dstStorage, srcFilePath, dstDirPath)
 	if err != nil {
 		// Check if this is an upload-related error and provide a clearer message
@@ -557,7 +559,6 @@ func moveFileBetween2Storages(tsk *MoveTask, srcStorage, dstStorage driver.Drive
 	return nil
 }
 
-
 // safeMoveOperation ensures copy-then-delete sequence for safe move operations
 func (t *MoveTask) safeMoveOperation(srcObj model.Obj) error {
 	if srcObj.IsDir() {
@@ -598,6 +599,7 @@ func _moveWithValidation(ctx context.Context, srcObjPath, dstDirPath string, val
 	t := &MoveTask{
 		TaskExtension: task.TaskExtension{
 			Creator: taskCreator,
+			ApiUrl:  common.GetApiUrl(ctx),
 		},
 		srcStorage:        srcStorage,
 		dstStorage:        dstStorage,

internal/model/args.go

@@ -20,7 +20,6 @@ type LinkArgs struct {
 	IP       string
 	Header   http.Header
 	Type     string
-	HttpReq  *http.Request
 	Redirect bool
 }
 

internal/net/request.go

@@ -171,7 +171,7 @@ func (d *downloader) download() (io.ReadCloser, error) {
 
 	log.Debugf("cfgConcurrency:%d", d.cfg.Concurrency)
 
-	if d.cfg.Concurrency == 1 {
+	if maxPart == 1 {
 		if d.cfg.ConcurrencyLimit != nil {
 			go func() {
 				<-d.ctx.Done()

internal/offline_download/tool/download.go

@@ -28,7 +28,9 @@ type DownloadTask struct {
 }
 
 func (t *DownloadTask) Run() error {
-	t.ReinitCtx()
+	if err := t.ReinitCtx(); err != nil {
+		return err
+	}
 	t.ClearEndTime()
 	t.SetStartTime(time.Now())
 	defer func() { t.SetEndTime(time.Now()) }()

internal/offline_download/tool/transfer.go

@@ -33,7 +33,9 @@ type TransferTask struct {
 }
 
 func (t *TransferTask) Run() error {
-	t.ReinitCtx()
+	if err := t.ReinitCtx(); err != nil {
+		return err
+	}
 	t.ClearEndTime()
 	t.SetStartTime(time.Now())
 	defer func() { t.SetEndTime(time.Now()) }()

internal/stream/util.go

@@ -19,7 +19,7 @@ func GetRangeReadCloserFromLink(size int64, link *model.Link) (model.RangeReadCl
 		return nil, fmt.Errorf("can't create RangeReadCloser since URL is empty in link")
 	}
 	rangeReaderFunc := func(ctx context.Context, r http_range.Range) (io.ReadCloser, error) {
-		if link.Concurrency != 0 || link.PartSize != 0 {
+		if link.Concurrency > 0 || link.PartSize > 0 {
 			header := net.ProcessHeader(nil, link.Header)
 			down := net.NewDownloader(func(d *net.Downloader) {
 				d.Concurrency = link.Concurrency

internal/task/base.go

@@ -2,7 +2,6 @@ package task
 
 import (
 	"context"
-	"sync"
 	"time"
 
 	"github.com/OpenListTeam/OpenList/internal/conf"
@@ -12,12 +11,21 @@ import (
 
 type TaskExtension struct {
 	tache.Base
-	ctx          context.Context
-	ctxInitMutex sync.Mutex
 	Creator    *model.User
 	startTime  *time.Time
 	endTime    *time.Time
 	totalBytes int64
+	ApiUrl     string
+}
+
+func (t *TaskExtension) SetCtx(ctx context.Context) {
+	if t.Creator != nil {
+		ctx = context.WithValue(ctx, "user", t.Creator)
+	}
+	if len(t.ApiUrl) > 0 {
+		ctx = context.WithValue(ctx, conf.ApiUrlKey, t.ApiUrl)
+	}
+	t.Base.SetCtx(ctx)
 }
 
 func (t *TaskExtension) SetCreator(creator *model.User) {
@@ -57,29 +65,18 @@ func (t *TaskExtension) GetTotalBytes() int64 {
 	return t.totalBytes
 }
 
-func (t *TaskExtension) Ctx() context.Context {
+func (t *TaskExtension) ReinitCtx() error {
-	if t.ctx == nil {
-		t.ctxInitMutex.Lock()
-		if t.ctx == nil {
-			t.ctx = context.WithValue(t.Base.Ctx(), "user", t.Creator)
-		}
-		t.ctxInitMutex.Unlock()
-	}
-	return t.ctx
-}
-
-func (t *TaskExtension) ReinitCtx() {
-	if !conf.Conf.Tasks.AllowRetryCanceled {
-		return
-	}
 	select {
-	case <-t.Base.Ctx().Done():
+	case <-t.Ctx().Done():
+		if !conf.Conf.Tasks.AllowRetryCanceled {
+			return t.Ctx().Err()
+		}
 		ctx, cancel := context.WithCancel(context.Background())
 		t.SetCtx(ctx)
 		t.SetCancelFunc(cancel)
-		t.ctx = nil
 	default:
 	}
+	return nil
 }
 
 type TaskExtensionInfo interface {

internal/task/manager.go

@@ -1,6 +1,8 @@
 package task
 
-import "github.com/xhofe/tache"
+import (
+	"github.com/xhofe/tache"
+)
 
 type Manager[T tache.Task] interface {
 	Add(task T)

server/common/base.go

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	stdpath "path"
@@ -9,7 +10,7 @@ import (
 	"github.com/OpenListTeam/OpenList/internal/conf"
 )
 
-func GetApiUrl(r *http.Request) string {
+func GetApiUrlFormRequest(r *http.Request) string {
 	api := conf.Conf.SiteURL
 	if strings.HasPrefix(api, "http") {
 		return strings.TrimSuffix(api, "/")
@@ -28,3 +29,11 @@ func GetApiUrl(r *http.Request) string {
 	api = strings.TrimSuffix(api, "/")
 	return api
 }
+
+func GetApiUrl(ctx context.Context) string {
+	val := ctx.Value(conf.ApiUrlKey)
+	if api, ok := val.(string); ok {
+		return api
+	}
+	return ""
+}

server/common/common.go

@@ -1,8 +1,6 @@
 package common
 
 import (
-	"context"
-	"net/http"
 	"strings"
 
 	"github.com/OpenListTeam/OpenList/cmd/flags"
@@ -90,10 +88,3 @@ func Pluralize(count int, singular, plural string) string {
 	}
 	return plural
 }
-
-func GetHttpReq(ctx context.Context) *http.Request {
-	if c, ok := ctx.(*gin.Context); ok {
-		return c.Request
-	}
-	return nil
-}

server/common/proxy.go

@@ -15,7 +15,6 @@ import (
 	"github.com/OpenListTeam/OpenList/internal/stream"
 	"github.com/OpenListTeam/OpenList/pkg/http_range"
 	"github.com/OpenListTeam/OpenList/pkg/utils"
-	log "github.com/sirupsen/logrus"
 )
 
 func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.Obj) error {
@@ -42,7 +41,7 @@ func Proxy(w http.ResponseWriter, r *http.Request, link *model.Link, file model.
 			RangeReadCloserIF: link.RangeReadCloser,
 			Limiter:           stream.ServerDownloadLimit,
 		})
-	} else if link.Concurrency != 0 || link.PartSize != 0 {
+	} else if link.Concurrency > 0 || link.PartSize > 0 {
 		attachHeader(w, file)
 		size := file.GetSize()
 		rangeReader := func(ctx context.Context, httpRange http_range.Range) (io.ReadCloser, error) {
@@ -110,21 +109,16 @@ func GetEtag(file model.Obj) string {
 	return fmt.Sprintf(`"%x-%x"`, file.ModTime().Unix(), file.GetSize())
 }
 
-var NoProxyRange = &model.RangeReadCloser{}
+func ProxyRange(ctx context.Context, link *model.Link, size int64) {
-
-func ProxyRange(link *model.Link, size int64) {
 	if link.MFile != nil {
 		return
 	}
-	if link.RangeReadCloser == nil {
+	if link.RangeReadCloser == nil && !strings.HasPrefix(link.URL, GetApiUrl(ctx)+"/") {
 		var rrc, err = stream.GetRangeReadCloserFromLink(size, link)
 		if err != nil {
-			log.Warnf("ProxyRange error: %s", err)
 			return
 		}
 		link.RangeReadCloser = rrc
-	} else if link.RangeReadCloser == NoProxyRange {
-		link.RangeReadCloser = nil
 	}
 }
 

server/handles/archive.go

@@ -103,7 +103,6 @@ func FsArchiveMeta(c *gin.Context) {
 		LinkArgs: model.LinkArgs{
 			Header: c.Request.Header,
 			Type:   c.Query("type"),
-			HttpReq: c.Request,
 		},
 		Password: req.ArchivePass,
 	}
@@ -132,7 +131,7 @@ func FsArchiveMeta(c *gin.Context) {
 		IsEncrypted: ret.IsEncrypted(),
 		Content:     toContentResp(ret.GetTree()),
 		Sort:        ret.Sort,
-		RawURL:      fmt.Sprintf("%s%s%s", common.GetApiUrl(c.Request), api, utils.EncodePath(reqPath, true)),
+		RawURL:      fmt.Sprintf("%s%s%s", common.GetApiUrl(c), api, utils.EncodePath(reqPath, true)),
 		Sign:        s,
 	})
 }
@@ -183,7 +182,6 @@ func FsArchiveList(c *gin.Context) {
 				LinkArgs: model.LinkArgs{
 					Header: c.Request.Header,
 					Type:   c.Query("type"),
-					HttpReq: c.Request,
 				},
 				Password: req.ArchivePass,
 			},
@@ -268,7 +266,6 @@ func FsArchiveDecompress(c *gin.Context) {
 					LinkArgs: model.LinkArgs{
 						Header: c.Request.Header,
 						Type:   c.Query("type"),
-						HttpReq: c.Request,
 					},
 					Password: req.ArchivePass,
 				},
@@ -314,7 +311,6 @@ func ArchiveDown(c *gin.Context) {
 					IP:       c.ClientIP(),
 					Header:   c.Request.Header,
 					Type:     c.Query("type"),
-					HttpReq:  c.Request,
 					Redirect: true,
 				},
 				Password: password,
@@ -346,7 +342,6 @@ func ArchiveProxy(c *gin.Context) {
 				LinkArgs: model.LinkArgs{
 					Header: c.Request.Header,
 					Type:   c.Query("type"),
-					HttpReq: c.Request,
 				},
 				Password: password,
 			},
@@ -372,7 +367,6 @@ func ArchiveInternalExtract(c *gin.Context) {
 			LinkArgs: model.LinkArgs{
 				Header: c.Request.Header,
 				Type:   c.Query("type"),
-				HttpReq: c.Request,
 			},
 			Password: password,
 		},

server/handles/down.go

@@ -38,7 +38,6 @@ func Down(c *gin.Context) {
 			IP:       c.ClientIP(),
 			Header:   c.Request.Header,
 			Type:     c.Query("type"),
-			HttpReq:  c.Request,
 			Redirect: true,
 		})
 		if err != nil {
@@ -73,7 +72,6 @@ func Proxy(c *gin.Context) {
 		link, file, err := fs.Link(c, rawPath, model.LinkArgs{
 			Header: c.Request.Header,
 			Type:   c.Query("type"),
-			HttpReq: c.Request,
 		})
 		if err != nil {
 			common.ErrorResp(c, err, 500)
@@ -126,7 +124,7 @@ func localProxy(c *gin.Context, link *model.Link, file model.Obj, proxyRange boo
 		}
 	}
 	if proxyRange {
-		common.ProxyRange(link, file.GetSize())
+		common.ProxyRange(c, link, file.GetSize())
 	}
 	Writer := &common.WrittenResponseWriter{ResponseWriter: c.Writer}
 

server/handles/fsmanage.go

@@ -379,13 +379,13 @@ func Link(c *gin.Context) {
 	if storage.Config().OnlyLocal {
 		common.SuccessResp(c, model.Link{
 			URL: fmt.Sprintf("%s/p%s?d&sign=%s",
-				common.GetApiUrl(c.Request),
+				common.GetApiUrl(c),
 				utils.EncodePath(rawPath, true),
 				sign.Sign(rawPath)),
 		})
 		return
 	}
-	link, _, err := fs.Link(c, rawPath, model.LinkArgs{IP: c.ClientIP(), Header: c.Request.Header, HttpReq: c.Request})
+	link, _, err := fs.Link(c, rawPath, model.LinkArgs{IP: c.ClientIP(), Header: c.Request.Header})
 	if err != nil {
 		common.ErrorResp(c, err, 500)
 		return

server/handles/fsread.go

@@ -296,7 +296,7 @@ func FsGet(c *gin.Context) {
 					sign.Sign(reqPath))
 			} else {
 				rawURL = fmt.Sprintf("%s/p%s%s",
-					common.GetApiUrl(c.Request),
+					common.GetApiUrl(c),
 					utils.EncodePath(reqPath, true),
 					query)
 			}
@@ -309,7 +309,6 @@ func FsGet(c *gin.Context) {
 				link, _, err := fs.Link(c, reqPath, model.LinkArgs{
 					IP:       c.ClientIP(),
 					Header:   c.Request.Header,
-					HttpReq:  c.Request,
 					Redirect: true,
 				})
 				if err != nil {

server/handles/ssologin.go

@@ -48,9 +48,9 @@ func verifyState(clientID, ip, state string) bool {
 
 func ssoRedirectUri(c *gin.Context, useCompatibility bool, method string) string {
 	if useCompatibility {
-		return common.GetApiUrl(c.Request) + "/api/auth/" + method
+		return common.GetApiUrl(c) + "/api/auth/" + method
 	} else {
-		return common.GetApiUrl(c.Request) + "/api/auth/sso_callback" + "?method=" + method
+		return common.GetApiUrl(c) + "/api/auth/sso_callback" + "?method=" + method
 	}
 }
 
@@ -236,7 +236,7 @@ func OIDCLoginCallback(c *gin.Context) {
 	}
 	if method == "get_sso_id" {
 		if useCompatibility {
-			c.Redirect(302, common.GetApiUrl(c.Request)+"/@manage?sso_id="+userID)
+			c.Redirect(302, common.GetApiUrl(c)+"/@manage?sso_id="+userID)
 			return
 		}
 		html := fmt.Sprintf(`<!DOCTYPE html>
@@ -263,7 +263,7 @@ func OIDCLoginCallback(c *gin.Context) {
 			common.ErrorResp(c, err, 400)
 		}
 		if useCompatibility {
-			c.Redirect(302, common.GetApiUrl(c.Request)+"/@login?token="+token)
+			c.Redirect(302, common.GetApiUrl(c)+"/@login?token="+token)
 			return
 		}
 		html := fmt.Sprintf(`<!DOCTYPE html>
@@ -364,9 +364,9 @@ func SSOLoginCallback(c *gin.Context) {
 	} else {
 		var redirect_uri string
 		if usecompatibility {
-			redirect_uri = common.GetApiUrl(c.Request) + "/api/auth/" + argument
+			redirect_uri = common.GetApiUrl(c) + "/api/auth/" + argument
 		} else {
-			redirect_uri = common.GetApiUrl(c.Request) + "/api/auth/sso_callback" + "?method=" + argument
+			redirect_uri = common.GetApiUrl(c) + "/api/auth/sso_callback" + "?method=" + argument
 		}
 		resp, err = ssoClient.R().SetHeader("Accept", "application/json").
 			SetFormData(map[string]string{
@@ -401,7 +401,7 @@ func SSOLoginCallback(c *gin.Context) {
 	}
 	if argument == "get_sso_id" {
 		if usecompatibility {
-			c.Redirect(302, common.GetApiUrl(c.Request)+"/@manage?sso_id="+userID)
+			c.Redirect(302, common.GetApiUrl(c)+"/@manage?sso_id="+userID)
 			return
 		}
 		html := fmt.Sprintf(`<!DOCTYPE html>
@@ -429,7 +429,7 @@ func SSOLoginCallback(c *gin.Context) {
 		common.ErrorResp(c, err, 400)
 	}
 	if usecompatibility {
-		c.Redirect(302, common.GetApiUrl(c.Request)+"/@login?token="+token)
+		c.Redirect(302, common.GetApiUrl(c)+"/@login?token="+token)
 		return
 	}
 	html := fmt.Sprintf(`<!DOCTYPE html>

server/handles/webauthn.go

@@ -24,7 +24,7 @@ func BeginAuthnLogin(c *gin.Context) {
 		common.ErrorStrResp(c, "WebAuthn is not enabled", 403)
 		return
 	}
-	authnInstance, err := authn.NewAuthnInstance(c.Request)
+	authnInstance, err := authn.NewAuthnInstance(c)
 	if err != nil {
 		common.ErrorResp(c, err, 400)
 		return
@@ -65,7 +65,7 @@ func FinishAuthnLogin(c *gin.Context) {
 		common.ErrorStrResp(c, "WebAuthn is not enabled", 403)
 		return
 	}
-	authnInstance, err := authn.NewAuthnInstance(c.Request)
+	authnInstance, err := authn.NewAuthnInstance(c)
 	if err != nil {
 		common.ErrorResp(c, err, 400)
 		return
@@ -127,7 +127,7 @@ func BeginAuthnRegistration(c *gin.Context) {
 	}
 	user := c.MustGet("user").(*model.User)
 
-	authnInstance, err := authn.NewAuthnInstance(c.Request)
+	authnInstance, err := authn.NewAuthnInstance(c)
 	if err != nil {
 		common.ErrorResp(c, err, 400)
 	}
@@ -158,7 +158,7 @@ func FinishAuthnRegistration(c *gin.Context) {
 	user := c.MustGet("user").(*model.User)
 	sessionDataString := c.GetHeader("Session")
 
-	authnInstance, err := authn.NewAuthnInstance(c.Request)
+	authnInstance, err := authn.NewAuthnInstance(c)
 	if err != nil {
 		common.ErrorResp(c, err, 400)
 		return

server/middlewares/check.go

@@ -10,9 +10,7 @@ import (
 )
 
 func StoragesLoaded(c *gin.Context) {
-	if conf.StoragesLoaded {
+	if !conf.StoragesLoaded {
-		c.Next()
-	} else {
 		if utils.SliceContains([]string{"", "/", "/favicon.ico"}, c.Request.URL.Path) {
 			c.Next()
 			return
@@ -26,5 +24,8 @@ func StoragesLoaded(c *gin.Context) {
 		}
 		common.ErrorStrResp(c, "Loading storage, please wait", 500)
 		c.Abort()
+		return
 	}
+	c.Set(conf.ApiUrlKey, common.GetApiUrlFormRequest(c.Request))
+	c.Next()
 }

server/webdav.go

@@ -1,7 +1,6 @@
 package server
 
 import (
-	"context"
 	"crypto/subtle"
 	"net/http"
 	"path"
@@ -11,7 +10,6 @@ import (
 	"github.com/OpenListTeam/OpenList/server/middlewares"
 
 	"github.com/OpenListTeam/OpenList/internal/conf"
-	"github.com/OpenListTeam/OpenList/internal/model"
 	"github.com/OpenListTeam/OpenList/internal/op"
 	"github.com/OpenListTeam/OpenList/internal/setting"
 	"github.com/OpenListTeam/OpenList/server/webdav"
@@ -45,9 +43,7 @@ func WebDav(dav *gin.RouterGroup) {
 }
 
 func ServeWebDAV(c *gin.Context) {
-	user := c.MustGet("user").(*model.User)
+	handler.ServeHTTP(c.Writer, c.Request.WithContext(c))
-	ctx := context.WithValue(c.Request.Context(), "user", user)
-	handler.ServeHTTP(c.Writer, c.Request.WithContext(ctx))
 }
 
 func WebDAVAuth(c *gin.Context) {

server/webdav/webdav.go

@@ -241,12 +241,12 @@ func (h *Handler) handleGetHeadPost(w http.ResponseWriter, r *http.Request) (sta
 	storage, _ := fs.GetStorage(reqPath, &fs.GetStoragesArgs{})
 	downProxyUrl := storage.GetStorage().DownProxyUrl
 	if storage.GetStorage().WebdavNative() || (storage.GetStorage().WebdavProxy() && downProxyUrl == "") {
-		link, _, err := fs.Link(ctx, reqPath, model.LinkArgs{Header: r.Header, HttpReq: r})
+		link, _, err := fs.Link(ctx, reqPath, model.LinkArgs{Header: r.Header})
 		if err != nil {
 			return http.StatusInternalServerError, err
 		}
 		if storage.GetStorage().ProxyRange {
-			common.ProxyRange(link, fi.GetSize())
+			common.ProxyRange(ctx, link, fi.GetSize())
 		}
 		err = common.Proxy(w, r, link, fi)
 		if err != nil {
@@ -260,7 +260,7 @@ func (h *Handler) handleGetHeadPost(w http.ResponseWriter, r *http.Request) (sta
 		w.Header().Set("Cache-Control", "max-age=0, no-cache, no-store, must-revalidate")
 		http.Redirect(w, r, u, http.StatusFound)
 	} else {
-		link, _, err := fs.Link(ctx, reqPath, model.LinkArgs{IP: utils.ClientIP(r), Header: r.Header, HttpReq: r, Redirect: true})
+		link, _, err := fs.Link(ctx, reqPath, model.LinkArgs{IP: utils.ClientIP(r), Header: r.Header, Redirect: true})
 		if err != nil {
 			return http.StatusInternalServerError, err
 		}