-
Notifications
You must be signed in to change notification settings - Fork 2.9k
AWS: add client factory for assume role use case #2002
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
165 changes: 165 additions & 0 deletions
165
aws/src/integration/java/org/apache/iceberg/aws/AssumeRoleAwsClientFactoryTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.iceberg.aws; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.UUID; | ||
| import org.apache.iceberg.aws.glue.GlueCatalog; | ||
| import org.apache.iceberg.aws.s3.S3FileIO; | ||
| import org.apache.iceberg.catalog.Namespace; | ||
| import org.apache.iceberg.io.InputFile; | ||
| import org.apache.iceberg.relocated.com.google.common.collect.Maps; | ||
| import org.junit.After; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient; | ||
| import software.amazon.awssdk.regions.Region; | ||
| import software.amazon.awssdk.services.glue.model.AccessDeniedException; | ||
| import software.amazon.awssdk.services.glue.model.GlueException; | ||
| import software.amazon.awssdk.services.iam.IamClient; | ||
| import software.amazon.awssdk.services.iam.model.CreateRoleRequest; | ||
| import software.amazon.awssdk.services.iam.model.CreateRoleResponse; | ||
| import software.amazon.awssdk.services.iam.model.DeleteRolePolicyRequest; | ||
| import software.amazon.awssdk.services.iam.model.DeleteRoleRequest; | ||
| import software.amazon.awssdk.services.iam.model.PutRolePolicyRequest; | ||
| import software.amazon.awssdk.services.s3.model.S3Exception; | ||
|
|
||
| public class AssumeRoleAwsClientFactoryTest { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(AssumeRoleAwsClientFactoryTest.class); | ||
|
|
||
| private IamClient iam; | ||
| private String roleName; | ||
| private Map<String, String> assumeRoleProperties; | ||
| private String policyName; | ||
|
|
||
| @Before | ||
| public void before() { | ||
| roleName = UUID.randomUUID().toString(); | ||
| iam = IamClient.builder() | ||
| .region(Region.AWS_GLOBAL) | ||
| .httpClient(UrlConnectionHttpClient.create()) | ||
| .build(); | ||
| CreateRoleResponse response = iam.createRole(CreateRoleRequest.builder() | ||
| .roleName(roleName) | ||
| .assumeRolePolicyDocument("{" + | ||
| "\"Version\":\"2012-10-17\"," + | ||
| "\"Statement\":[{" + | ||
| "\"Effect\":\"Allow\"," + | ||
| "\"Principal\":{" + | ||
| "\"AWS\":\"arn:aws:iam::" + AwsIntegTestUtil.testAccountId() + ":root\"}," + | ||
| "\"Action\": \"sts:AssumeRole\"}]}") | ||
| .maxSessionDuration(3600) | ||
| .build()); | ||
| assumeRoleProperties = Maps.newHashMap(); | ||
| assumeRoleProperties.put(AwsProperties.CLIENT_FACTORY, AssumeRoleAwsClientFactory.class.getName()); | ||
| assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_REGION, "us-east-1"); | ||
| assumeRoleProperties.put(AwsProperties.CLIENT_ASSUME_ROLE_ARN, response.role().arn()); | ||
| policyName = UUID.randomUUID().toString(); | ||
| } | ||
|
|
||
| @After | ||
| public void after() { | ||
| iam.deleteRolePolicy(DeleteRolePolicyRequest.builder().roleName(roleName).policyName(policyName).build()); | ||
| iam.deleteRole(DeleteRoleRequest.builder().roleName(roleName).build()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAssumeRole_glueCatalog() throws Exception { | ||
| String glueArnPrefix = "arn:aws:glue:*:" + AwsIntegTestUtil.testAccountId(); | ||
| iam.putRolePolicy(PutRolePolicyRequest.builder() | ||
| .roleName(roleName) | ||
| .policyName(policyName) | ||
| .policyDocument("{" + | ||
| "\"Version\":\"2012-10-17\"," + | ||
| "\"Statement\":[{" + | ||
| "\"Sid\":\"policy1\"," + | ||
| "\"Effect\":\"Allow\"," + | ||
| "\"Action\":[\"glue:CreateDatabase\",\"glue:DeleteDatabase\",\"glue:GetDatabase\",\"glue:GetTables\"]," + | ||
| "\"Resource\":[\"" + glueArnPrefix + ":catalog\"," + | ||
| "\"" + glueArnPrefix + ":database/allowed_*\"," + | ||
| "\"" + glueArnPrefix + ":table/allowed_*/*\"," + | ||
| "\"" + glueArnPrefix + ":userDefinedFunction/allowed_*/*\"]}]}") | ||
| .build()); | ||
| waitForIamConsistency(); | ||
|
|
||
| GlueCatalog glueCatalog = new GlueCatalog(); | ||
| assumeRoleProperties.put("warehouse", "s3://path"); | ||
| glueCatalog.initialize("test", assumeRoleProperties); | ||
| try { | ||
| glueCatalog.createNamespace(Namespace.of("denied_" + UUID.randomUUID().toString().replace("-", ""))); | ||
| Assert.fail("Access to Glue should be denied"); | ||
| } catch (GlueException e) { | ||
| Assert.assertEquals(AccessDeniedException.class, e.getClass()); | ||
| } | ||
|
|
||
| Namespace namespace = Namespace.of("allowed_" + UUID.randomUUID().toString().replace("-", "")); | ||
| try { | ||
| glueCatalog.createNamespace(namespace); | ||
| } catch (GlueException e) { | ||
| LOG.error("fail to create or delete Glue database", e); | ||
| Assert.fail("create namespace should succeed"); | ||
| } finally { | ||
| glueCatalog.dropNamespace(namespace); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testAssumeRole_s3FileIO() throws Exception { | ||
| String bucketArn = "arn:aws:s3:::" + AwsIntegTestUtil.testBucketName(); | ||
| iam.putRolePolicy(PutRolePolicyRequest.builder() | ||
| .roleName(roleName) | ||
| .policyName(policyName) | ||
| .policyDocument("{" + | ||
| "\"Version\":\"2012-10-17\"," + | ||
| "\"Statement\":[{" + | ||
| "\"Sid\":\"policy1\"," + | ||
| "\"Effect\":\"Allow\"," + | ||
| "\"Action\":\"s3:ListBucket\"," + | ||
| "\"Resource\":[\"" + bucketArn + "\"]," + | ||
| "\"Condition\":{\"StringLike\":{\"s3:prefix\":[\"allowed/*\"]}}} ,{" + | ||
| "\"Sid\":\"policy2\"," + | ||
| "\"Effect\":\"Allow\"," + | ||
| "\"Action\":\"s3:GetObject\"," + | ||
| "\"Resource\":[\"" + bucketArn + "/allowed/*\"]}]}") | ||
| .build()); | ||
| waitForIamConsistency(); | ||
|
|
||
| S3FileIO s3FileIO = new S3FileIO(); | ||
| s3FileIO.initialize(assumeRoleProperties); | ||
| InputFile inputFile = s3FileIO.newInputFile("s3://" + AwsIntegTestUtil.testBucketName() + "/denied/file"); | ||
| try { | ||
| inputFile.exists(); | ||
| Assert.fail("Access to s3 should be denied"); | ||
| } catch (S3Exception e) { | ||
| Assert.assertEquals("Should see 403 error code", 403, e.statusCode()); | ||
| } | ||
|
|
||
| inputFile = s3FileIO.newInputFile("s3://" + AwsIntegTestUtil.testBucketName() + "/allowed/file"); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do you delete this file?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This file does not exist, I call |
||
| Assert.assertFalse("should be able to access file", inputFile.exists()); | ||
| } | ||
|
|
||
| private void waitForIamConsistency() throws Exception { | ||
| Thread.sleep(10000); // sleep to make sure IAM up to date | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 98 additions & 0 deletions
98
aws/src/main/java/org/apache/iceberg/aws/AssumeRoleAwsClientFactory.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.iceberg.aws; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.UUID; | ||
| import org.apache.iceberg.relocated.com.google.common.base.Preconditions; | ||
| import org.apache.iceberg.util.PropertyUtil; | ||
| import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder; | ||
| import software.amazon.awssdk.awscore.client.builder.AwsSyncClientBuilder; | ||
| import software.amazon.awssdk.http.SdkHttpClient; | ||
| import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient; | ||
| import software.amazon.awssdk.regions.Region; | ||
| import software.amazon.awssdk.services.glue.GlueClient; | ||
| import software.amazon.awssdk.services.kms.KmsClient; | ||
| import software.amazon.awssdk.services.s3.S3Client; | ||
| import software.amazon.awssdk.services.sts.StsClient; | ||
| import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider; | ||
| import software.amazon.awssdk.services.sts.model.AssumeRoleRequest; | ||
|
|
||
| public class AssumeRoleAwsClientFactory implements AwsClientFactory { | ||
|
|
||
| private static final SdkHttpClient HTTP_CLIENT_DEFAULT = UrlConnectionHttpClient.create(); | ||
|
|
||
| private String roleArn; | ||
| private String externalId; | ||
| private int timeout; | ||
| private String region; | ||
|
|
||
| @Override | ||
| public S3Client s3() { | ||
| return S3Client.builder().applyMutation(this::configure).build(); | ||
| } | ||
|
|
||
| @Override | ||
| public GlueClient glue() { | ||
| return GlueClient.builder().applyMutation(this::configure).build(); | ||
| } | ||
|
|
||
| @Override | ||
| public KmsClient kms() { | ||
| return KmsClient.builder().applyMutation(this::configure).build(); | ||
| } | ||
|
|
||
| @Override | ||
| public void initialize(Map<String, String> properties) { | ||
| roleArn = properties.get(AwsProperties.CLIENT_ASSUME_ROLE_ARN); | ||
| Preconditions.checkNotNull(roleArn, | ||
| "Cannot initialize AssumeRoleClientConfigFactory with null role ARN"); | ||
| timeout = PropertyUtil.propertyAsInt(properties, | ||
| AwsProperties.CLIENT_ASSUME_ROLE_TIMEOUT_SEC, AwsProperties.CLIENT_ASSUME_ROLE_TIMEOUT_SEC_DEFAULT); | ||
| externalId = properties.get(AwsProperties.CLIENT_ASSUME_ROLE_EXTERNAL_ID); | ||
|
|
||
| region = properties.get(AwsProperties.CLIENT_ASSUME_ROLE_REGION); | ||
| Preconditions.checkNotNull(region, "Cannot initialize AssumeRoleClientConfigFactory with null region"); | ||
| } | ||
|
|
||
| private <T extends AwsClientBuilder & AwsSyncClientBuilder> T configure(T clientBuilder) { | ||
| AssumeRoleRequest request = AssumeRoleRequest.builder() | ||
| .roleArn(roleArn) | ||
| .roleSessionName(genSessionName()) | ||
| .durationSeconds(timeout) | ||
| .externalId(externalId) | ||
| .build(); | ||
|
|
||
| clientBuilder.credentialsProvider( | ||
| StsAssumeRoleCredentialsProvider.builder() | ||
| .stsClient(StsClient.builder().httpClient(HTTP_CLIENT_DEFAULT).build()) | ||
danielcweeks marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .refreshRequest(request) | ||
| .build()); | ||
|
|
||
| clientBuilder.region(Region.of(region)); | ||
| clientBuilder.httpClient(HTTP_CLIENT_DEFAULT); | ||
|
|
||
| return clientBuilder; | ||
| } | ||
|
|
||
| private String genSessionName() { | ||
| return String.format("iceberg-aws-%s", UUID.randomUUID()); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you should add a finally to retry to drop the namespace.