fast_transfer_file API 分发文件，如果源文件中的文件名包含空格，会报错 #812 #1649
Conversation
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
wangyu096
requested changes
Dec 30, 2022
|
|
||
| Pattern p2 = Pattern.compile("^[a-zA-Z]:(/|\\\\).*");//windows | ||
| //windows，以'字母:\\'开头，不包含非法字符 | ||
| Pattern p2 = Pattern.compile("^[a-zA-Z]:((/|\\\\)([^<>:\"/\\\\|?*])*)*$"); |
There was a problem hiding this comment.
- 可以抽取为公共方法，方便复用
- 基本方法需要补充单元测试案例
- windows路径规范参考官方的，看下是否一致。https://learn.microsoft.com/en-us/dotnet/standard/io/file-path-formats
| Matcher m2 = p2.matcher(path); | ||
|
|
||
| if (!m2.matches()) { //非windows | ||
| if (!m2.matches()) { //非windows，除了/之外所有字符都合法 |
| Pattern p1 = Pattern.compile("(//|\\\\)+"); | ||
| Matcher m1 = p1.matcher(path); | ||
| if (m1.matches()) { | ||
| return false; | ||
| } | ||
|
|
||
| Pattern p2 = Pattern.compile("^[a-zA-Z]:(/|\\\\).*");//windows | ||
| //windows，以'字母:\\'开头，不包含非法字符 |
|
另外，参数的校验可以优化下，使用Spring validation，可以参考下其他地方的实现 |
added 2 commits
January 5, 2023 20:09
# Conflicts: # src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/api/esb/v2/impl/EsbFastPushFileResourceImpl.java # src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/api/esb/v3/EsbFastTransferFileV3ResourceImpl.java
wangyu096
requested changes
Jan 6, 2023
| } | ||
| // 传统DOS | ||
| pattern = "^[A-Za-z]:\\\\[^\\\\].*"; | ||
| r = Pattern.compile(pattern); |
There was a problem hiding this comment.
Pattern不建议调用没调用一次方法就compile一次，浪费性能。可以使用private static final Pattern 先预处理
| if (m.matches()) { | ||
| return true; | ||
| } | ||
| // 传统DOS |
There was a problem hiding this comment.
传统DOS是最常见的，所以可以把这块的检查放到最前面，其他校验代码就不需要执行
| */ | ||
| 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 先预处理
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath(":\\abc.txt")).isFalse(); | ||
|
|
||
| // linux路径 | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("/data/test_2022-04-12.apk")).isTrue(); |
There was a problem hiding this comment.
需要补充更多的测试用例，如一些比较常见的:
- 根目录 /
- /tmp/
- /tmp/test/../test.log
wangyu096
requested changes
Jan 6, 2023
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("data/test_2022-04-12.apk")).isFalse(); | ||
| assertThat(FilePathValidateUtil.validateFileSystemAbsolutePath("///")).isFalse(); |
There was a problem hiding this comment.
- /// 是合法linux路径
- 多个/的场景需要加入测试用例，比如/tmp////, /tmp//test/
| * @param path | ||
| * @return boolean | ||
| */ | ||
| private static boolean validateWindowsFileSystemAbsolutePath(String path) { | ||
| // DOS设备 | ||
| String pattern = "^\\\\\\\\.\\\\.+|\\\\\\\\\\?\\\\.+"; |
There was a problem hiding this comment.
GSE 目前只支持传统dos路径，Job需要保持一致；可以去掉DOS设备和UNC路径的判断
|
“liuliaozhong” seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.