use canMkdir replace isOwner in LocalFileSystem,and when io not proxy…

…, setPermission as parent
bouxin · Oct 12, 2021 · 1af027a · 1af027a
1 parent 89cde7d
commit 1af027a
Showing 1 changed file with 28 additions and 3 deletions.
diff --git a/...storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/LocalFileSystem.java b/...storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/LocalFileSystem.java
@@ -140,7 +140,7 @@ public boolean mkdirs(FsPath dest) throws IOException {
             dirsToMake.push(parent);
             parent = parent.getParentFile();
         }
-        if(!isOwner(parent.getPath())) {
+        if(!canMkdir(new FsPath(parent.getPath()))) {
             throw new IOException("only owner can mkdir path " + path);
         }
         while (!dirsToMake.empty()) {
@@ -157,6 +157,19 @@ public boolean mkdirs(FsPath dest) throws IOException {
         return true;
     }
 
+    public boolean canMkdir(FsPath destParentDir) throws IOException {
+        if (!StorageUtils.isIOProxy()){
+            LOG.debug("io not proxy, not check ownerer, just check if hava write permission ");
+            return this.canWrite(destParentDir);
+        }else{
+            LOG.info("io proxy, check owner ");
+            if(!isOwner(destParentDir.getPath())) {
+                throw new IOException("current user:" + user + ", parentPath:"+ destParentDir.getPath() +", only owner can mkdir path " + destParentDir);
+            }
+        }
+        return false;
+    }
+
     @Override
     public boolean copy(String origin, String dest) throws IOException {
         File file = new File(dest);
@@ -183,17 +196,29 @@ public boolean copy(String origin, String dest) throws IOException {
     @Override
     public boolean setPermission(FsPath dest, String permission) throws IOException {
         if (!StorageUtils.isIOProxy()){
-            LOG.info("io not proxy, setPermission skip");
+            LOG.info("io not proxy, setPermission as parent.");
+            try {
+                PosixFileAttributes attr  = Files.readAttributes(Paths.get(dest.getParent().getPath()), PosixFileAttributes.class);
+                LOG.debug("parent permissions: attr: " + attr);
+                Files.setPosixFilePermissions(Paths.get(dest.getPath()), attr.permissions());
+
+            }catch (NoSuchFileException e){
+                LOG.error("File or folder does not exist or file name is garbled(文件或者文件夹不存在或者文件名乱码)",e);
+                throw new StorageWarnException(51001,e.getMessage());
+            }
             return true;
+
         }
         String path = dest.getPath();
         if(StringUtils.isNumeric(permission)) {
             permission = FsPath.permissionFormatted(permission);
         }
         Files.setPosixFilePermissions(Paths.get(path), PosixFilePermissions.fromString(permission));
         return true;
+
     }
 
+
     @Override
     public FsPathListWithError listPathWithError(FsPath path) throws IOException {
         File file = new File(path.getPath());
@@ -402,4 +427,4 @@ private String getOwner(String path) throws IOException {
                 Files.readAttributes(Paths.get(path), PosixFileAttributes.class);
         return attr.owner().getName();
     }
-}
+}