Skip to content

Commit 6872efc

Browse files
committed
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.
1 parent eccc9a4 commit 6872efc

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@
4343
import org.apache.hadoop.fs.Path;
4444
import org.apache.hadoop.fs.PathIsNotEmptyDirectoryException;
4545
import org.apache.hadoop.fs.permission.FsPermission;
46-
4746
import org.apache.hadoop.ozone.om.exceptions.OMException;
48-
import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
49-
5047
import org.apache.hadoop.security.UserGroupInformation;
5148
import org.apache.hadoop.security.token.Token;
5249
import org.apache.hadoop.util.Progressable;
@@ -632,8 +629,8 @@ public FileStatus getFileStatus(Path f) throws IOException {
632629
String key = pathToKey(qualifiedPath);
633630
FileStatus fileStatus = null;
634631
try {
635-
fileStatus = adapter.getFileStatus(key)
636-
.makeQualified(uri, qualifiedPath, getUsername(), getUsername());
632+
fileStatus = convertFileStatus(
633+
adapter.getFileStatus(key, uri, qualifiedPath, getUsername()));
637634
} catch (OMException ex) {
638635
if (ex.getResult().equals(OMException.ResultCodes.KEY_NOT_FOUND)) {
639636
throw new FileNotFoundException("File not found. path:" + f);

0 commit comments

Comments
 (0)