Skip to content

HDDS-7750. Incorrect WRITE ACL check #4992

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

Merged
sadanand48 merged 3 commits into from
Jul 10, 2023
Merged

HDDS-7750. Incorrect WRITE ACL check #4992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63cac49
HDDS-7750. Incorrect WRITE ACL check
aryangupta1998 Jun 27, 2023
fcbe3ee
Revert change in KeyManagerImpl.java
aryangupta1998 Jun 28, 2023
5df39e1
Fixed failing CI check.
aryangupta1998 Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ...a/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
.OMResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
import org.apache.hadoop.ozone.security.acl.OzoneObj;
import org.apache.hadoop.util.Time;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
Expand Down Expand Up @@ -133,9 +132,11 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
volumeName = keyArgs.getVolumeName();
bucketName = keyArgs.getBucketName();

long clientID = multipartCommitUploadPartRequest.getClientID();

// check acl
checkKeyAcls(ozoneManager, volumeName, bucketName, keyName,
IAccessAuthorizer.ACLType.WRITE, OzoneObj.ResourceType.KEY);
checkKeyAclsInOpenKeyTable(ozoneManager, volumeName, bucketName, keyName,
IAccessAuthorizer.ACLType.WRITE, clientID);

acquiredLock = omMetadataManager.getLock().acquireWriteLock(BUCKET_LOCK,
volumeName, bucketName);
Expand All @@ -149,8 +150,6 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
multipartKeyInfo = omMetadataManager.getMultipartInfoTable()
.get(multipartKey);

long clientID = multipartCommitUploadPartRequest.getClientID();

openKey = getOpenKey(volumeName, bucketName, keyName, omMetadataManager,
clientID);

Expand Down
3 changes: 3 additions & 0 deletions ...src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.hadoop.ozone.audit.AuditMessage;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OmMetadataReader;
import org.apache.hadoop.ozone.om.OMMetrics;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.OzoneManager;
Expand Down Expand Up @@ -83,6 +84,8 @@ public void setup() throws Exception {
when(ozoneManager.getMetrics()).thenReturn(omMetrics);
when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager);
auditLogger = Mockito.mock(AuditLogger.class);
OmMetadataReader omMetadataReader = Mockito.mock(OmMetadataReader.class);
when(ozoneManager.getOmMetadataReader()).thenReturn(omMetadataReader);
Copy link
Contributor

@Xushaohong Xushaohong Jun 29, 2023

Choose a reason for hiding this comment

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

This line is duplicated with line 85. Need to verify if the mock is necessary.
when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager);

Copy link
Contributor

@adoroszlai adoroszlai Jun 29, 2023

Choose a reason for hiding this comment

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

They seem to be different: getMetadataManager vs. getOmMetadataReader.

Copy link
Contributor

@Xushaohong Xushaohong Jun 30, 2023

Choose a reason for hiding this comment

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

Oops, my mistake.

when(ozoneManager.getAuditLogger()).thenReturn(auditLogger);
when(ozoneManager.getDefaultReplicationConfig()).thenReturn(
ReplicationConfig.getDefault(ozoneConfiguration));
Expand Down