Skip to content

Commit 96a268d

Browse files
committed
Revert "HDDS-6942. Ozone Buckets/Objects created via S3 should not allow group access (apache#3553)"
This reverts commit c5e3745.
1 parent 45753f5 commit 96a268d

3 files changed

Lines changed: 1 addition & 14 deletions

File tree

hadoop-ozone/dist/src/main/smoketest/s3/bucketcreate.robot

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,3 @@ Create bucket with invalid bucket name
4141
${randStr} = Generate Ozone String
4242
${result} = Execute AWSS3APICli and checkrc create-bucket --bucket invalid_bucket_${randStr} 255
4343
Should contain ${result} InvalidBucketName
44-
45-
Create new bucket and check no group ACL
46-
${bucket} = Create bucket
47-
${acl} = Execute ozone sh bucket getacl s3v/${bucket}
48-
${group} = Get Regexp Matches ${acl} "GROUP"
49-
IF '${group}' is not '[]'
50-
${json} = Evaluate json.loads('''${acl}''') json
51-
# make sure this check is for group acl
52-
Should contain ${json}[1][type] GROUP
53-
Should contain ${json}[1][aclList] NONE
54-
END

hadoop-ozone/dist/src/main/smoketest/s3/commonawslib.robot

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ Setup secure v4 headers
8787
END
8888

8989
${accessKey} = Get Regexp Matches ${result} (?<=awsAccessKey=).*
90-
# Use a valid user that are created in the Docket image Ex: testuser if it is not a secure cluster
91-
${accessKey} = Get Variable Value ${accessKey} testuser
90+
${accessKey} = Get Variable Value ${accessKey} sdsdasaasdasd
9291
${secret} = Get Regexp Matches ${result} (?<=awsSecret=).*
9392
${accessKey} = Set Variable ${accessKey[0]}
9493
${secret} = Set Variable ${secret[0]}

hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/OzoneClientProducer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public class OzoneClientProducer {
5151
@Produces
5252
public synchronized OzoneClient createClient() throws WebApplicationException,
5353
IOException {
54-
ozoneConfiguration.set("ozone.om.group.rights", "NONE");
5554
client = getClient(ozoneConfiguration);
5655
return client;
5756
}

0 commit comments

Comments
 (0)