Avoid creating directories outside of target#2
Merged
charliermarsh merged 1 commit intomainfrom Feb 2, 2025
Merged
Conversation
charliermarsh
added a commit
to astral-sh/uv
that referenced
this pull request
Feb 3, 2025
## Summary I shipped one security fix here along with several significant performance improvements for large TAR files: - astral-sh/tokio-tar#2 - astral-sh/tokio-tar#4 - astral-sh/tokio-tar#5 I also PR'd the security fix to `edera-dev` (edera-dev/tokio-tar#4).
konstin
added a commit
that referenced
this pull request
Feb 4, 2025
In #2, we accidentally changed the `target_base` from the target base to the parent of the file. This would cause hardlink unpacking to fail. Example: A hardlink at `hardlinked-0.1.0/pyproject.toml` pointing to `hardlinked-0.1.0/pyproject.toml.real` would try pointing to `hardlinked-0.1.0/`hardlinked-0.1.0/pyproject.toml.real` instead and fail the unpacking. [future edit: uv companion PR with test]
konstin
added a commit
that referenced
this pull request
Feb 4, 2025
In #2, we accidentally changed the `target_base` from the target base to the parent of the file. This would cause hardlink unpacking to fail. Example: A hardlink at `hardlinked-0.1.0/pyproject.toml` pointing to `hardlinked-0.1.0/pyproject.toml.real` would try pointing to `hardlinked-0.1.0/`hardlinked-0.1.0/pyproject.toml.real` instead and fail the unpacking. [future edit: uv companion PR with test]
konstin
added a commit
to astral-sh/uv
that referenced
this pull request
Feb 4, 2025
In astral-sh/tokio-tar#2, we accidentally changed the `target_base` from the target base to the parent of the file. This would cause hardlink unpacking to fail. Example: A hardlink at `hardlinked-0.1.0/pyproject.toml` pointing to `hardlinked-0.1.0/pyproject.toml.real` would try pointing to `hardlinked-0.1.0/hardlinked-0.1.0/pyproject.toml.real` instead and fail the unpacking. The actual fix is krata-tokio-tar, on the uv side there are only tests. Fixes #11213
konstin
added a commit
that referenced
this pull request
Feb 4, 2025
In #2, we accidentally changed the `target_base` from the target base to the parent of the file. This would cause hardlink unpacking to fail. Example: A hardlink at `hardlinked-0.1.0/pyproject.toml` pointing to `hardlinked-0.1.0/pyproject.toml.real` would try pointing to `hardlinked-0.1.0/hardlinked-0.1.0/pyproject.toml.real` instead and fail the unpacking. uv companion PR with test: astral-sh/uv#11221
konstin
added a commit
to astral-sh/uv
that referenced
this pull request
Feb 4, 2025
In astral-sh/tokio-tar#2, we accidentally changed the `target_base` from the target base to the parent of the file. This would cause hardlink unpacking to fail. Example: A hardlink at `hardlinked-0.1.0/pyproject.toml` pointing to `hardlinked-0.1.0/pyproject.toml.real` would try pointing to `hardlinked-0.1.0/hardlinked-0.1.0/pyproject.toml.real` instead and fail the unpacking. The actual fix is krata-tokio-tar, on the uv side there are only tests. Fixes #11213
konstin
added a commit
to astral-sh/uv
that referenced
this pull request
Feb 4, 2025
In astral-sh/tokio-tar#2, we accidentally changed the `target_base` from the target base to the parent of the file. This would cause hardlink unpacking to fail. Example: A hardlink at `hardlinked-0.1.0/pyproject.toml` pointing to `hardlinked-0.1.0/pyproject.toml.real` would try pointing to `hardlinked-0.1.0/hardlinked-0.1.0/pyproject.toml.real` instead and fail the unpacking. The actual fix is in astral-tokio-tar, on the uv side there are only tests. Fixes #11213
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
This is a port of alexcrichton/tar-rs#259 which was later ported to
async-tarin dignifiedquire/async-tar#24. The goal is to avoid allowing archives to create directories outside of the target path by deferring the creation of directories.Test Plan
cargo test