storage: fix corner cases in archive#856
Open
caxu-rh wants to merge 1 commit into
Open
Conversation
A symlink or hardlink in the archive pointing to a target in a sibling directory of the extract dir matching the same prefix, e.g. a link at the root of the archive `/foo` with extract dir `/tmp/root` pointing at `../rootx/bar`, is not caught as a breakout. Signed-off-by: Caleb Xu <caxu@redhat.com>
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.
A symlink or hardlink in the archive pointing to a target in a sibling directory of the extract dir matching the same prefix, e.g. a link at the root of the archive
/foowith extract dir/tmp/rootpointing at../rootx/bar, is not caught.With this fix, the goal is to make sure that
extractDirpassed intoextractTarFileEntryis alwaysCleaned (ensuring there is no trailing slash), and then add in a trailing slash when matching withHasPrefix. We can add aCleanat the top ofextractTarFileEntry, if that would be more clear.I added an additional set of test cases covering the scenario with a similarly named directory
destx, in addition to the existing scenario testing stuff invictim. The tests could also just be adjusted to just usedestxentirely and removevictim, but I'm not sure if there's still value in testing those separately, hence left it separate for now.