Enforce ZipSecureFile limits for encrypted temp ZIP streams#1062
Open
jmestwa-coder wants to merge 1 commit into
Open
Enforce ZipSecureFile limits for encrypted temp ZIP streams#1062jmestwa-coder wants to merge 1 commit into
jmestwa-coder wants to merge 1 commit into
Conversation
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.
Summary
ZipSecureFilethreshold enforcement during encrypted temp ZIP processingCipherstate across returned streamsChanges
wrap encrypted temp ZIP streaming with
ZipArchiveThresholdInputStreamkeep
ZipArchiveThresholdInputStream#getNextEntry()package-localadd a small internal streaming helper to preserve existing streaming semantics without widening API visibility
create independent decrypt/encrypt
Cipherinstances for each stream/entryadd regression tests for:
Before
ZipSecureFilelimitsCipherstateAfter
ZipSecureFileprotectionsValidation
Verified with:
.\gradlew.bat :poi-ooxml:test --tests org.apache.poi.poifs.crypt.tests.TestSecureTempZip -PjdkVersion=17.\gradlew.bat :poi-ooxml:test --tests org.apache.poi.poifs.crypt.tests.TestEncryptedTempZipThreshold -PjdkVersion=17