Keep directory uploads inside their root - #1843
Open
sylvesterkaczmarek wants to merge 1 commit into
Open
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
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.
Summary
Prevent
files_from_dir()andasync_files_from_dir()from following directory-tree entries outside the directory the caller asked to upload.The current recursive walkers use
Path.is_dir()/anyio.Path.is_dir(), which follow symlinks. As a result, a symlink inside the requested directory can:Fix
Resolve the requested root once and require every traversed entry to resolve underneath it.
For directory recursion, track the
(st_dev, st_ino)identities currently on the recursion stack. Re-entering an active directory is treated as a symlink cycle and rejected explicitly.Safe symlinks whose targets remain inside the requested root continue to work. External links and cycles are rejected. The same protection is applied to the sync and async helpers.
Regression coverage
Adds tests covering:
The production change is confined to the hand-maintained directory upload helper.