arp7 commented on a change in pull request #1196:
URL: https://github.com/apache/hadoop-ozone/pull/1196#discussion_r456622410
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
##########
@@ -265,4 +273,72 @@ public AuditMessage buildAuditMessage(AuditAction op,
auditMap.put(OzoneConsts.VOLUME, volume);
return auditMap;
}
+
+
+ public static String validateAndNormalizeKey(boolean enableFileSystemPaths,
+ String keyName) throws OMException {
+ if (enableFileSystemPaths) {
+ return validateAndNormalizeKey(keyName);
+ } else {
+ return keyName;
+ }
+ }
+
+ @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
+ public static String validateAndNormalizeKey(String keyName)
+ throws OMException {
+ String normalizedKeyName;
+ if (keyName.startsWith(OM_KEY_PREFIX)) {
+ normalizedKeyName = Paths.get(keyName).toUri().normalize().getPath();
+ } else {
+ normalizedKeyName = Paths.get(OM_KEY_PREFIX, keyName).toUri()
+ .normalize().getPath();
+ }
+ if (!keyName.equals(normalizedKeyName)) {
+ LOG.debug("Normalized key {} to {} ", keyName,
+ normalizedKeyName.substring(1));
+ }
+ return isValidKeyPath(normalizedKeyName.substring(1));
+ }
+
+ /**
+ * Whether the pathname is valid. Check key names which contain a
+ * ":", ".", "..", "//", "". If it has any of these characters throws
+ * OMException, else return the path.
+ */
+ private static String isValidKeyPath(String path) throws OMException {
+ boolean isValid = true;
+
+ // If keyName is empty string throw error.
+ if (path.length() == 0) {
+ throw new OMException("Invalid KeyPath, empty keyName" + path,
+ INVALID_KEY_NAME);
+ } else if(path.startsWith("/")) {
+ isValid = false;
+ } else {
+ // Check for ".." "." ":" "/"
+ String[] components = StringUtils.split(path, '/');
+ for (int i = 0; i < components.length; i++) {
+ String element = components[i];
+ if (element.equals(".") ||
+ (element.contains(":")) ||
+ (element.contains("/") || element.equals(".."))) {
+ isValid = false;
+ break;
+ }
+
+ // The string may end with a /, but not have
Review comment:
Does this mean we are allowing trailing `/`?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: ozone-issues-h...@hadoop.apache.org
