feat(onedrive_sharelink): support direct download redirects (#2591)

fix(onedrive_sharelink): support direct download redirects

Resolve SharePoint item metadata to obtain @content.downloadUrl for redirect downloads.

Co-authored-by: syscc <syscc@users.noreply.github.com>
Co-authored-by: Codex <codex@openai.com>

Author: syscc

drivers/onedrive_sharelink/driver.go

@@ -2,6 +2,7 @@ package onedrive_sharelink
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -21,7 +22,10 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-const headerTTL = 25 * time.Minute
+const (
+	headerTTL     = 25 * time.Minute
+	directLinkTTL = 20 * time.Minute
+)
 
 type OnedriveSharelink struct {
 	model.Storage
@@ -99,6 +103,18 @@ func (d *OnedriveSharelink) Link(ctx context.Context, file model.Obj, args model
 		return nil, err
 	}
 
+	if args.Redirect {
+		directURL, err := d.resolveDirectDownloadURL(ctx, file, url, header)
+		if err != nil {
+			return nil, err
+		}
+		expiration := directLinkTTL
+		return &model.Link{
+			URL:        directURL,
+			Expiration: &expiration,
+		}, nil
+	}
+
 	return &model.Link{
 		URL:    url,
 		Header: header,
@@ -194,6 +210,96 @@ func cloneHeader(header http.Header) http.Header {
 	return header.Clone()
 }
 
+func (d *OnedriveSharelink) resolveDirectDownloadURL(ctx context.Context, file model.Obj, rawURL string, header http.Header) (string, error) {
+	var errs []error
+	if obj, ok := unwrapObject(file); ok {
+		if obj.SPItemURL != "" {
+			directURL, err := d.resolveSPItemDownloadURL(ctx, obj.SPItemURL, header)
+			if err == nil {
+				return directURL, nil
+			}
+			errs = append(errs, err)
+		}
+		if obj.ContentDownloadURL != "" {
+			return obj.ContentDownloadURL, nil
+		}
+	}
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, rawURL, nil)
+	if err != nil {
+		return "", err
+	}
+	req.Header = cloneHeader(header)
+	if req.Header == nil {
+		req.Header = http.Header{}
+	}
+
+	resp, err := NewNoRedirectCLient().Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	location := resp.Header.Get("Location")
+	if location == "" {
+		errs = append(errs, fmt.Errorf("download.aspx returned no redirect location, status code: %d", resp.StatusCode))
+		return "", fmt.Errorf("onedrive_sharelink: direct download URL unavailable: %v", errs)
+	}
+	u, err := req.URL.Parse(location)
+	if err != nil {
+		return "", err
+	}
+	return u.String(), nil
+}
+
+type spItemDownloadResp struct {
+	ContentDownloadURL string `json:"@content.downloadUrl"`
+}
+
+func unwrapObject(obj model.Obj) (*Object, bool) {
+	for {
+		switch o := obj.(type) {
+		case *Object:
+			return o, true
+		case model.ObjUnwrap:
+			obj = o.Unwrap()
+		default:
+			return nil, false
+		}
+	}
+}
+
+func (d *OnedriveSharelink) resolveSPItemDownloadURL(ctx context.Context, spItemURL string, header http.Header) (string, error) {
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, spItemURL, nil)
+	if err != nil {
+		return "", err
+	}
+	req.Header = cloneHeader(header)
+	if req.Header == nil {
+		req.Header = http.Header{}
+	}
+	req.Header.Set("Accept", "application/json;odata.metadata=minimal")
+
+	resp, err := NewNoRedirectCLient().Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		return "", fmt.Errorf("sp item metadata request failed, status code: %d", resp.StatusCode)
+	}
+
+	var data spItemDownloadResp
+	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
+		return "", err
+	}
+	if data.ContentDownloadURL == "" {
+		return "", fmt.Errorf("sp item metadata response missing @content.downloadUrl")
+	}
+	return data.ContentDownloadURL, nil
+}
+
 func (d *OnedriveSharelink) headerSnapshot() http.Header {
 	d.headerMu.RLock()
 	defer d.headerMu.RUnlock()

drivers/onedrive_sharelink/meta.go

@@ -19,7 +19,6 @@ type Addition struct {
 
 var config = driver.Config{
 	Name:        "Onedrive Sharelink",
-	OnlyProxy:   true,
 	NoUpload:    true,
 	DefaultRoot: "/",
 }

drivers/onedrive_sharelink/types.go

@@ -23,30 +23,42 @@ type FolderResp struct {
 
 // Item represents an individual item in the folder.
 type Item struct {
-	ObjType      string    `json:"FSObjType"`       // ObjType indicates if the item is a file or folder.
-	Name         string    `json:"FileLeafRef"`     // Name is the name of the item.
-	ModifiedTime time.Time `json:"Modified."`       // ModifiedTime is the last modified time of the item.
-	Size         string    `json:"File_x0020_Size"` // Size is the size of the item in string format.
-	Id           string    `json:"UniqueId"`        // Id is the unique identifier of the item.
+	ObjType            string    `json:"FSObjType"`            // ObjType indicates if the item is a file or folder.
+	Name               string    `json:"FileLeafRef"`          // Name is the name of the item.
+	ModifiedTime       time.Time `json:"Modified."`            // ModifiedTime is the last modified time of the item.
+	Size               string    `json:"File_x0020_Size"`      // Size is the size of the item in string format.
+	Id                 string    `json:"UniqueId"`             // Id is the unique identifier of the item.
+	SPItemURL          string    `json:".spItemUrl"`           // SPItemURL points to the SharePoint item metadata API.
+	ContentDownloadURL string    `json:"@content.downloadUrl"` // ContentDownloadURL is a temporary cookie-free download URL.
 }
 
-// fileToObj converts an Item to an ObjThumb.
-func fileToObj(f Item) *model.ObjThumb {
+type Object struct {
+	model.ObjThumb
+	SPItemURL          string
+	ContentDownloadURL string
+}
+
+// fileToObj converts an Item to an Object.
+func fileToObj(f Item) *Object {
 	// Convert Size from string to int64.
 	size, _ := strconv.ParseInt(f.Size, 10, 64)
 	// Convert ObjType from string to int.
 	objtype, _ := strconv.Atoi(f.ObjType)
 
 	// Create a new ObjThumb with the converted values.
-	file := &model.ObjThumb{
-		Object: model.Object{
-			Name:     f.Name,
-			Modified: f.ModifiedTime,
-			Size:     size,
-			IsFolder: objtype == 1, // Check if the item is a folder.
-			ID:       f.Id,
+	file := &Object{
+		ObjThumb: model.ObjThumb{
+			Object: model.Object{
+				Name:     f.Name,
+				Modified: f.ModifiedTime,
+				Size:     size,
+				IsFolder: objtype == 1, // Check if the item is a folder.
+				ID:       f.Id,
+			},
+			Thumbnail: model.Thumbnail{},
 		},
-		Thumbnail: model.Thumbnail{},
+		SPItemURL:          f.SPItemURL,
+		ContentDownloadURL: f.ContentDownloadURL,
 	}
 	return file
 }