Skip to content

Commit 837151f

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 c0de6bc commit 837151f

3 files changed

Lines changed: 1 addition & 13 deletions

File tree

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

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ Setup v4 headers
7272
Setup secure v4 headers
7373
${result} = Execute ozone s3 getsecret ${OM_HA_PARAM}
7474
${accessKey} = Get Regexp Matches ${result} (?<=awsAccessKey=).*
75-
# Use a valid user that are created in the Docket image Ex: testuser if it is not a secure cluster
76-
${accessKey} = Get Variable Value ${accessKey} testuser
75+
${accessKey} = Get Variable Value ${accessKey} sdsdasaasdasd
7776
${secret} = Get Regexp Matches ${result} (?<=awsSecret=).*
7877
${accessKey} = Set Variable ${accessKey[0]}
7978
${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
@@ -66,7 +66,6 @@ public class OzoneClientProducer {
6666
@Produces
6767
public synchronized OzoneClient createClient() throws WebApplicationException,
6868
IOException {
69-
ozoneConfiguration.set("ozone.om.group.rights", "NONE");
7069
client = getClient(ozoneConfiguration);
7170
return client;
7271
}

0 commit comments

Comments
 (0)