feat(webdav): redirect direct uploads

- Redirect eligible WebDAV PUT requests to single direct upload URLs.

- Force direct upload max parts to one for WebDAV redirects.

Signed-off-by: Ariel Yu <ariel@ariels.xyz>

Author: Arielfoever

drivers/s3/driver.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/OpenListTeam/OpenList/v4/internal/conf"
 	"github.com/OpenListTeam/OpenList/v4/internal/driver"
 	"github.com/OpenListTeam/OpenList/v4/internal/errs"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
@@ -228,16 +229,19 @@ func (d *S3) GetDirectUploadInfo(ctx context.Context, _ string, dstDir model.Obj
 	if !d.EnableDirectUpload {
 		return nil, errs.NotImplement
 	}
+	if maxParts, ok := ctx.Value(conf.DirectUploadMaxPartsKey).(int64); ok {
+		return d.getDirectUploadInfo(ctx, dstDir, fileName, fileSize, maxParts)
+	}
 	if d.DirectUploadMaxParts == 0 {
 		d.DirectUploadMaxParts = maxCopyParts
 	}
-	return d.getDirectUploadInfo(ctx, dstDir, fileName, fileSize)
+	return d.getDirectUploadInfo(ctx, dstDir, fileName, fileSize, d.DirectUploadMaxParts)
 }
 
-func (d *S3) getDirectUploadInfo(ctx context.Context, dstDir model.Obj, fileName string, fileSize int64) (any, error) {
+func (d *S3) getDirectUploadInfo(ctx context.Context, dstDir model.Obj, fileName string, fileSize, maxParts int64) (any, error) {
 	path := getKey(stdpath.Join(dstDir.GetPath(), fileName), false)
-	if d.DirectUploadMaxParts > 1 && fileSize > minMultipartUploadPartSize {
-		return d.getMultipartDirectUploadInfo(ctx, path, fileSize)
+	if maxParts > 1 && fileSize > minMultipartUploadPartSize {
+		return d.getMultipartDirectUploadInfo(ctx, path, fileSize, maxParts)
 	}
 	req, _ := d.directUploadClient.PutObjectRequest(&s3.PutObjectInput{
 		Bucket: &d.Bucket,
@@ -256,8 +260,8 @@ func (d *S3) getDirectUploadInfo(ctx context.Context, dstDir model.Obj, fileName
 	}, nil
 }
 
-func (d *S3) getMultipartDirectUploadInfo(ctx context.Context, key string, fileSize int64) (*model.S3MultipartDirectUploadInfo, error) {
-	partSize, err := getMultipartUploadPartSize(fileSize, d.DirectUploadMaxParts)
+func (d *S3) getMultipartDirectUploadInfo(ctx context.Context, key string, fileSize, maxParts int64) (*model.S3MultipartDirectUploadInfo, error) {
+	partSize, err := getMultipartUploadPartSize(fileSize, maxParts)
 	if err != nil {
 		return nil, err
 	}

drivers/s3/util_test.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/OpenListTeam/OpenList/v4/internal/conf"
 	"github.com/OpenListTeam/OpenList/v4/internal/model"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
@@ -283,6 +284,34 @@ func TestGetDirectUploadInfoUsesSinglePutWhenMultipartMaxPartsIsOne(t *testing.T
 	}
 }
 
+func TestGetDirectUploadInfoHonorsContextMaxPartsOverride(t *testing.T) {
+	const fileSize = 25 * 1024 * 1024
+	putRequests := 0
+	d := newTestS3Driver(t, func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPut || r.URL.Query().Get("uploadId") != "" {
+			t.Errorf("unexpected request: %s %s", r.Method, r.URL.String())
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+		putRequests++
+		w.WriteHeader(http.StatusOK)
+	})
+	d.EnableDirectUpload = true
+	d.DirectUploadMaxParts = 10000
+	ctx := context.WithValue(context.Background(), conf.DirectUploadMaxPartsKey, int64(1))
+
+	info, err := d.GetDirectUploadInfo(ctx, "HttpDirect", &model.Object{Path: "/"}, "large-file", fileSize)
+	if err != nil {
+		t.Fatalf("GetDirectUploadInfo: %v", err)
+	}
+	if _, ok := info.(*model.HttpDirectUploadInfo); !ok {
+		t.Fatalf("upload info type = %T, want HttpDirectUploadInfo", info)
+	}
+	if putRequests != 0 {
+		t.Fatalf("PutObject was executed while presigning, requests = %d", putRequests)
+	}
+}
+
 func TestDirectMultipartUploadCompletesWithUploadedPartETags(t *testing.T) {
 	const fileSize = 25 * 1024 * 1024
 	uploadedParts := make(map[string]string)

internal/conf/const.go

@@ -191,4 +191,5 @@ const (
 	PathKey
 	SharingIDKey
 	SkipHookKey
+	DirectUploadMaxPartsKey
 )

server/webdav/webdav.go

@@ -337,7 +337,11 @@ func (h *Handler) handleDelete(w http.ResponseWriter, r *http.Request) (status i
 }
 
 func (h *Handler) handlePut(w http.ResponseWriter, r *http.Request) (status int, err error) {
+	drainBody := true
 	defer func() {
+		if !drainBody {
+			return
+		}
 		if n, _ := io.ReadFull(r.Body, []byte{0}); n == 1 {
 			_, _ = utils.CopyWithBuffer(io.Discard, r.Body)
 		}
@@ -394,6 +398,12 @@ func (h *Handler) handlePut(w http.ResponseWriter, r *http.Request) (status int,
 	if !common.CanWrite(user, parentMeta, parentPath) {
 		return http.StatusForbidden, errs.PermissionDenied
 	}
+	if redirectURL, ok := directPutRedirectURL(ctx, reqPath, size); ok {
+		drainBody = false
+		w.Header().Set("Cache-Control", "no-store")
+		http.Redirect(w, r, redirectURL, http.StatusTemporaryRedirect)
+		return 0, nil
+	}
 	fsStream := &stream.FileStream{
 		Obj:      &obj,
 		Reader:   r.Body,
@@ -423,6 +433,45 @@ func (h *Handler) handlePut(w http.ResponseWriter, r *http.Request) (status int,
 	return http.StatusCreated, nil
 }
 
+func directPutRedirectURL(ctx context.Context, reqPath string, size int64) (string, bool) {
+	if size < 0 {
+		return "", false
+	}
+	storage, dstDirActualPath, err := op.GetStorageAndActualPath(path.Dir(reqPath))
+	if err != nil || storage.Config().NoUpload {
+		return "", false
+	}
+	ctx = context.WithValue(ctx, conf.DirectUploadMaxPartsKey, int64(1))
+	info, err := op.GetDirectUploadInfo(ctx, "HttpDirect", storage, dstDirActualPath, path.Base(reqPath), size, true)
+	if err != nil {
+		return "", false
+	}
+	httpInfo, ok := asHTTPDirectUploadInfo(info)
+	if !ok {
+		return "", false
+	}
+	method := httpInfo.Method
+	if method == "" {
+		method = http.MethodPut
+	}
+	if !strings.EqualFold(method, http.MethodPut) || httpInfo.UploadURL == "" ||
+		httpInfo.ChunkSize > 0 || len(httpInfo.Headers) > 0 {
+		return "", false
+	}
+	return httpInfo.UploadURL, true
+}
+
+func asHTTPDirectUploadInfo(info any) (*model.HttpDirectUploadInfo, bool) {
+	switch v := info.(type) {
+	case *model.HttpDirectUploadInfo:
+		return v, v != nil
+	case model.HttpDirectUploadInfo:
+		return &v, true
+	default:
+		return nil, false
+	}
+}
+
 func (h *Handler) handleMkcol(w http.ResponseWriter, r *http.Request) (status int, err error) {
 	reqPath, status, err := h.stripPrefix(r.URL.Path)
 	if err != nil {