refactor: canonicalize load paths in load_from functions
#1462
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
Br1ght0ne
commented
Jul 29, 2024
hal3e
reviewed
Aug 12, 2024
`absolute` resolves the path against `workdir`, `clean` removes extra `..` inside. Using `clean` before `absolute` with paths that go outside of the root (e.g., "/one/two/../../../above_root") can lead to losing levels of `..`
4 tasks
|
Do you mind resolving these conflicts so we can wrap up this PR? |
digorithm
approved these changes
Sep 9, 2024
| ) | ||
| })?; | ||
| let clean_file_path = path_clean::clean(absolute_file_path); | ||
| let code = fs::read(&clean_file_path).map_err(|e| { |
There was a problem hiding this comment.
I'd change this just slightly:
- read the code with the original path
- if that fails, clean up the path and report that we failed to read the clean path
- if cleaning up fails fallback to the original path and report that
Because we don't need a "clean" path to read the data only for diagnostics. So in the eventuality of any schenanigans with symlinks we'll still function, only our reporting might or might not be nice.
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.
This helps users by showing an accurate, absolute path in error messages.
Checklist