Skip to content

Commit

Permalink
Wrap getCredentials() in a doPrivileged() block
Browse files Browse the repository at this point in the history
This commit fixes an issue that was missed in elastic#22534.
`AWSCredentialsProvider.getCredentials()` appears to potentially open a
socket connect. This operation needed to be wrapped in `doPrivileged()`.

This should fix issue elastic#23271.
  • Loading branch information
Tim-Brooks committed Feb 21, 2017
1 parent 489f389 commit f517e7a
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.amazonaws.services.s3.S3ClientOptions;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.cloud.aws.util.SocketAccess;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.component.AbstractLifecycleComponent;
Expand Down Expand Up @@ -67,7 +68,8 @@ public synchronized AmazonS3 client(Settings repositorySettings, Integer maxRetr

AWSCredentialsProvider credentials = buildCredentials(logger, deprecationLogger, settings, repositorySettings, clientName);

Tuple<String, String> clientDescriptor = new Tuple<>(foundEndpoint, credentials.getCredentials().getAWSAccessKeyId());
String awsAccessKeyId = SocketAccess.doPrivileged(() -> credentials.getCredentials().getAWSAccessKeyId());
Tuple<String, String> clientDescriptor = new Tuple<>(foundEndpoint, awsAccessKeyId);
AmazonS3Client client = clients.get(clientDescriptor);
if (client != null) {
return client;
Expand Down

0 comments on commit f517e7a

Please sign in to comment.