Skip to content

HDDS-6820. Bucket Layout Post-Finalization Validators for ACL Requests. #3472

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
rakeshadr merged 1 commit into from
Jun 2, 2022
Merged

HDDS-6820. Bucket Layout Post-Finalization Validators for ACL Requests. #3472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 41 additions & 0 deletions ...-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyAddAclRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,19 @@
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
import org.apache.hadoop.ozone.om.request.util.ObjectParser;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
import org.apache.hadoop.ozone.om.request.validation.RequestFeatureValidator;
import org.apache.hadoop.ozone.om.request.validation.RequestProcessingPhase;
import org.apache.hadoop.ozone.om.request.validation.ValidationCondition;
import org.apache.hadoop.ozone.om.request.validation.ValidationContext;
import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
import org.apache.hadoop.ozone.security.acl.OzoneObj;
import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;
import org.apache.hadoop.util.Time;
Expand Down Expand Up @@ -147,5 +155,38 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
return super.validateAndUpdateCache(ozoneManager, trxnLogIndex,
omDoubleBufferHelper);
}

/**
* Validates Add ACL requests.
* We do not want to allow older clients to create add ACL requests
* for keys that are present in buckets which use non LEGACY layouts.
*
* @param req - the request to validate
* @param ctx - the validation context
* @return the validated request
* @throws OMException if the request is invalid
*/
@RequestFeatureValidator(
conditions = ValidationCondition.OLDER_CLIENT_REQUESTS,
processingPhase = RequestProcessingPhase.PRE_PROCESS,
requestType = Type.AddAcl
)
public static OMRequest blockAddAclWithBucketLayoutFromOldClient(
OMRequest req, ValidationContext ctx) throws IOException {
if (req.getAddAclRequest().hasObj()) {
OzoneObj obj = OzoneObjInfo.fromProtobuf(req.getAddAclRequest().getObj());
String path = obj.getPath();

ObjectParser objectParser = new ObjectParser(path,
OzoneManagerProtocolProtos.OzoneObj.ObjectType.KEY);

String volume = objectParser.getVolume();
String bucket = objectParser.getBucket();

BucketLayout bucketLayout = ctx.getBucketLayout(volume, bucket);
bucketLayout.validateSupportedOperation();
}
return req;
}
}

41 changes: 41 additions & 0 deletions ...nager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeyRemoveAclRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,19 @@
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
import org.apache.hadoop.ozone.om.request.util.ObjectParser;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
import org.apache.hadoop.ozone.om.request.validation.RequestFeatureValidator;
import org.apache.hadoop.ozone.om.request.validation.RequestProcessingPhase;
import org.apache.hadoop.ozone.om.request.validation.ValidationCondition;
import org.apache.hadoop.ozone.om.request.validation.ValidationContext;
import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
import org.apache.hadoop.ozone.security.acl.OzoneObj;
import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;
import org.apache.hadoop.util.Time;
Expand Down Expand Up @@ -149,5 +157,38 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
omDoubleBufferHelper);
}

/**
* Validates Add ACL requests.
* We do not want to allow older clients to create remove ACL requests
* for keys that are present in buckets which use non LEGACY layouts.
*
* @param req - the request to validate
* @param ctx - the validation context
* @return the validated request
* @throws OMException if the request is invalid
*/
@RequestFeatureValidator(
conditions = ValidationCondition.OLDER_CLIENT_REQUESTS,
processingPhase = RequestProcessingPhase.PRE_PROCESS,
requestType = Type.RemoveAcl
)
public static OMRequest blockRemoveAclWithBucketLayoutFromOldClient(
OMRequest req, ValidationContext ctx) throws IOException {
if (req.getRemoveAclRequest().hasObj()) {
OzoneObj obj =
OzoneObjInfo.fromProtobuf(req.getRemoveAclRequest().getObj());
String path = obj.getPath();

ObjectParser objectParser = new ObjectParser(path,
OzoneManagerProtocolProtos.OzoneObj.ObjectType.KEY);

String volume = objectParser.getVolume();
String bucket = objectParser.getBucket();

BucketLayout bucketLayout = ctx.getBucketLayout(volume, bucket);
bucketLayout.validateSupportedOperation();
}
return req;
}
}

41 changes: 41 additions & 0 deletions ...-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/acl/OMKeySetAclRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,20 @@
import org.apache.hadoop.ozone.audit.AuditLogger;
import org.apache.hadoop.ozone.audit.OMAction;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OzoneAclUtil;
import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
import org.apache.hadoop.ozone.om.request.util.ObjectParser;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
import org.apache.hadoop.ozone.om.request.validation.RequestFeatureValidator;
import org.apache.hadoop.ozone.om.request.validation.RequestProcessingPhase;
import org.apache.hadoop.ozone.om.request.validation.ValidationCondition;
import org.apache.hadoop.ozone.om.request.validation.ValidationContext;
import org.apache.hadoop.ozone.om.response.key.acl.OMKeyAclResponse;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
import org.apache.hadoop.ozone.security.acl.OzoneObj;
import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;
import org.apache.hadoop.util.Time;
Expand Down Expand Up @@ -145,5 +153,38 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
omDoubleBufferHelper);
}

/**
* Validates Add ACL requests.
* We do not want to allow older clients to create set ACL requests
* for keys that are present in buckets which use non LEGACY layouts.
*
* @param req - the request to validate
* @param ctx - the validation context
* @return the validated request
* @throws OMException if the request is invalid
*/
@RequestFeatureValidator(
conditions = ValidationCondition.OLDER_CLIENT_REQUESTS,
processingPhase = RequestProcessingPhase.PRE_PROCESS,
requestType = Type.SetAcl
)
public static OMRequest blockSetAclWithBucketLayoutFromOldClient(
OMRequest req, ValidationContext ctx) throws IOException {
if (req.getSetAclRequest().hasObj()) {
OzoneObj obj =
OzoneObjInfo.fromProtobuf(req.getSetAclRequest().getObj());
String path = obj.getPath();

ObjectParser objectParser = new ObjectParser(path,
OzoneManagerProtocolProtos.OzoneObj.ObjectType.KEY);

String volume = objectParser.getVolume();
String bucket = objectParser.getBucket();

BucketLayout bucketLayout = ctx.getBucketLayout(volume, bucket);
bucketLayout.validateSupportedOperation();
}
return req;
}
}