Added validation applied to OMDirectoryCreateRequest.

apache · Jan 24, 2024 · 990e6a4 · 990e6a4
1 parent 544011a
commit 990e6a4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/...nager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java b/...nager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
@@ -32,7 +32,6 @@
 import org.apache.hadoop.hdds.client.ReplicationConfig;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.ratis.server.protocol.TermIndex;
-import org.apache.hadoop.ozone.OmUtils;
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
 import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
 import org.apache.hadoop.ozone.om.helpers.BucketLayout;
@@ -117,8 +116,8 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
         super.preExecute(ozoneManager).getCreateDirectoryRequest();
     Preconditions.checkNotNull(createDirectoryRequest);
 
-    OmUtils.verifyKeyNameWithSnapshotReservedWord(
-        createDirectoryRequest.getKeyArgs().getKeyName());
+    KeyArgs keyArgs = createDirectoryRequest.getKeyArgs();
+    validateKeyName(ozoneManager, keyArgs, keyArgs.getKeyName());
 
     KeyArgs.Builder newKeyArgs = createDirectoryRequest.getKeyArgs()
         .toBuilder().setModificationTime(Time.now());

diff --git a/...ne-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java b/...ne-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
@@ -31,7 +31,6 @@
 import org.apache.hadoop.hdds.client.ReplicationConfig;
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.ratis.server.protocol.TermIndex;
-import org.apache.hadoop.ozone.OmUtils;
 import org.apache.hadoop.ozone.om.OzoneConfigUtil;
 import org.apache.hadoop.ozone.om.helpers.BucketLayout;
 import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
@@ -94,9 +93,9 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
     KeyArgs keyArgs = createFileRequest.getKeyArgs();
 
     // Verify key name
-    OmUtils.verifyKeyNameWithSnapshotReservedWord(keyArgs.getKeyName());
-    validateKeyName(ozoneManager, StringUtils.removeEnd(keyArgs.getKeyName(),
-        OzoneConsts.FS_FILE_COPYING_TEMP_SUFFIX));
+    validateKeyName(ozoneManager, keyArgs,
+        StringUtils.removeEnd(keyArgs.getKeyName(),
+            OzoneConsts.FS_FILE_COPYING_TEMP_SUFFIX));
 
     UserInfo userInfo = getUserInfo();
     if (keyArgs.getKeyName().length() == 0) {

diff --git a/...zone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java b/...zone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
@@ -93,8 +93,9 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
     KeyArgs keyArgs = commitKeyRequest.getKeyArgs();
 
     // Verify key name
-    validateKeyName(ozoneManager, StringUtils.removeEnd(keyArgs.getKeyName(),
-        OzoneConsts.FS_FILE_COPYING_TEMP_SUFFIX));
+    validateKeyName(ozoneManager, keyArgs,
+        StringUtils.removeEnd(keyArgs.getKeyName(),
+            OzoneConsts.FS_FILE_COPYING_TEMP_SUFFIX));
 
     boolean isHsync = commitKeyRequest.hasHsync() &&
         commitKeyRequest.getHsync();

diff --git a/...zone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java b/...zone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
@@ -29,7 +29,6 @@
 import com.google.common.base.Preconditions;
 import org.apache.hadoop.hdds.client.ReplicationConfig;
 import org.apache.ratis.server.protocol.TermIndex;
-import org.apache.hadoop.ozone.OmUtils;
 import org.apache.hadoop.ozone.om.OzoneConfigUtil;
 import org.apache.hadoop.ozone.om.exceptions.OMException;
 import org.apache.hadoop.ozone.om.helpers.BucketLayout;
@@ -93,8 +92,7 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
     KeyArgs keyArgs = createKeyRequest.getKeyArgs();
 
     // Verify key name
-    OmUtils.verifyKeyNameWithSnapshotReservedWord(keyArgs.getKeyName());
-    validateKeyName(ozoneManager, keyArgs.getKeyName());
+    validateKeyName(ozoneManager, keyArgs, keyArgs.getKeyName());
 
     String keyPath = keyArgs.getKeyName();
     keyPath = validateAndNormalizeKey(ozoneManager.getEnableFileSystemPaths(),

diff --git a/...zone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java b/...zone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
@@ -82,7 +82,8 @@ public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
     Preconditions.checkNotNull(renameKeyRequest);
     // Verify key name
     KeyArgs renameKeyArgs = renameKeyRequest.getKeyArgs();
-    validateKeyName(ozoneManager, renameKeyRequest.getToKeyName());
+    validateKeyName(ozoneManager, renameKeyArgs,
+        renameKeyRequest.getToKeyName());
 
     String srcKey = extractSrcKey(renameKeyArgs);
     String dstKey = extractDstKey(renameKeyRequest);

diff --git a/...zone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java b/...zone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
@@ -174,8 +174,11 @@ protected KeyArgs resolveBucketAndCheckOpenKeyAcls(KeyArgs keyArgs,
     return resolvedArgs;
   }
 
-  protected void validateKeyName(OzoneManager ozoneManager, String keyName)
-      throws OMException {
+  protected void validateKeyName(OzoneManager ozoneManager, KeyArgs keyArgs,
+      String keyName) throws OMException {
+    if (keyArgs != null && keyArgs.getKeyName() != null) {
+      OmUtils.verifyKeyNameWithSnapshotReservedWord(keyArgs.getKeyName());
+    }
     final boolean checkKeyNameEnabled = ozoneManager.getConfiguration()
         .getBoolean(OMConfigKeys.OZONE_OM_KEYNAME_CHARACTER_CHECK_ENABLED_KEY,
             OMConfigKeys.OZONE_OM_KEYNAME_CHARACTER_CHECK_ENABLED_DEFAULT);