improve isatab parsing - #2875
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR hardens ISA-Tab parsing by resolving assay file names relative to the configured ISA-Tab directory, preventing simple ../ path traversal from investigation metadata, and adds core path-resolution utilities/tests to support that behavior.
Changes:
- Add
FilenameUtils.resolveWithin(Path dir, String name)to safely resolve child paths while rejecting..-based escapes. - Update
ISArchiveParserto resolve assay files viaresolveWithin(...)instead of string concatenation. - Add targeted tests for both the new utility and ISA-Tab parsing behavior when assay names attempt to escape the directory.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/isatab/ISArchiveParser.java | Uses FilenameUtils.resolveWithin to constrain assay file resolution to the ISA-Tab directory. |
| tika-parsers/tika-parsers-extended/tika-parser-scientific-module/src/test/java/org/apache/tika/parser/isatab/ISArchiveParserTest.java | Adds a regression test ensuring ../ assay references don’t read sibling/outside files. |
| tika-core/src/main/java/org/apache/tika/io/FilenameUtils.java | Introduces resolveWithin(...) helper for containment-checked path resolution. |
| tika-core/src/test/java/org/apache/tika/io/FilenameUtilsTest.java | Adds unit tests validating containment behavior and normalization edge cases. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.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.
Thanks for your contribution to Apache Tika! Your help is appreciated!
Before opening the pull request, please verify that
TIKA-XXXX)[TIKA-XXXX] Issue or pull request title)./mvnw clean testmainbranch. If there are conflicts, please try to rebase the pull request branch on top of a freshly pulledmainbranchtika-bom/pom.xml.We will be able to faster integrate your pull request if these conditions are met. If you have any questions how to fix your problem or about using Tika in general, please sign up for the Tika mailing list. Thanks!