Skip to content

Commit 22b5af0

Browse files
author
Fabian Morgan
committed
getBucketLocation looks to be unsupported
1 parent a91d5a7 commit 22b5af0

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/iam/IamSessionPolicyResolver.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -869,8 +869,6 @@ enum S3Action {
869869
EnumSet.noneOf(ACLType.class)),
870870
GET_BUCKET_ACL("s3:GetBucketAcl", ActionKind.BUCKET, EnumSet.of(READ), EnumSet.of(READ, READ_ACL),
871871
EnumSet.noneOf(ACLType.class)),
872-
GET_BUCKET_LOCATION("s3:GetBucketLocation", ActionKind.BUCKET, EnumSet.of(READ), EnumSet.of(READ),
873-
EnumSet.noneOf(ACLType.class)),
874872
// Used for HeadBucket, ListObjects and ListObjectsV2 apis
875873
LIST_BUCKET("s3:ListBucket", ActionKind.BUCKET, EnumSet.of(READ), EnumSet.of(READ, LIST), EnumSet.of(LIST)),
876874
// Used for ListMultipartUploads API

hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/security/acl/iam/TestIamSessionPolicyResolver.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ public void testBuildCaseInsensitiveS3ActionMap() {
307307
// Verify s3:Get* contains Get actions
308308
final Set<S3Action> getActions = caseInsensitiveS3ActionMap.get("s3:get*");
309309
assertThat(getActions).containsOnly(
310-
S3Action.GET_OBJECT, S3Action.GET_BUCKET_ACL, S3Action.GET_BUCKET_LOCATION, S3Action.GET_OBJECT_TAGGING);
310+
S3Action.GET_OBJECT, S3Action.GET_BUCKET_ACL, S3Action.GET_OBJECT_TAGGING);
311311

312312
// Verify s3:Put* contains Put actions
313313
final Set<S3Action> putActions = caseInsensitiveS3ActionMap.get("s3:put*");
@@ -380,13 +380,11 @@ public void testMapPolicyActionsToS3ActionsWithMultipleActionsMapAllCorrectly()
380380
@Test
381381
public void testMapPolicyActionsToS3ActionsWithWildcardExpansion() {
382382
final Set<S3Action> result = mapPolicyActionsToS3Actions(Collections.singleton("s3:Get*"));
383-
assertThat(result).containsOnly(S3Action.GET_OBJECT, S3Action.GET_BUCKET_ACL, S3Action.GET_BUCKET_LOCATION,
384-
S3Action.GET_OBJECT_TAGGING);
383+
assertThat(result).containsOnly(S3Action.GET_OBJECT, S3Action.GET_BUCKET_ACL, S3Action.GET_OBJECT_TAGGING);
385384

386385
// Ensure it is case-insensitive
387386
final Set<S3Action> resultCi = mapPolicyActionsToS3Actions(Collections.singleton("s3:gET*"));
388-
assertThat(resultCi).containsOnly(S3Action.GET_OBJECT, S3Action.GET_BUCKET_ACL, S3Action.GET_BUCKET_LOCATION,
389-
S3Action.GET_OBJECT_TAGGING);
387+
assertThat(resultCi).containsOnly(S3Action.GET_OBJECT, S3Action.GET_BUCKET_ACL, S3Action.GET_OBJECT_TAGGING);
390388
}
391389

392390
@Test
@@ -415,15 +413,15 @@ public void testMapPolicyActionsToS3ActionsWithOnlyUnsupportedActionsReturnsEmpt
415413
@Test
416414
public void testMapPolicyActionsToS3ActionsDeduplicatesResults() {
417415
final Set<S3Action> result = mapPolicyActionsToS3Actions(strSet("s3:Get*", "s3:GetObject", "s3:GetBucketAcl"));
418-
assertThat(result).containsOnly(S3Action.GET_OBJECT, S3Action.GET_BUCKET_ACL, S3Action.GET_BUCKET_LOCATION,
419-
S3Action.GET_OBJECT_TAGGING);
416+
assertThat(result).containsOnly(S3Action.GET_OBJECT, S3Action.GET_BUCKET_ACL, S3Action.GET_OBJECT_TAGGING);
420417
}
421418

422419
@Test
423420
public void testMapPolicyActionsToS3ActionsHandlesMultipleWildcards() {
424421
final Set<S3Action> result = mapPolicyActionsToS3Actions(strSet("s3:Get*", "s3:Put*"));
425-
assertThat(result).containsOnly(S3Action.GET_OBJECT, S3Action.GET_BUCKET_ACL, S3Action.GET_BUCKET_LOCATION,
426-
S3Action.GET_OBJECT_TAGGING, S3Action.PUT_OBJECT, S3Action.PUT_OBJECT_TAGGING, S3Action.PUT_BUCKET_ACL);
422+
assertThat(result).containsOnly(
423+
S3Action.GET_OBJECT, S3Action.GET_BUCKET_ACL, S3Action.GET_OBJECT_TAGGING, S3Action.PUT_OBJECT,
424+
S3Action.PUT_OBJECT_TAGGING, S3Action.PUT_BUCKET_ACL);
427425
}
428426

429427
@Test

0 commit comments

Comments
 (0)