Optimization of upload file interface in FsRestfulApi.java (#4357)

apache · Mar 14, 2023 · 1d9c9a3 · 1d9c9a3
1 parent 2c5abd7
commit 1d9c9a3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/linkis-dist/package/conf/linkis.properties b/linkis-dist/package/conf/linkis.properties
@@ -87,4 +87,6 @@ linkis.session.redis.port=6379
 # redis password
 linkis.session.redis.password=test123
 # redis sso switch
-linkis.session.redis.cache.enabled=false
+linkis.session.redis.cache.enabled=false
+wds.linkis.workspace.filesystem.owner.check=true
+wds.linkis.workspace.filesystem.path.check=true
diff --git a/...cript-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java b/...cript-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java
@@ -319,8 +319,8 @@ public Message upload(
     FileSystem fileSystem = fsService.getFileSystem(userName, fsPath);
     for (MultipartFile p : files) {
       String fileName = p.getOriginalFilename();
+      WorkspaceUtil.charCheckFileName(fileName);
       FsPath fsPathNew = new FsPath(fsPath.getPath() + "/" + fileName);
-      WorkspaceUtil.fileAndDirNameSpecialCharCheck(fsPathNew.getPath());
       fileSystem.createNewFile(fsPathNew);
       try (InputStream is = p.getInputStream();
           OutputStream outputStream = fileSystem.write(fsPathNew, true)) {
@@ -442,7 +442,7 @@ public void download(
       // downloaded(判断目录,目录不能下载)
       FileSystem fileSystem = fsService.getFileSystem(userName, fsPath);
       if (!fileSystem.exists(fsPath)) {
-        throw WorkspaceExceptionManager.createException(8011, path);
+        throw WorkspaceExceptionManager.createException(80011, path);
       }
       inputStream = fileSystem.read(fsPath);
       byte[] buffer = new byte[1024];

diff --git a/...rage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java b/...rage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java
@@ -84,14 +84,18 @@ public static String suffixTuning(String path) {
 
   public static void fileAndDirNameSpecialCharCheck(String path) throws WorkSpaceException {
     String name = new File(path).getName();
-    int i = name.lastIndexOf(".");
+    charCheckFileName(name);
+  }
+
+  public static void charCheckFileName(String fileName) throws WorkSpaceException {
+    int i = fileName.lastIndexOf(".");
     if (i != -1) {
-      name = name.substring(0, i);
+      fileName = fileName.substring(0, i);
     }
     // Only support numbers, uppercase letters, underscores, Chinese(只支持数字,字母大小写,下划线,中文)
     String specialRegEx = "^[\\w\\u4e00-\\u9fa5]{1,200}$";
     Pattern specialPattern = Pattern.compile(specialRegEx);
-    if (!specialPattern.matcher(name).find()) {
+    if (!specialPattern.matcher(fileName).find()) {
       WorkspaceExceptionManager.createException(80028);
     }
   }