Merge pull request #14973 from iterate-ch/bugfix/GH-14970-hotfix

Fix #14970.
iterate-ch · Aug 8, 2023 · 4fe4d32 · 4fe4d32
2 parents 50e14cc + 99a2dca
commit 4fe4d32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/s3/src/main/java/ch/cyberduck/core/s3/S3Session.java b/s3/src/main/java/ch/cyberduck/core/s3/S3Session.java
@@ -205,7 +205,7 @@ public void login(final Proxy proxy, final LoginCallback prompt, final CancelCal
             if(isAwsHostname(host.getHostname())) {
                 // Try auto-configure
                 credentials = new AWSProfileSTSCredentialsConfigurator(
-                        new ThreadLocalHostnameDelegatingTrustManager(trust, host.getHostname()), key, prompt).configure(host);
+                        new ThreadLocalHostnameDelegatingTrustManager(trust, host.getHostname()), key, prompt).reload().configure(host);
             }
             else {
                 credentials = host.getCredentials();

diff --git a/s3/src/main/java/ch/cyberduck/core/s3/S3TokenExpiredResponseInterceptor.java b/s3/src/main/java/ch/cyberduck/core/s3/S3TokenExpiredResponseInterceptor.java
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+import ch.cyberduck.core.CredentialsConfigurator;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.LoginCallback;
 import ch.cyberduck.core.exception.ExpiredTokenException;
@@ -40,11 +41,11 @@ public class S3TokenExpiredResponseInterceptor extends DisabledServiceUnavailabl
     private static final int MAX_RETRIES = 1;
 
     private final Host host;
-    private final AWSProfileSTSCredentialsConfigurator configurator;
+    private final CredentialsConfigurator configurator;
 
     public S3TokenExpiredResponseInterceptor(final S3Session session, final X509TrustManager trust, final X509KeyManager key, final LoginCallback prompt) {
         this.host = session.getHost();
-        this.configurator = new AWSProfileSTSCredentialsConfigurator(trust, key, prompt);
+        this.configurator = new AWSProfileSTSCredentialsConfigurator(trust, key, prompt).reload();
     }
 
     @Override