8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File #6342

LanceAndersen · 2021-11-10T20:51:20Z

Hi all,

This patch addresses a regression introduced in JDK 15 via JDK-8242959 where you can no longer access a file entry contained within a Zip file when there is also a directory entry with the same name via ZipFile:getEntry().

Once fixed, the behavior will be consistent with earlier JDK releases.

Mach5 tiers 1-3 have been run without failure

Best
Lance

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File

Reviewers

Claes Redestad (@cl4es - Reviewer)
Alan Bateman (@AlanBateman - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6342/head:pull/6342
$ git checkout pull/6342

Update a local copy of the PR:
$ git checkout pull/6342
$ git pull https://git.openjdk.java.net/jdk pull/6342/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6342

View PR using the GUI difftool:
$ git pr show -t 6342

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6342.diff

bridgekeeper · 2021-11-10T20:51:51Z

👋 Welcome back lancea! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2021-11-10T20:56:54Z

@LanceAndersen The following label will be automatically applied to this pull request:

core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2021-11-10T21:01:54Z

Webrevs

01: Full - Incremental (93b46c66)
00: Full (2d5e5913)

cl4es

LGTM!

cl4es · 2021-11-10T21:32:32Z

test/jdk/java/util/zip/ZipFile/ZipFileDuplicateEntryTest.java

+        return buffer.toByteArray();
+    }
+
+    /**


Thank you for the quick review Claes!

I was going to remove this method but chose to leave it in to make it a bit more straight forward to port to JDK 8 (which I have run the test on as well). No strong preferences, just figured leaving it there might make it slightly easier for a back port.

openjdk · 2021-11-10T21:34:20Z

@LanceAndersen This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File

Reviewed-by: redestad, alanb

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 200 new commits pushed to the master branch:

13deb38: 8276848: sun.net.httpserver.simpleserver.CommandLinePositiveTest: test does not specify port
710f496: 8273277: C2: Move conditional negation into rc_predicate
6b833db: 8275329: ZGC: vmTestbase/gc/gctests/SoftReference/soft004/soft004.java fails with assert(_phases->length() <= 1000) failed: Too many recored phases?
1e941de: 8275197: Remove unused fields in ThaiBuddhistChronology
6954b98: 8186670: Implement _onSpinWait() intrinsic for AArch64
3445e50: 8276265: jcmd man page is outdated
0ca0acf: 8276947: Clarify how DateTimeFormatterBuilder.appendFraction handles value ranges
b0d7a9d: 8276994: java/nio/channels/Channels/TransferTo.java leaves multi-GB files in /tmp
8aae88b: 8276763: java/nio/channels/SocketChannel/AdaptorStreams.java fails with "SocketTimeoutException: Read timed out"
6f35eed: 8079267: [TEST_BUG] Test java/awt/Frame/MiscUndecorated/RepaintTest.java fails
... and 190 more: https://git.openjdk.java.net/jdk/compare/63b9f8c0da2ed3634002f0f67b18555826aeddc4...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

src/java.base/share/classes/java/util/zip/ZipFile.java

test/jdk/java/util/zip/ZipFile/ZipFileDuplicateEntryTest.java

LanceAndersen · 2021-11-12T17:10:56Z

/integrate

openjdk · 2021-11-12T17:12:29Z

Going to push as commit b85500e.
Since your change was applied there have been 206 commits pushed to the master branch:

0d2980c: 8258192: Obsolete the CriticalJNINatives flag
5a2452c: 8274835: Remove unnecessary castings in java.base
3b2585c: 8276658: Clean up JNI local handles code
aeba653: 8276743: Make openjdk build Zip Archive generation "reproducible"
51a5731: 8277016: Use blessed modifier order in jdk.httpserver
c4b4432: 8277012: Use blessed modifier order in src/utils
13deb38: 8276848: sun.net.httpserver.simpleserver.CommandLinePositiveTest: test does not specify port
710f496: 8273277: C2: Move conditional negation into rc_predicate
6b833db: 8275329: ZGC: vmTestbase/gc/gctests/SoftReference/soft004/soft004.java fails with assert(_phases->length() <= 1000) failed: Too many recored phases?
1e941de: 8275197: Remove unused fields in ThaiBuddhistChronology
... and 196 more: https://git.openjdk.java.net/jdk/compare/63b9f8c0da2ed3634002f0f67b18555826aeddc4...master

Your commit was automatically rebased without conflicts.

openjdk · 2021-11-12T17:12:48Z

@LanceAndersen Pushed as commit b85500e.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

LanceAndersen added 2 commits November 10, 2021 12:56

Fix for JDK-8276123

b2074c9

Address javadoc typo

2d5e591

LanceAndersen marked this pull request as ready for review November 10, 2021 20:51

openjdk bot changed the title ~~8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File~~ 8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File Nov 10, 2021

openjdk bot added the rfr Pull request is ready for review label Nov 10, 2021

openjdk bot added the core-libs core-libs-dev@openjdk.org label Nov 10, 2021

cl4es approved these changes Nov 10, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 10, 2021

jaikiran reviewed Nov 11, 2021

View reviewed changes

src/java.base/share/classes/java/util/zip/ZipFile.java Outdated Show resolved Hide resolved

AlanBateman reviewed Nov 11, 2021

View reviewed changes

test/jdk/java/util/zip/ZipFile/ZipFileDuplicateEntryTest.java Outdated Show resolved Hide resolved

Address minor review comments

93b46c6

cl4es approved these changes Nov 11, 2021

View reviewed changes

AlanBateman approved these changes Nov 12, 2021

View reviewed changes

openjdk bot closed this Nov 12, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 12, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File #6342

8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File #6342

Uh oh!

LanceAndersen commented Nov 10, 2021 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Nov 10, 2021

Uh oh!

openjdk bot commented Nov 10, 2021

Uh oh!

mlbridge bot commented Nov 10, 2021 •

edited

Loading

Uh oh!

cl4es left a comment

Uh oh!

cl4es Nov 10, 2021

Uh oh!

LanceAndersen Nov 10, 2021

Uh oh!

openjdk bot commented Nov 10, 2021 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

LanceAndersen commented Nov 12, 2021

Uh oh!

openjdk bot commented Nov 12, 2021

Uh oh!

openjdk bot commented Nov 12, 2021

Uh oh!

Uh oh!

8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File #6342

8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File #6342

Uh oh!

Conversation

LanceAndersen commented Nov 10, 2021 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Nov 10, 2021

Uh oh!

openjdk bot commented Nov 10, 2021

Uh oh!

mlbridge bot commented Nov 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

cl4es left a comment

Choose a reason for hiding this comment

Uh oh!

cl4es Nov 10, 2021

Choose a reason for hiding this comment

Uh oh!

LanceAndersen Nov 10, 2021

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Nov 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LanceAndersen commented Nov 12, 2021

Uh oh!

openjdk bot commented Nov 12, 2021

Uh oh!

openjdk bot commented Nov 12, 2021

Uh oh!

Uh oh!

LanceAndersen commented Nov 10, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Nov 10, 2021 •

edited

Loading

openjdk bot commented Nov 10, 2021 •

edited

Loading