wip

lostb1t · Aug 3, 2024 · 99cef0b · 99cef0b
1 parent a3d130d
commit 99cef0b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/backend/icloud/api/client.go b/backend/icloud/api/client.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+  "errors"
 	"fmt"
 	"net/http"
 	"strings"
@@ -74,9 +75,12 @@ func (c *Client) Request(ctx context.Context, opts rest.Opts, request interface{
 	resp, err = c.Session.Request(ctx, opts, request, response)
 	if err != nil && resp != nil {
 		// try to reauth
-		if resp.StatusCode == 401 && c.Session.TrustToken != "" {
+		if resp.StatusCode == 401 || resp.StatusCode == 401 {
 			err = c.Authenticate(ctx)
 			if err != nil {
+        if c.Session.Requires2FA() {
+          return nil, errors.New("Trust token expired, please reauth")
+        }
 				return nil, err
 			}
 			return c.RequestNoReAuth(ctx, opts, request, response)

diff --git a/backend/icloud/api/session.go b/backend/icloud/api/session.go
@@ -12,7 +12,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/oracle/oci-go-sdk/v65/common"
 
-	//"github.com/rclone/rclone/fs"
+	"github.com/rclone/rclone/fs"
 
 	"github.com/rclone/rclone/fs/fshttp"
 	"github.com/rclone/rclone/lib/rest"
@@ -43,10 +43,7 @@ func (s *Session) Request(ctx context.Context, opts rest.Opts, request interface
 	resp, err := s.srv.CallJSON(ctx, &opts, &request, &response)
 
 	if err != nil {
-		//fs.PrettyPrint(opts, "opts", fs.LogLevelDebug)
-		//fs.PrettyPrint(resp, "resp", fs.LogLevelDebug)
 		return resp, err
-		//return resp, fmt.Errorf("%s %s failed, status %d, err: %s", opts.Method, resp.Request.URL, resp.StatusCode, err)
 	}
 
 	if val := resp.Header.Get("X-Apple-ID-Account-Country"); val != "" {
@@ -125,9 +122,8 @@ func (s *Session) AuthWithToken(ctx context.Context) error {
 		RootURL:      setupEndpoint,
 		Body:         body,
 	}
-	// X-APPLE-WEBAUTH-TOKEN
-	resp, err := s.Request(ctx, opts, nil, &s.AccountInfo)
 
+	resp, err := s.Request(ctx, opts, nil, &s.AccountInfo)
 	if err == nil {
 		s.Cookies = resp.Cookies()
 	}

diff --git a/backend/icloud/icloud.go b/backend/icloud/icloud.go
@@ -829,6 +829,10 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (fs.Fs, e
 		return nil, err
 	}
 
+  if icloud.Session.Requires2FA() {
+    return nil, errors.New("Trust token expired, please reauth")
+  }
+
 	root = strings.Trim(root, "/")
 	f := &Fs{
 		name:   name,

diff --git a/docs/content/iclouddrive.md b/docs/content/iclouddrive.md
@@ -9,8 +9,8 @@ versionIntroduced: "v1.66"
 
 ## Configuration
 
-The initial setup for an iCloud Drive backend involves getting a session.
-`rclone config` walks you through it.
+The initial setup for an iCloud Drive backend involves getting a trust token/session.
+`rclone config` walks you through it. The trust token is valid for 30 days. After which you will have to reauthenticate with rclone config.
 
 Here is an example of how to make a remote called `iclouddrive`.  First run: