Fix #680: Avoid trailing slashes in tar entry filenames #808
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
…trailing slashes
rnorth
changed the title
bsideup
reviewed
Jul 29, 2018
|
|
||
| private TarArchiveInputStream intoTarArchive(Consumer<TarArchiveOutputStream> consumer) throws IOException { | ||
| final ByteArrayOutputStream baos = new ByteArrayOutputStream(); | ||
| final TarArchiveOutputStream taos = new TarArchiveOutputStream(baos); |
There was a problem hiding this comment.
try-with-resources? Or @Cleanup?
bsideup
reviewed
Jul 29, 2018
| public void noTrailingSlashesInTarEntryNames() throws Exception { | ||
| final MountableFile mountableFile = MountableFile.forClasspathResource("mappable-resource/test-resource.txt"); | ||
|
|
||
| final TarArchiveInputStream tais = intoTarArchive((taos) -> { |
bsideup
reviewed
Jul 29, 2018
| final TarArchiveEntry tarEntry = new TarArchiveEntry(sourceFile, entryFilename + "/" + relativePathToSourceFile); // entry filename e.g. /xyz/bar/baz | ||
| final String tarEntryFilename; | ||
| if (relativePathToSourceFile.isEmpty()) { | ||
| tarEntryFilename = entryFilename; // entry filename e.g. xyz => xyz |
There was a problem hiding this comment.
I wonder what will happen if the user will call with it /some/entry?
Maybe we should strip / prefix from tarEntryFilename before passing to TarArchiveEntry's constructor, for the additional safety
There was a problem hiding this comment.
Hmm, I think it's allowed, isn't it? There's no source 'working directory' in this context, so 'abc' == '/abc'..?
I'll give it a try though.
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.
No description provided.