fast_transfer_file API 分发文件，如果源文件中的文件名包含空格，会报错 #812 #1649
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| package com.tencent.bk.job.common.util; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * 文件路径合法性校验工具类 | ||
| */ | ||
| public class FilePathValidateUtil { | ||
| /** | ||
| * 验证文件系统绝对路径的合法性 | ||
| * @param path 绝对路径 | ||
| * @return boolean true合法，false非法 | ||
| */ | ||
| public static boolean validateFileSystemAbsolutePath(String path) { | ||
| if (StringUtils.isBlank(path)) { | ||
| return false; | ||
| } | ||
| if (isLinuxAbsolutePath(path)) { | ||
| return validateLinuxFileSystemAbsolutePath(path); | ||
| } else { | ||
| return validateWindowsFileSystemAbsolutePath(path); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * 判断是否Linux绝对路径 | ||
| * | ||
| * @param path 文件路径 | ||
| * @return boolean | ||
| */ | ||
| private static boolean isLinuxAbsolutePath(String path) { | ||
| if (path.startsWith("/")) { | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * 1 DOS设备路径： | ||
| * 设备路径说明符（\\.\ 或 \\?\），它将路径标识为DOS设备路径 | ||
| * 2 UNC路径 | ||
| * 以\\开头的服务器名或主机名,路径必须始终是完全限定的 | ||
| * 组成：\\服务器名\共享名\可选目录名\可选文件名 | ||
| * 3 传统DOS路径 | ||
| * 标准的DOS路径可由以下三部分组成： | ||
| * 1)卷号或驱动器号，后跟卷分隔符(:)。 | ||
| * 2)目录名称。目录分隔符用来分隔嵌套目录层次结构中的子目录。 | ||
| * 3)文件名。目录分隔符用来分隔文件路径和文件名。 | ||
| * | ||
| * @param path | ||
| * @return boolean | ||
| */ | ||
| private static boolean validateWindowsFileSystemAbsolutePath(String path) { | ||
| // DOS设备 | ||
| String pattern = "^\\\\\\\\.\\\\.+|\\\\\\\\\\?\\\\.+"; | ||
| Pattern r = Pattern.compile(pattern); | ||
| Matcher m = r.matcher(path); | ||
| if (m.matches()) { | ||
| return true; | ||
| } | ||
| // UNC | ||
| pattern = "^\\\\\\\\[^\\\\]+\\\\[^\\\\]+\\\\.*"; | ||
| r = Pattern.compile(pattern); | ||
| m = r.matcher(path); | ||
| if (m.matches()) { | ||
| return true; | ||
| } | ||
| // 传统DOS | ||
| pattern = "^[A-Za-z]:\\\\[^\\\\].*"; | ||
| r = Pattern.compile(pattern); | ||
|
There was a problem hiding this comment. Pattern不建议调用没调用一次方法就compile一次，浪费性能。可以使用private static final Pattern 先预处理 |
||
| m = r.matcher(path); | ||
| if (m.matches()) { | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * 文件或目录名，除了/以外，所有的字符都合法 | ||
| * | ||
| * @param path | ||
| * @return boolean | ||
| */ | ||
| private static boolean validateLinuxFileSystemAbsolutePath(String path) { | ||
| String pattern = "^/([^/].*/{0,1})+"; | ||
| Pattern r = Pattern.compile(pattern); | ||
|
There was a problem hiding this comment. Pattern不建议调用没调用一次方法就compile一次，浪费性能。可以使用private static final Pattern 先预处理 |
||
| Matcher m = r.matcher(path); | ||
| if (m.matches()) { | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package com.tencent.bk.job.common.util; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.assertj.core.api.AssertionsForClassTypes.assertThat; | ||
|
|
||
| public class FilePathValidateUtilTest { | ||
| @Test | ||
| void testFileSystemAbsolutePath(){ | ||
| // DOS设备路径 | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("\\\\.\\C:\\Test\\Foo.txt")).isTrue(); | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("\\\\?\\C:\\Test\\Foo.txt")).isTrue(); | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("\\\\Test\\Foo.txt")).isFalse(); | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("\\\\?\\C:\\Te st\\嘉Foo.txt")).isTrue(); | ||
|
|
||
| // UNC路径 | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("\\\\system07\\C$\\")).isTrue(); | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("\\\\Server2\\Share\\Test\\Foo.txt")).isTrue(); | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("\\\\Server201\\C$\\Test1\\Fo o.txt")).isTrue(); | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("\\\\system07")).isFalse(); | ||
|
|
||
| // 传统DOS路径 | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("C:\\Documents\\abc.txt")).isTrue(); | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("c:\\Documents\\abc.txt")).isTrue(); | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("C:\\Documents\\嘉 abc.txt")).isTrue(); | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath(":\\abc.txt")).isFalse(); | ||
|
|
||
| // linux路径 | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("/data/test_2022-04-12.apk")).isTrue(); | ||
|
There was a problem hiding this comment. 需要补充更多的测试用例，如一些比较常见的:
|
||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("/data/test_2022 04 12.apk")).isTrue(); | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("data/test_2022-04-12.apk")).isFalse(); | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
传统DOS是最常见的，所以可以把这块的检查放到最前面，其他校验代码就不需要执行