Merge pull request #17617 from iterate-ch/feature/GH-17612-context-property

Expose Context key in profile as property and allow override in bookm…

Author: dkocher

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

@@ -685,6 +685,9 @@ public Map<String, String> getProperties() {
                 property -> StringUtils.contains(property, '=') ? substitutor.replace(StringUtils.substringAfter(property, '=')) : StringUtils.EMPTY)));
         // In profile as dict
         properties.putAll(this.map(PROPERTIES_KEY));
+        if(null != this.getContext()) {
+            properties.put(CONTEXT_KEY, this.getContext());
+        }
         return properties;
     }
 

s3/src/main/java/ch/cyberduck/core/auth/AWSSessionCredentialsRetriever.java

@@ -75,7 +75,7 @@ public Credentials get() throws BackgroundException {
         final HttpClientBuilder configuration = builder.build(ProxyFactory.get(),
                 new DisabledTranscriptListener(), new DisabledLoginCallback());
         try (CloseableHttpClient client = configuration.build()) {
-            final HttpRequestBase resource = new HttpGet(new HostUrlProvider().withUsername(false).withPath(true).get(address));
+            final HttpRequestBase resource = new HttpGet(url);
             return client.execute(resource, response -> {
                 switch(response.getStatusLine().getStatusCode()) {
                     case HttpStatus.SC_OK:

s3/src/main/java/ch/cyberduck/core/s3/S3Session.java

@@ -268,10 +268,11 @@ protected S3CredentialsStrategy configureCredentialsStrategy(final HttpClientBui
         }
         if(S3Session.isAwsHostname(host.getHostname())) {
             // Try auto-configure
-            if(Scheme.isURL(host.getProtocol().getContext())) {
-                log.debug("Auto-configure credentials from instance metadata {}", host.getProtocol().getContext());
+            final String context = preferences.getProperty(Profile.CONTEXT_KEY);
+            if(Scheme.isURL(context)) {
+                log.debug("Auto-configure credentials from HTTP endpoint {}", context);
                 // Fetch temporary session token from instance metadata
-                return new AWSSessionCredentialsRetriever(trust, key, host.getProtocol().getContext());
+                return new AWSSessionCredentialsRetriever(trust, key, context);
             }
         }
         if(host.getProtocol().isRoleConfigurable() || host.getProperty(Profile.STS_ROLE_ARN_PROPERTY_KEY) != null) {