Merge pull request #17614 from iterate-ch/bugfix/GH-17437-savedtokens

Remove interceptors for STS and simplify token handling setup

Author: dkocher

azure/src/main/java/ch/cyberduck/core/azure/AzureSession.java

@@ -16,6 +16,7 @@
  */
 
 import ch.cyberduck.core.Credentials;
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.HostKeyCallback;
 import ch.cyberduck.core.HostUrlProvider;
@@ -38,6 +39,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.io.IOException;
 import java.util.Collections;
 
 import com.azure.core.credential.AzureSasCredential;
@@ -142,8 +144,20 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() {
-        //
+    public void disconnect() throws BackgroundException {
+        try {
+            if(client != null) {
+                try {
+                    ((ApacheHttpClient) client.getHttpPipeline().getHttpClient()).getHttpClient().close();
+                }
+                catch(IOException e) {
+                    throw new DefaultIOExceptionMappingService().map(e);
+                }
+            }
+        }
+        finally {
+            super.disconnect();
+        }
     }
 
     @Override

azure/src/main/java/ch/cyberduck/core/azure/apache/ApacheHttpClient.java

@@ -20,6 +20,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.protocol.HTTP;
 import reactor.core.publisher.Mono;
@@ -29,12 +30,16 @@
 import java.net.URL;
 
 public class ApacheHttpClient implements HttpClient {
-    private final org.apache.http.client.HttpClient httpClient;
+    private final CloseableHttpClient httpClient;
 
     public ApacheHttpClient(final HttpClientBuilder builder) {
         this.httpClient = builder.build();
     }
 
+    public CloseableHttpClient getHttpClient() {
+        return httpClient;
+    }
+
     public Mono<HttpResponse> send(final HttpRequest azureRequest) {
         try {
             ApacheHttpRequest apacheRequest = new ApacheHttpRequest(azureRequest.getHttpMethod(), azureRequest.getUrl(),

backblaze/src/main/java/ch/cyberduck/core/b2/B2Session.java

@@ -68,15 +68,16 @@ protected B2ApiClient connect(final ProxyFinder proxy, final HostKeyCallback key
     }
 
     @Override
-    public void logout() throws BackgroundException {
+    public void disconnect() throws BackgroundException {
         try {
+            fileid.clear();
             client.close();
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
         finally {
-            fileid.clear();
+            super.disconnect();
         }
     }
 

box/src/main/java/ch/cyberduck/core/box/BoxSession.java

@@ -87,15 +87,16 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void disconnect() throws BackgroundException {
         try {
+            fileid.clear();
             client.close();
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
         finally {
-            fileid.clear();
+            super.disconnect();
         }
     }
 

brick/src/main/java/ch/cyberduck/core/brick/BrickSession.java

@@ -111,13 +111,18 @@ public void login(final LoginCallback prompt, final CancelCallback cancel) throw
     }
 
     @Override
-    protected void logout() throws BackgroundException {
+    public void disconnect() throws BackgroundException {
         try {
-            client.close();
+            if(client != null) {
+                client.close();
+            }
         }
         catch(IOException e) {
             throw new DefaultIOExceptionMappingService().map(e);
         }
+        finally {
+            super.disconnect();
+        }
     }
 
     public Credentials pair(final Host bookmark, final ConnectionCallback alert, final LoginCallback prompt, final CancelCallback cancel,

core/src/main/java/ch/cyberduck/core/CopyCredentialsHolder.java

@@ -82,8 +82,8 @@ public Credentials() {
     public Credentials(final Credentials copy) {
         this.user = copy.user;
         this.password = copy.password;
-        this.tokens = copy.tokens;
-        this.oauth = copy.oauth;
+        this.tokens = TemporaryAccessTokens.EMPTY == copy.tokens ? TemporaryAccessTokens.EMPTY : new TemporaryAccessTokens(copy.tokens);
+        this.oauth = OAuthTokens.EMPTY == copy.oauth ? OAuthTokens.EMPTY : new OAuthTokens(copy.oauth);
         this.properties.putAll(copy.properties);
         this.identity = copy.identity;
         this.identityPassphrase = copy.identityPassphrase;

core/src/main/java/ch/cyberduck/core/Credentials.java

@@ -163,27 +163,36 @@ public OAuthTokens findOAuthTokens(final Host bookmark) {
     }
 
     protected static Scheme getOAuthScheme(final Host bookmark) {
-        final URI uri = URI.create(bookmark.getProtocol().getOAuthTokenUrl());
-        if(null == uri.getScheme()) {
-            return bookmark.getProtocol().getScheme();
+        if(null != bookmark.getProtocol().getOAuthTokenUrl()) {
+            final URI uri = URI.create(bookmark.getProtocol().getOAuthTokenUrl());
+            if(null == uri.getScheme()) {
+                return bookmark.getProtocol().getScheme();
+            }
+            return Scheme.valueOf(uri.getScheme());
         }
-        return Scheme.valueOf(uri.getScheme());
+        return null;
     }
 
     protected static String getOAuthHostname(final Host bookmark) {
-        final URI uri = URI.create(bookmark.getProtocol().getOAuthTokenUrl());
-        if(StringUtils.isNotBlank(uri.getHost())) {
-            return uri.getHost();
+        if(null != bookmark.getProtocol().getOAuthTokenUrl()) {
+            final URI uri = URI.create(bookmark.getProtocol().getOAuthTokenUrl());
+            if(StringUtils.isNotBlank(uri.getHost())) {
+                return uri.getHost();
+            }
+            return bookmark.getHostname();
         }
-        return bookmark.getHostname();
+        return null;
     }
 
     protected static int getOAuthPort(final Host bookmark) {
-        final URI uri = URI.create(bookmark.getProtocol().getOAuthTokenUrl());
-        if(-1 != uri.getPort()) {
-            return uri.getPort();
+        if(null != bookmark.getProtocol().getOAuthTokenUrl()) {
+            final URI uri = URI.create(bookmark.getProtocol().getOAuthTokenUrl());
+            if(-1 != uri.getPort()) {
+                return uri.getPort();
+            }
+            return getOAuthScheme(bookmark).getPort();
         }
-        return getOAuthScheme(bookmark).getPort();
+        return -1;
     }
 
     protected static Set<String> getOAuthPrefix(final Host bookmark) {

core/src/main/java/ch/cyberduck/core/DefaultHostPasswordStore.java

@@ -85,7 +85,7 @@ public void validate(final Host bookmark, final LoginCallback prompt, final Logi
             if(options.oauth) {
                 final OAuthTokens tokens = keychain.findOAuthTokens(bookmark);
                 if(tokens.validate()) {
-                    log.info("Fetched OAuth token from keychain for {}", bookmark);
+                    log.info("Fetched OAuth tokens {} from keychain for {}", tokens, bookmark);
                     // No need to reinsert found token to the keychain.
                     credentials.setOauth(tokens).setSaved(tokens.isExpired());
                 }
@@ -213,11 +213,5 @@ public void save(final Host bookmark) {
         else {
             log.info("Skip writing credentials for bookmark {}", bookmark.getHostname());
         }
-        // Nullify password and tokens
-        log.debug("Reset credentials for {}", bookmark);
-        switch(bookmark.getProtocol().getStatefulness()) {
-            case stateless:
-                credentials.reset();
-        }
     }
 }

core/src/main/java/ch/cyberduck/core/KeychainLoginService.java

@@ -200,12 +200,14 @@ public void interrupt() throws BackgroundException {
         }
     }
 
-    protected abstract void logout() throws BackgroundException;
+    protected void logout() throws BackgroundException {
+        host.getCredentials().reset();
+    }
 
     /**
      * Close the connection to the remote host. Subsequent calls to #getClient() must return null.
      */
-    protected void disconnect() {
+    protected void disconnect() throws BackgroundException {
         state = State.closed;
         listeners.clear();
     }