Skip to content

wrap invalid entry name in ArchiveEntry.resolveIn as ArchiveException - #809

Open
kali834x wants to merge 1 commit into
apache:masterfrom
kali834x:resolvein-invalid-entry-name
Open

wrap invalid entry name in ArchiveEntry.resolveIn as ArchiveException#809
kali834x wants to merge 1 commit into
apache:masterfrom
kali834x:resolvein-invalid-entry-name

Conversation

@kali834x

Copy link
Copy Markdown
Contributor

archiveentry.resolveIn is the default zip-slip guard that expander.expand calls for every entry, and it resolves the untrusted entry name via parentPath.resolve(getName()).normalize(). a name that carries a byte the platform path parser rejects, for example a NUL in a crafted zip central directory record, makes resolve throw an unchecked InvalidPathException out of resolveIn and out of expander.expand, both of which declare only throws IOException, so a caller draining an untrusted archive inside catch(IOException) aborts on an exception it never expects. wrap the resolve and rethrow InvalidPathException as ArchiveException, matching the zip-slip rejection already in the method. the new ArchiveEntryTest case fails before the change with the raw InvalidPathException and passes after.

  • Read the contribution guidelines for this project.
  • Read the ASF Generative Tooling Guidance if you use Artificial Intelligence (AI).
  • I used AI to create any part of, or all of, this pull request. Which AI tool was used to create this pull request, and to what extent did it contribute?
  • Run a successful build using the default Maven goal with mvn; that's mvn on the command line by itself.
  • Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied. This may not always be possible, but it is a best practice.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Each commit in the pull request should have a meaningful subject line and body. Note that a maintainer may squash commits during the merge process.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant