Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fast_transfer_file API 分发文件，如果源文件中的文件名包含空格，会报错 #812 #1649

Open
wants to merge 5 commits into
base: 3.5.x
Choose a base branch
from
Open

fast_transfer_file API 分发文件，如果源文件中的文件名包含空格，会报错 #812 #1649

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83fd4ac
fast_transfer_file API 分发文件，如果源文件中的文件名包含空格，会报错 #812
Dec 30, 2022
f843a2a
bugfix: fast_transfer_file API 分发文件，如果源文件中的文件名包含空格，会报错 #812
Jan 5, 2023
658a77a
Merge remote-tracking branch 'origin/3.5.x_issue812' into 3.5.x_issue812
Jan 5, 2023
16fec58
bugfix: fast_transfer_file API 分发文件，如果源文件中的文件名包含空格，会报错 #812
Jan 6, 2023
3e64ca3
bugfix: fast_transfer_file API 分发文件，如果源文件中的文件名包含空格，会报错 #812
liuliaozhong Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...src/main/java/com/tencent/bk/job/execute/api/esb/v2/impl/EsbFastPushFileResourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,19 +187,16 @@ private boolean validateFileSystemPath(String path) {
if (StringUtils.isBlank(path)) {
return false;
}
if (path.indexOf(' ') != -1) {
return false;
}
Pattern p1 = Pattern.compile("(//|\\\\)+");
Matcher m1 = p1.matcher(path);
if (m1.matches()) {
return false;
}

Pattern p2 = Pattern.compile("^[a-zA-Z]:(/|\\\\).*");//windows
//windows，以'字母:\\'开头，不包含非法字符
Pattern p2 = Pattern.compile("^[a-zA-Z]:((/|\\\\)([^<>:\"/\\\\|?*])*)*$");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. 可以抽取为公共方法，方便复用
  2. 基本方法需要补充单元测试案例
  3. 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，除了/之外所有字符都合法
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

实现与注释不一致

if (path.charAt(0) == '/') {
return !path.contains("\\\\");
} else {
Expand Down
9 changes: 3 additions & 6 deletions ...rc/main/java/com/tencent/bk/job/execute/api/esb/v3/EsbFastTransferFileV3ResourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,19 +209,16 @@ private boolean validateFileSystemPath(String path) {
if (StringUtils.isBlank(path)) {
return false;
}
if (path.indexOf(' ') != -1) {
return false;
}
Pattern p1 = Pattern.compile("(//|\\\\)+");
Matcher m1 = p1.matcher(path);
if (m1.matches()) {
return false;
}

Pattern p2 = Pattern.compile("^[a-zA-Z]:(/|\\\\).*");//windows
//windows，以'字母:\\'开头，不包含非法字符
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

重复方法

Pattern p2 = Pattern.compile("^[a-zA-Z]:((/|\\\\)([^<>:\"/\\\\|?*])*)*$");
Matcher m2 = p2.matcher(path);

if (!m2.matches()) { //非windows
if (!m2.matches()) { //非windows，除了/之外所有字符都合法
if (path.charAt(0) == '/') {
return !path.contains("\\\\");
} else {
Expand Down