Merge pull request #16677 from iterate-ch/bugfix/SDS-1537

Conditionally save credentials in keychain after retry.
iterate-ch · Dec 17, 2024 · cd8817c · cd8817c
2 parents d64c92a + daeb7d7
commit cd8817c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/brick/src/main/java/ch/cyberduck/core/brick/BrickPairingSchedulerFeature.java b/brick/src/main/java/ch/cyberduck/core/brick/BrickPairingSchedulerFeature.java
@@ -19,6 +19,7 @@
 import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.HostUrlProvider;
+import ch.cyberduck.core.LoginOptions;
 import ch.cyberduck.core.PasswordCallback;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.exception.ConnectionCanceledException;
@@ -134,6 +135,7 @@ public JsonObject handleEntity(final HttpEntity entity) throws IOException {
             }
             if(json.has("password")) {
                 credentials.setPassword(json.getAsJsonPrimitive("password").getAsString());
+                credentials.setSaved(new LoginOptions().save);
             }
             else {
                 throw new LoginFailureException(String.format("Invalid response for pairing key %s", token));

diff --git a/brick/src/main/java/ch/cyberduck/core/brick/BrickUnauthorizedRetryStrategy.java b/brick/src/main/java/ch/cyberduck/core/brick/BrickUnauthorizedRetryStrategy.java
@@ -75,7 +75,9 @@ public boolean retryRequest(final HttpResponse response, final int executionCoun
                             LocaleFactory.localizedString("You've been logged out", "Brick"),
                             LocaleFactory.localizedString("Please complete the login process in your browser.", "Brick")
                     );
-                    store.save(session.getHost());
+                    if(credentials.isSaved()) {
+                        store.save(session.getHost());
+                    }
                     apiKey = credentials.getPassword();
                     return true;
                 }

diff --git a/ctera/src/main/java/ch/cyberduck/core/ctera/CteraAuthenticationHandler.java b/ctera/src/main/java/ch/cyberduck/core/ctera/CteraAuthenticationHandler.java
@@ -16,6 +16,7 @@
  */
 
 import ch.cyberduck.core.BookmarkNameProvider;
+import ch.cyberduck.core.Credentials;
 import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.HostPasswordStore;
@@ -151,10 +152,12 @@ public CteraTokens validate() throws BackgroundException {
      */
     public CteraTokens save(final CteraTokens tokens) throws LocalAccessDeniedException {
         log.debug("Save new tokens {} for {}", tokens, host);
-        host.getCredentials()
-                .withToken(String.format("%s:%s", tokens.getDeviceId(), tokens.getSharedSecret()))
+        final Credentials credentials = host.getCredentials();
+        credentials.withToken(String.format("%s:%s", tokens.getDeviceId(), tokens.getSharedSecret()))
                 .withSaved(new LoginOptions().save);
-        store.save(host);
+        if(credentials.isSaved()) {
+            store.save(host);
+        }
         return tokens;
     }
 

diff --git a/oauth/src/main/java/ch/cyberduck/core/oauth/OAuth2AuthorizationService.java b/oauth/src/main/java/ch/cyberduck/core/oauth/OAuth2AuthorizationService.java
@@ -147,7 +147,9 @@ public Credentials validate() throws BackgroundException {
     public OAuthTokens save(final OAuthTokens tokens) throws LocalAccessDeniedException {
         log.debug("Save new tokens {} for {}", tokens, host);
         credentials.withOauth(tokens).withSaved(new LoginOptions().save);
-        store.save(host);
+        if(credentials.isSaved()) {
+            store.save(host);
+        }
         return tokens;
     }