From f4deffdc96768bca574d2f351c9947a3c30c1a21 Mon Sep 17 00:00:00 2001 From: buengese Date: Fri, 30 Aug 2024 02:26:05 +0200 Subject: [PATCH] zoho: print clear error message when missing oauth scope --- backend/zoho/zoho.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/backend/zoho/zoho.go b/backend/zoho/zoho.go index d6f79a1f3..34eb8b202 100644 --- a/backend/zoho/zoho.go +++ b/backend/zoho/zoho.go @@ -37,7 +37,7 @@ const ( rcloneClientID = "1000.46MXF275FM2XV7QCHX5A7K3LGME66B" rcloneEncryptedClientSecret = "U-2gxclZQBcOG9NPhjiXAhj-f0uQ137D0zar8YyNHXHkQZlTeSpIOQfmCb4oSpvosJp_SJLXmLLeUA" minSleep = 10 * time.Millisecond - maxSleep = 2 * time.Second + maxSleep = 60 * time.Second decayConstant = 2 // bigger for slower decay, exponential configRootID = "root_folder_id" ) @@ -83,7 +83,7 @@ func init() { getSrvs := func() (authSrv, apiSrv *rest.Client, err error) { oAuthClient, _, err := oauthutil.NewClient(ctx, name, m, oauthConfig) if err != nil { - return nil, nil, fmt.Errorf("failed to load oAuthClient: %w", err) + return nil, nil, fmt.Errorf("failed to load OAuth client: %w", err) } authSrv = rest.NewClient(oAuthClient).SetRoot(accountsURL) apiSrv = rest.NewClient(oAuthClient).SetRoot(rootURL) @@ -293,13 +293,19 @@ func shouldRetry(ctx context.Context, resp *http.Response, err error) (bool, err } authRetry := false + // Bail out early if we are missing OAuth Scopes. + if resp != nil && resp.StatusCode == 401 && strings.Contains(resp.Status, "INVALID_OAUTHSCOPE") { + fs.Errorf(nil, "zoho: missing OAuth Scope. Run rclone config reconnect to fix this issue.") + return false, err + } + if resp != nil && resp.StatusCode == 401 && len(resp.Header["Www-Authenticate"]) == 1 && strings.Contains(resp.Header["Www-Authenticate"][0], "expired_token") { authRetry = true fs.Debugf(nil, "Should retry: %v", err) } if resp != nil && resp.StatusCode == 429 { fs.Errorf(nil, "zoho: rate limit error received, sleeping for 60s: %v", err) - time.Sleep(60 * time.Second) + time.Sleep(180 * time.Second) } return authRetry || fserrors.ShouldRetry(err) || fserrors.ShouldRetryHTTP(resp, retryErrorCodes), err }