protondrive: name the remote to reconnect when the session expires or is signed out
An expired session, or one signed out with "rclone config disconnect" while a long running rclone was using it, told the user to reconnect a remote literally called "remote:". The error now names the remote. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
6065801968
commit
59f0f31b34
4 files changed
+38
-10
No files matched your search
@@ -513,6 +513,7 @@ func connect(ctx context.Context, name string, s *session, opt *Options) (*clien
|
||||
}
|
||||
canSignIn := opt.Username != "" && opt.Password != ""
|
||||
reconnect := fmt.Sprintf(`run "rclone config reconnect %s:"`, name)
|
||||
s.reconnect = reconnect
|
||||
saved := s.current()
|
||||
if saved.UID != "" && saved.AccessToken != "" && saved.RefreshToken != "" && saved.KeyPassword != "" {
|
||||
c, err := newClient(ctx, s, copt)
|
||||
@@ -522,7 +523,8 @@ func connect(ctx context.Context, name string, s *session, opt *Options) (*clien
|
||||
case !errors.Is(err, errSessionExpired):
|
||||
return nil, err
|
||||
case !canSignIn:
|
||||
return nil, fserrors.FatalError(fmt.Errorf("the saved session can't be used: %s: %w", reconnect, err))
|
||||
// err says how to reconnect.
|
||||
return nil, fserrors.FatalError(fmt.Errorf("the saved session can't be used: %w", err))
|
||||
}
|
||||
fs.Debugf(nil, "protondrive: the saved session has expired")
|
||||
} else if !canSignIn {
|
||||
|
||||
@@ -521,13 +521,28 @@ func TestDisconnect(t *testing.T) {
|
||||
|
||||
_, err := f.List(ctx, "")
|
||||
require.Error(t, err)
|
||||
assert.Contains(t, err.Error(), "rclone config reconnect")
|
||||
assert.Contains(t, err.Error(), `rclone config reconnect test:`)
|
||||
_, err = readObject(t, o)
|
||||
require.Error(t, err)
|
||||
assert.Contains(t, err.Error(), "rclone config reconnect")
|
||||
assert.Contains(t, err.Error(), `rclone config reconnect test:`)
|
||||
_, err = f.Put(ctx, bytes.NewReader([]byte("x")), object.NewStaticObjectInfo("b.txt", time.Now(), 1, true, nil, nil))
|
||||
require.Error(t, err)
|
||||
assert.Contains(t, err.Error(), "rclone config reconnect")
|
||||
assert.Contains(t, err.Error(), `rclone config reconnect test:`)
|
||||
}
|
||||
|
||||
func TestSessionExpiredNamesRemote(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
srv := protontest.New(t)
|
||||
u := srv.AddUser("user", "pass")
|
||||
m := sessionConfig(srv, u)
|
||||
f := newTestFs(t, m)
|
||||
f.c.s.adoptWait = 0
|
||||
srv.RevokeSession(m["client_uid"])
|
||||
|
||||
_, err := f.List(ctx, "")
|
||||
require.ErrorIs(t, err, errSessionExpired)
|
||||
assert.Contains(t, err.Error(), `rclone config reconnect test:`)
|
||||
assert.NotContains(t, err.Error(), "remote:")
|
||||
}
|
||||
|
||||
func TestTrashedBehindTheFsBack(t *testing.T) {
|
||||
|
||||
@@ -26,11 +26,11 @@ import (
|
||||
|
||||
// errSessionExpired is returned when the session can no longer be
|
||||
// refreshed and the user must sign in again.
|
||||
var errSessionExpired = errors.New(`session expired: run "rclone config reconnect remote:"`)
|
||||
var errSessionExpired = errors.New("session expired")
|
||||
|
||||
// errNotSignedIn is returned by an authenticated call of a session
|
||||
// which has no credentials, as after signing out.
|
||||
var errNotSignedIn = errors.New(`not signed in: run "rclone config reconnect remote:"`)
|
||||
var errNotSignedIn = errors.New("not signed in")
|
||||
|
||||
// errCaptcha is returned by password sign-in when Proton asks for human
|
||||
// verification, which only its sign-in page can do.
|
||||
@@ -134,6 +134,7 @@ type session struct {
|
||||
store credentialStore
|
||||
adoptWait time.Duration // how long a rejected refresh waits for the store to change
|
||||
unlockHook func() // if set, called by loadAccount while unlockMu is held; for tests
|
||||
reconnect string // if set, ends errors which need the user to sign in again, saying how
|
||||
|
||||
refreshMu sync.Mutex // held while refreshing, so one refresh runs at a time
|
||||
|
||||
@@ -203,7 +204,7 @@ func (s *session) serverTime() time.Time {
|
||||
func (s *session) call(ctx context.Context, opts *rest.Opts, request, response any) (*http.Response, error) {
|
||||
creds := s.current()
|
||||
if creds.UID == "" {
|
||||
return nil, fserrors.FatalError(errNotSignedIn)
|
||||
return nil, s.signInNeeded(errNotSignedIn)
|
||||
}
|
||||
resp, err := s.do(ctx, opts, request, response, &creds)
|
||||
var apiErr *api.Error
|
||||
@@ -309,7 +310,7 @@ func (s *session) refresh(ctx context.Context, rejected string) error {
|
||||
dead := cur.RefreshToken == "" || cur.RefreshToken == s.deadRefresh
|
||||
s.mu.Unlock()
|
||||
if dead {
|
||||
return fserrors.FatalError(errSessionExpired)
|
||||
return s.signInNeeded(errSessionExpired)
|
||||
}
|
||||
|
||||
fs.Debugf(nil, "protondrive: refreshing session")
|
||||
@@ -334,7 +335,7 @@ func (s *session) refresh(ctx context.Context, rejected string) error {
|
||||
s.mu.Lock()
|
||||
s.deadRefresh = cur.RefreshToken
|
||||
s.mu.Unlock()
|
||||
return fserrors.FatalError(fmt.Errorf("%w: %w", errSessionExpired, err))
|
||||
return s.signInNeeded(fmt.Errorf("%w: %w", errSessionExpired, err))
|
||||
}
|
||||
return fmt.Errorf("refresh session: %w", err)
|
||||
}
|
||||
@@ -354,6 +355,15 @@ func (s *session) refresh(ctx context.Context, rejected string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// signInNeeded returns err, which the user can only fix by signing in
|
||||
// again, as a fatal error ending with s.reconnect.
|
||||
func (s *session) signInNeeded(err error) error {
|
||||
if s.reconnect != "" {
|
||||
err = fmt.Errorf("%w: %s", err, s.reconnect)
|
||||
}
|
||||
return fserrors.FatalError(err)
|
||||
}
|
||||
|
||||
// waitForStoredRefresh polls the store for up to s.adoptWait for a
|
||||
// refresh token other than spent and returns those credentials. It
|
||||
// returns false if none appears or ctx is done.
|
||||
|
||||
@@ -240,6 +240,7 @@ func TestSessionRevoked(t *testing.T) {
|
||||
srv := protontest.New(t)
|
||||
s, store, tokens := newTestSession(t, srv)
|
||||
s.adoptWait = 50 * time.Millisecond
|
||||
s.reconnect = `run "rclone config reconnect myremote:"`
|
||||
before := store.Load()
|
||||
srv.RevokeSession(tokens.UID)
|
||||
|
||||
@@ -247,7 +248,7 @@ func TestSessionRevoked(t *testing.T) {
|
||||
require.Error(t, err)
|
||||
assert.ErrorIs(t, err, errSessionExpired)
|
||||
assert.True(t, fserrors.IsFatalError(err), "error is fatal: %v", err)
|
||||
assert.Contains(t, err.Error(), `rclone config reconnect`)
|
||||
assert.Contains(t, err.Error(), `rclone config reconnect myremote:`)
|
||||
assert.Equal(t, before, store.Load(), "credentials kept")
|
||||
assert.Equal(t, 1, srv.Requests()[refreshRoute])
|
||||
|
||||
|
||||
Reference in new issue
Block a user