From 6872efcabfd8fad5658642baa26df0e74399348b Mon Sep 17 00:00:00 2001 From: Anu Engineer Date: Wed, 10 Jul 2019 11:28:18 -0700 Subject: [PATCH] HDDS-1611.[Addendum] Evaluate ACL on volume bucket key and prefix to authorize access. Contributed by Ajay Kumar. (#973) Fixes a build break in ozone. --- .../org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java index d8afb91e80d..bd90b2d3ba8 100644 --- a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java +++ b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java @@ -43,10 +43,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathIsNotEmptyDirectoryException; import org.apache.hadoop.fs.permission.FsPermission; - import org.apache.hadoop.ozone.om.exceptions.OMException; -import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus; - import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.util.Progressable; @@ -632,8 +629,8 @@ public FileStatus getFileStatus(Path f) throws IOException { String key = pathToKey(qualifiedPath); FileStatus fileStatus = null; try { - fileStatus = adapter.getFileStatus(key) - .makeQualified(uri, qualifiedPath, getUsername(), getUsername()); + fileStatus = convertFileStatus( + adapter.getFileStatus(key, uri, qualifiedPath, getUsername())); } catch (OMException ex) { if (ex.getResult().equals(OMException.ResultCodes.KEY_NOT_FOUND)) { throw new FileNotFoundException("File not found. path:" + f);