fix(aliyundrive): device session signature error (#3398)

* fix signature

* fix: indent-error-flow [skip ci]

drivers/aliyundrive/driver.go

@@ -3,7 +3,6 @@ package aliyundrive
 import (
 	"bytes"
 	"context"
-	"crypto/ecdsa"
 	"crypto/sha1"
 	"encoding/base64"
 	"encoding/hex"
@@ -33,11 +32,6 @@ type AliDrive struct {
 	cron        *cron.Cron
 	DriveId     string
 	UserID      string
-
-	signature  string
-	nonce      int
-	privateKey *ecdsa.PrivateKey
-	cron2      *cron.Cron
 }
 
 func (d *AliDrive) Config() driver.Config {
@@ -69,39 +63,28 @@ func (d *AliDrive) Init(ctx context.Context) error {
 			log.Errorf("%+v", err)
 		}
 	})
-
+	if global.Has(d.UserID) {
-	// init deviceID
+		return nil
-	if len(d.DeviceID) < 64 {
-		d.DeviceID = utils.GetSHA256Encode(d.DeviceID)
 	}
-
+	// init deviceID
+	deviceID := utils.GetSHA256Encode(d.UserID)
 	// init privateKey
-	d.privateKey, _ = NewPrivateKey()
+	privateKey, _ := NewPrivateKeyFromHex(deviceID)
-
+	state := State{
+		nonce:      -1,
+		privateKey: privateKey,
+		deviceID:   deviceID,
+	}
+	// store state
+	global.Store(d.UserID, &state)
 	// init signature
-	d.sign()
+	return d.reSign()
-	d.createSession()
-	d.cron2 = cron.NewCron(time.Minute * 5)
-	d.cron2.Do(func() {
-		d.nonce++
-		d.sign()
-		err := d.renewSession()
-		if d.nonce >= 1073741823 || (err != nil && err.Error() == "device session signature error") {
-			d.nonce = 0
-			d.sign()
-			d.createSession()
-		}
-	})
-	return err
 }
 
 func (d *AliDrive) Drop(ctx context.Context) error {
 	if d.cron != nil {
 		d.cron.Stop()
 	}
-	if d.cron2 != nil {
-		d.cron2.Stop()
-	}
 	return nil
 }
 

drivers/aliyundrive/global.go

@@ -0,0 +1,16 @@
+package aliyundrive
+
+import (
+	"crypto/ecdsa"
+
+	"github.com/alist-org/alist/v3/pkg/generic_sync"
+)
+
+type State struct {
+	deviceID   string
+	signature  string
+	nonce      int
+	privateKey *ecdsa.PrivateKey
+}
+
+var global = generic_sync.MapOf[string, *State]{}

drivers/aliyundrive/meta.go

@@ -7,8 +7,8 @@ import (
 
 type Addition struct {
 	driver.RootID
-	RefreshToken   string `json:"refresh_token" required:"true"`
+	RefreshToken string `json:"refresh_token" required:"true"`
-	DeviceID       string `json:"device_id" required:"true"`
+	//DeviceID       string `json:"device_id" required:"true"`
 	OrderBy        string `json:"order_by" type:"select" options:"name,size,updated_at,created_at"`
 	OrderDirection string `json:"order_direction" type:"select" options:"ASC,DESC"`
 	RapidUpload    bool   `json:"rapid_upload"`

drivers/aliyundrive/util.go

@@ -13,15 +13,20 @@ import (
 	"github.com/dustinxie/ecc"
 	"github.com/go-resty/resty/v2"
 	"github.com/google/uuid"
+	log "github.com/sirupsen/logrus"
 )
 
 func (d *AliDrive) createSession() error {
+	state, ok := global.Load(d.UserID)
+	if !ok {
+		return fmt.Errorf("can't load user state, user_id: %s", d.UserID)
+	}
 	_, err, _ := d.request("https://api.aliyundrive.com/users/v1/users/device/create_session", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"deviceName":   "samsung",
 			"modelName":    "SM-G9810",
-			"nonce":        d.nonce,
+			"nonce":        state.nonce,
-			"pubKey":       PublicKeyToHex(&d.privateKey.PublicKey),
+			"pubKey":       PublicKeyToHex(&state.privateKey.PublicKey),
 			"refreshToken": d.RefreshToken,
 		})
 	}, nil)
@@ -34,11 +39,38 @@ func (d *AliDrive) renewSession() error {
 }
 
 func (d *AliDrive) sign() {
+	state, ok := global.Load(d.UserID)
+	if !ok {
+		log.Errorf("can't load user state, user_id: %s", d.UserID)
+		return
+	}
 	secpAppID := "5dde4e1bdf9e4966b387ba58f4b3fdc3"
-	singdata := fmt.Sprintf("%s:%s:%s:%d", secpAppID, d.DeviceID, d.UserID, d.nonce)
+	singdata := fmt.Sprintf("%s:%s:%s:%d", secpAppID, state.deviceID, d.UserID, state.nonce)
 	hash := sha256.Sum256([]byte(singdata))
-	data, _ := ecc.SignBytes(d.privateKey, hash[:], ecc.RecID|ecc.LowerS)
+	data, _ := ecc.SignBytes(state.privateKey, hash[:], ecc.RecID|ecc.LowerS)
-	d.signature = hex.EncodeToString(data)
+	state.signature = hex.EncodeToString(data)
+}
+
+func (d *AliDrive) reSign() error {
+	state, ok := global.Load(d.UserID)
+	if !ok {
+		return fmt.Errorf("can't load user state, user_id: %s", d.UserID)
+	}
+	state.nonce++
+	if state.nonce >= 1073741823 {
+		state.nonce = 0
+	}
+	d.sign()
+	if state.nonce == 0 {
+		return d.createSession()
+	}
+	err := d.renewSession()
+	if err != nil && err.Error() == "device session signature error" {
+		state.nonce = 0
+		d.sign()
+		return d.createSession()
+	}
+	return nil
 }
 
 // do others that not defined in Driver interface
@@ -69,15 +101,23 @@ func (d *AliDrive) refreshToken() error {
 
 func (d *AliDrive) request(url, method string, callback base.ReqCallback, resp interface{}) ([]byte, error, RespErr) {
 	req := base.RestyClient.R()
+	state, ok := global.Load(d.UserID)
+	if !ok {
+		if url == "https://api.aliyundrive.com/v2/user/get" {
+			state = &State{}
+		} else {
+			return nil, fmt.Errorf("can't load user state, user_id: %s", d.UserID), RespErr{}
+		}
+	}
 	req.SetHeaders(map[string]string{
 		"Authorization": "Bearer\t" + d.AccessToken,
 		"content-type":  "application/json",
 		"origin":        "https://www.aliyundrive.com",
 		"Referer":       "https://aliyundrive.com/",
-		"X-Signature":   d.signature,
+		"X-Signature":   state.signature,
 		"x-request-id":  uuid.NewString(),
 		"X-Canary":      "client=Android,app=adrive,version=v4.1.0",
-		"X-Device-Id":   d.DeviceID,
+		"X-Device-Id":   state.deviceID,
 	})
 	if callback != nil {
 		callback(req)
@@ -94,14 +134,21 @@ func (d *AliDrive) request(url, method string, callback base.ReqCallback, resp i
 		return nil, err, e
 	}
 	if e.Code != "" {
-		if e.Code == "AccessTokenInvalid" {
+		switch e.Code {
+		case "AccessTokenInvalid":
 			err = d.refreshToken()
 			if err != nil {
 				return nil, err, e
 			}
-			return d.request(url, method, callback, resp)
+		case "DeviceSessionSignatureInvalid":
+			err = d.reSign()
+			if err != nil {
+				return nil, err, e
+			}
+		default:
+			return nil, errors.New(e.Message), e
 		}
-		return nil, errors.New(e.Message), e
+		return d.request(url, method, callback, resp)
 	} else if res.IsError() {
 		return nil, errors.New("bad status code " + res.Status()), e
 	}