fix(cluster): invalidate current refreshed generation

Author: ironbox

drivers/115_open/driver.go

@@ -58,10 +58,8 @@ func (d *Open115) GetAddition() driver.Additional {
 
 func (d *Open115) Init(ctx context.Context) error {
 	// This client generation can finish an old request after cluster recovery has
-	// replaced the storage. Bind auth callbacks to the Addition that configured
-	// this client so an old 401 cannot revoke the newly installed pair.
-	observedAddition := d.Storage.Addition
-	observedModified := d.Storage.Modified
+	// replaced the storage. The SDK reports the exact access token used by each
+	// success/failure so callbacks can bind to the current generation.
 	observedAccessToken := d.Addition.AccessToken
 	d.client = new115SDKClient(sdk.WithRefreshToken(d.Addition.RefreshToken),
 		sdk.WithAccessToken(d.Addition.AccessToken),
@@ -91,9 +89,13 @@ func (d *Open115) Init(ctx context.Context) error {
 				op.NotifyStorageTokenValidWithSnapshot(d, currentAddition, currentModified)
 			}
 		}),
-		sdk.WithOnTokenInvalid(func() {
+		sdk.WithOnAccessTokenInvalid(func(accessToken string) {
+			st := d.GetStorage()
+			if st == nil || d.Addition.AccessToken != accessToken {
+				return
+			}
 			if d.tokenInvalid.CompareAndSwap(false, true) {
-				op.NotifyStorageTokenInvalidWithSnapshot(d, observedAddition, observedModified)
+				op.NotifyStorageTokenInvalidWithSnapshot(d, st.Addition, st.Modified)
 			}
 		}))
 	applySDKProxyIfConfigured(d.client)

drivers/115_open/driver_test.go

@@ -11,6 +11,7 @@ import (
 	"slices"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -326,6 +327,7 @@ func TestOpen115RefreshRestoresErrorStateAndPublishesNewPair(t *testing.T) {
 	db.Init(database)
 
 	var refreshCount int
+	var rejectFresh atomic.Bool
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.URL.Path {
 		case "/open/refreshToken":
@@ -344,6 +346,10 @@ func TestOpen115RefreshRestoresErrorStateAndPublishesNewPair(t *testing.T) {
 				writeSDKError(t, w, 40140125, "access_token invalid")
 				return
 			}
+			if rejectFresh.Load() {
+				writeSDKError(t, w, 40140120, "refresh token error")
+				return
+			}
 			writeSDKSuccess(t, w, map[string]any{})
 		default:
 			t.Fatalf("unexpected path: %s", r.URL.Path)
@@ -416,6 +422,24 @@ func TestOpen115RefreshRestoresErrorStateAndPublishesNewPair(t *testing.T) {
 	case <-time.After(time.Second):
 		t.Fatal("refreshed and proven pair was not published")
 	}
+
+	// The same long-lived driver may fail hours after refreshing. The invalid
+	// callback must bind to fresh-access, not the pre-refresh generation that
+	// configured the client.
+	rejectFresh.Store(true)
+	if _, err := driver.client.UserInfo(context.Background()); err == nil {
+		t.Fatal("expected the refreshed generation to become invalid")
+	}
+	if driver.Storage.Status == op.WORK {
+		t.Fatal("refreshed generation 401 did not invalidate the mounted storage")
+	}
+	persisted, err = db.GetStorageById(storage.ID)
+	if err != nil {
+		t.Fatalf("GetStorageById after invalidation failed: %v", err)
+	}
+	if persisted.Status == op.WORK {
+		t.Fatal("refreshed generation 401 was not persisted for peer recovery")
+	}
 }
 
 func newTestOpen115(t *testing.T, removeWay string, responder http.HandlerFunc) (*Open115, func() []recordedRequest) {

go.mod

@@ -311,6 +311,6 @@ replace github.com/ProtonMail/go-proton-api => github.com/henrybear327/go-proton
 
 replace github.com/cronokirby/saferith => github.com/Da3zKi7/saferith v0.33.0-fixed
 
-replace github.com/OpenListTeam/115-sdk-go => github.com/Ironboxplus/115-sdk-go v0.2.14
+replace github.com/OpenListTeam/115-sdk-go => github.com/Ironboxplus/115-sdk-go v0.2.15
 
 replace github.com/KarpelesLab/reflink => github.com/OpenListTeam/reflink v0.0.0-20260520031008-ed3c0dbe8009

go.sum

@@ -27,6 +27,8 @@ github.com/Ironboxplus/115-sdk-go v0.2.13 h1:B815N2mOq2lF2QDyANnkZW3mpmFM7xrBJrq
 github.com/Ironboxplus/115-sdk-go v0.2.13/go.mod h1:cfvitk2lwe6036iNi2h+iNxwxWDifKZsSvNtrur5BqU=
 github.com/Ironboxplus/115-sdk-go v0.2.14 h1:BN1FjRDbJ/UQiwWwO6mbfoU52L9/46l5oHbyEcWDhSI=
 github.com/Ironboxplus/115-sdk-go v0.2.14/go.mod h1:cfvitk2lwe6036iNi2h+iNxwxWDifKZsSvNtrur5BqU=
+github.com/Ironboxplus/115-sdk-go v0.2.15 h1:GEFamzPCINsB2aRxjcQyvsqC0SmXuQ6H417Ga7BKUII=
+github.com/Ironboxplus/115-sdk-go v0.2.15/go.mod h1:cfvitk2lwe6036iNi2h+iNxwxWDifKZsSvNtrur5BqU=
 github.com/KirCute/zip v1.0.1 h1:L/tVZglOiDVKDi9Ud+fN49htgKdQ3Z0H80iX8OZk13c=
 github.com/KirCute/zip v1.0.1/go.mod h1:xhF7dCB+Bjvy+5a56lenYCKBsH+gxDNPZSy5Cp+nlXk=
 github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=