When "Role Configurable" is set in profile allow prompt for ARN.

Author: dkocher

s3/src/main/java/ch/cyberduck/core/sts/STSAssumeRoleRequestInterceptor.java

@@ -26,7 +26,6 @@
 import ch.cyberduck.core.ssl.X509KeyManager;
 import ch.cyberduck.core.ssl.X509TrustManager;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -53,13 +52,9 @@ public TemporaryAccessTokens refresh(final Credentials credentials) throws Backg
         try {
             final String arn = new ProxyPreferencesReader(host, credentials).getProperty(Profile.STS_ROLE_ARN_PROPERTY_KEY, "s3.assumerole.rolearn");
             log.debug("Use ARN {}", arn);
-            if(StringUtils.isNotBlank(arn)) {
-                log.debug("Retrieve temporary credentials with {}", credentials);
-                // AssumeRoleRequest
-                return tokens = this.assumeRole(credentials, arn);
-            }
-            log.warn("Skip requesting tokens from token service for {}", credentials);
-            return TemporaryAccessTokens.EMPTY;
+            log.debug("Retrieve temporary credentials with {}", credentials);
+            // AssumeRoleRequest
+            return tokens = this.assumeRole(credentials, arn);
         }
         finally {
             lock.unlock();

s3/src/main/java/ch/cyberduck/core/sts/STSAssumeRoleWithWebIdentityRequestInterceptor.java

@@ -27,7 +27,6 @@
 import ch.cyberduck.core.ssl.X509KeyManager;
 import ch.cyberduck.core.ssl.X509TrustManager;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -62,11 +61,7 @@ public TemporaryAccessTokens refresh(final Credentials credentials) throws Backg
         try {
             final String arn = new ProxyPreferencesReader(host, credentials).getProperty(Profile.STS_ROLE_ARN_PROPERTY_KEY, "s3.assumerole.rolearn");
             log.debug("Use ARN {}", arn);
-            if(StringUtils.isNotBlank(arn)) {
-                return tokens = this.assumeRoleWithWebIdentity(oauth.refresh(credentials.getOauth()), arn);
-            }
-            log.warn("Skip requesting tokens from token service for {}", credentials);
-            return TemporaryAccessTokens.EMPTY;
+            return tokens = this.assumeRoleWithWebIdentity(oauth.refresh(credentials.getOauth()), arn);
         }
         finally {
             lock.unlock();

s3/src/main/java/ch/cyberduck/core/sts/STSGetSessionTokenRequestInterceptor.java

@@ -26,7 +26,6 @@
 import ch.cyberduck.core.ssl.X509KeyManager;
 import ch.cyberduck.core.ssl.X509TrustManager;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -54,13 +53,9 @@ public TemporaryAccessTokens refresh(final Credentials credentials) throws Backg
         try {
             final String arn = new ProxyPreferencesReader(host, credentials).getProperty(Profile.STS_MFA_ARN_PROPERTY_KEY);
             log.debug("Use ARN {}", arn);
-            if(StringUtils.isNotBlank(arn)) {
-                log.debug("Retrieve temporary credentials with {}", credentials);
-                // GetSessionToken
-                return tokens = this.getSessionToken(credentials, arn);
-            }
-            log.warn("Skip requesting tokens from token service for {}", credentials);
-            return TemporaryAccessTokens.EMPTY;
+            log.debug("Retrieve temporary credentials with {}", credentials);
+            // GetSessionToken
+            return tokens = this.getSessionToken(credentials, arn);
         }
         finally {
             lock.unlock();