peterxcli commented on code in PR #8558:
URL: https://github.com/apache/ozone/pull/8558#discussion_r2146512548
##########
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3Owner.java:
##########
@@ -80,4 +85,59 @@ public String toString() {
", id='" + id + '\'' +
'}';
}
+
+ /**
+ * Verify the bucket owner condition.
+ *
+ * @param headers HTTP headers
+ * @param bucketName bucket name
+ * @param bucketOwner bucket owner
+ * @throws OS3Exception if the expected bucket owner does not match
+ */
+ public static void verifyBucketOwnerCondition(HttpHeaders headers, String
bucketName, String bucketOwner)
+ throws OS3Exception {
+ if (headers == null || bucketOwner == null) {
+ return;
+ }
+
+ final String expectedBucketOwner =
headers.getHeaderString(S3Consts.EXPECTED_BUCKET_OWNER_HEADER);
+
+ if (StringUtils.isEmpty(expectedBucketOwner)) {
+ return;
+ }
+ if (expectedBucketOwner.equals(bucketOwner)) {
+ return;
+ }
+ throw S3ErrorTable.newError(S3ErrorTable.BUCKET_OWNER_MISMATCH,
bucketName);
+ }
Review Comment:
nit:
```suggestion
public static void verifyBucketOwnerCondition(HttpHeaders headers, String
bucketName, String headerKey, String actualOwner)
throws OS3Exception {
if (headers == null || actualOwner == null) {
return;
}
final String expectedOwner = headers.getHeaderString(headerKey);
if (StringUtils.isEmpty(expectedOwner)) {
return;
}
if (!expectedOwner.equals(actualOwner)) {
throw S3ErrorTable.newError(S3ErrorTable.BUCKET_OWNER_MISMATCH,
bucketName);
}
}
public static void verifyBucketOwnerCondition(HttpHeaders headers, String
bucketName, String actualOwner) throws OS3Exception {
verifyBucketOwnerCondition(headers, bucketName,
S3Consts.EXPECTED_BUCKET_OWNER_HEADER, actualOwner);
}
```
##########
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3Owner.java:
##########
@@ -80,4 +85,59 @@ public String toString() {
", id='" + id + '\'' +
'}';
}
+
+ /**
+ * Verify the bucket owner condition.
+ *
+ * @param headers HTTP headers
+ * @param bucketName bucket name
+ * @param bucketOwner bucket owner
+ * @throws OS3Exception if the expected bucket owner does not match
+ */
+ public static void verifyBucketOwnerCondition(HttpHeaders headers, String
bucketName, String bucketOwner)
+ throws OS3Exception {
+ if (headers == null || bucketOwner == null) {
+ return;
+ }
+
+ final String expectedBucketOwner =
headers.getHeaderString(S3Consts.EXPECTED_BUCKET_OWNER_HEADER);
+
+ if (StringUtils.isEmpty(expectedBucketOwner)) {
+ return;
+ }
+ if (expectedBucketOwner.equals(bucketOwner)) {
+ return;
+ }
+ throw S3ErrorTable.newError(S3ErrorTable.BUCKET_OWNER_MISMATCH,
bucketName);
+ }
+
+ /**
+ * Verify the bucket owner condition on copy operation.
+ *
+ * @param headers HTTP headers
+ * @param sourceBucketName source bucket name
+ * @param sourceOwner source bucket owner
+ * @param destBucketName dest bucket name
+ * @param destOwner destination bucket owner
+ * @throws OS3Exception if the expected source or destination bucket owner
does not match
+ */
+ public static void verifyBucketOwnerConditionOnCopyOperation(HttpHeaders
headers, String sourceBucketName,
+ String
sourceOwner, String destBucketName,
+ String
destOwner)
+ throws OS3Exception {
+ if (headers == null) {
+ return;
+ }
+
+ final String expectedSourceOwner =
headers.getHeaderString(S3Consts.EXPECTED_SOURCE_BUCKET_OWNER_HEADER);
+ final String expectedDestOwner =
headers.getHeaderString(S3Consts.EXPECTED_BUCKET_OWNER_HEADER);
+
+ if (expectedSourceOwner != null && sourceOwner != null &&
!sourceOwner.equals(expectedSourceOwner)) {
+ throw S3ErrorTable.newError(S3ErrorTable.BUCKET_OWNER_MISMATCH,
sourceBucketName);
+ }
+
+ if (expectedDestOwner != null && destOwner != null &&
!destOwner.equals(expectedDestOwner)) {
+ throw S3ErrorTable.newError(S3ErrorTable.BUCKET_OWNER_MISMATCH,
destBucketName);
+ }
+ }
Review Comment:
nit:
```suggestion
public static void verifyBucketOwnerConditionOnCopyOperation(HttpHeaders
headers, String sourceBucketName, String sourceOwner, String destBucketName,
String destOwner) throws OS3Exception {
if (headers == null) {
return;
}
verifyBucketOwnerCondition(headers, sourceBucketName,
S3Consts.EXPECTED_SOURCE_BUCKET_OWNER_HEADER, sourceOwner);
verifyBucketOwnerCondition(headers, destBucketName,
S3Consts.EXPECTED_BUCKET_OWNER_HEADER, destOwner);
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
