Fix s3 recursive download parent-dir escape guard missing bare '..' key - #10580
Open
Adityaj0 wants to merge 1 commit into
Open
Fix s3 recursive download parent-dir escape guard missing bare '..' key#10580Adityaj0 wants to merge 1 commit into
Adityaj0 wants to merge 1 commit into
Conversation
_warn_parent_reference only detected S3 keys that normalize to '../something', missing keys that normalize to exactly '..' (e.g. a legal key like 'prefix/..'). Such keys bypassed the intended warn-and-skip protection and crashed the download with an unhandled OS error instead. Fixes aws#10579
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
1 participant
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
Fixes #10579.
_warn_parent_reference(awscli/customizations/s3/s3handler.py), the guard that warns and skips S3 objects duringaws s3 cp/aws s3 sync --recursivewhen their key would make the local destination escape the target directory, only matched keys that normalize to'../something'. Keys that normalize to exactly'..'(e.g. a legal S3 key likeprefix/..) slipped past the check, bypassing the intended warning and causing an unhandled OS error (e.g.IsADirectoryError) during the download instead of a graceful skip.Fix: also treat a normalized path of exactly
'..'as escaping the destination.Test plan
tests/unit/customizations/s3/test_s3handler.py:test_warn_and_ignore_on_bare_parent_reference— key..test_warn_and_ignore_on_bare_parent_reference_with_prefix— keya/../..tests/unit/customizations/s3/test_s3handler.pysuite: 64 passed, no regressions..changes/next-release/.🤖 Generated with Claude Code