Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wrap getCredentials() in a doPrivileged() block #23297

Merged
merged 4 commits into from Feb 23, 2017
Merged

Wrap getCredentials() in a doPrivileged() block #23297

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f517e7a
Wrap getCredentials() in a doPrivileged() block
Tim-Brooks Feb 21, 2017
9544e22
Wrap all calls to AWSCredentialsProvider with doPrivileged blocks
Tim-Brooks Feb 21, 2017
ee88434
Only wrap InstanceProfileCredentialsProvider
Tim-Brooks Feb 22, 2017
2b498c1
Merge remote-tracking branch 'upstream/master' into wrap_get_credentials
Tim-Brooks Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java
View file
Open in desktop
Expand Up @@ -25,6 +25,7 @@

import com.amazonaws.ClientConfiguration;
import com.amazonaws.Protocol;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.auth.InstanceProfileCredentialsProvider;
Expand All @@ -35,6 +36,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 @@ -156,7 +158,17 @@ public static AWSCredentialsProvider buildCredentials(Logger logger, Deprecation
}
}

return credentials;
return new AWSCredentialsProvider() {
@Override
public AWSCredentials getCredentials() {
return SocketAccess.doPrivileged(credentials::getCredentials);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We only need this for the instance profile credentials. The rest are read and created statically, so definitely do not require socket access.

}

@Override
public void refresh() {
SocketAccess.doPrivilegedVoid(credentials::refresh);
}
};
}

// pkg private for tests
Expand Down