Fix bug of using symbolic link dir as storage path #340
Conversation
This file contains hidden or 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
There is a bug to use symbolic link directory as storage root path. It is a problem that whether the path is canonical
imay
requested changes
Nov 22, 2018
be/src/http/download_action.cpp
Outdated
| DCHECK_EQ(_download_type, ERROR_LOG); | ||
| if (FileSystemUtil::contain_path(_error_log_root_dir, file_path)) { | ||
| std::string canonical_file_path = canonical(file_path).string(); | ||
| if (FileSystemUtil::contain_path(canonical(_error_log_root_dir).string(), canonical_file_path)) { |
Contributor
There was a problem hiding this comment.
_error_log_root_dir should be set after canonical when initializing.
Contributor
There was a problem hiding this comment.
why not just call canonical in DownloadAction construct method?
be/src/http/download_action.cpp
Outdated
| std::string canonical_file_path = canonical(file_path).string(); | ||
| for (auto& allow_path : _allow_paths) { | ||
| if (FileSystemUtil::contain_path(allow_path, file_path)) { | ||
| if (FileSystemUtil::contain_path(canonical(allow_path).string(), canonical_file_path)) { |
Contributor
There was a problem hiding this comment.
same with _error_log_root_dir to _allow_paths
Contributor
|
@kangpinghuang |
morningman
requested changes
Nov 22, 2018
|
|
||
| Status DownloadAction::check_log_path_is_allowed(const std::string& file_path) { | ||
| DCHECK_EQ(_download_type, ERROR_LOG); | ||
| if (FileSystemUtil::contain_path(_error_log_root_dir, file_path)) { |
Contributor
There was a problem hiding this comment.
Is it better to get canonical path in a unified place?
Or you may miss somewhere.
In DownloadAction, checking fails by comparing canonical path with noncanonical path. So fix the bug by convert all path to canonical path before comparison
imay
reviewed
Nov 22, 2018
be/src/http/download_action.cpp
Outdated
|
|
||
| _download_type(NORMAL) { | ||
| for (auto& dir : allow_dirs) { | ||
| _allow_paths.emplace_back(std::move(canonical(dir).string())); |
Contributor
There was a problem hiding this comment.
canonical(dir).string() is already a rvalue, you needn't to call std::move
kangpinghuang
changed the title
Contributor
|
ISSUE #307 |
morningman
approved these changes
Nov 23, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 is a bug to use symbolic link directory as storage root path.
It is a problem that whether the path is canonical