Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8286594: (zipfs) Mention paths with dot elements in ZipException and cleanups #8655

Closed
wants to merge 1 commit into from

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented May 11, 2022

This augments the ZipException upon rejecting a Zip File containing entry names with "." or ".." elements.

It furthermore tries to clean up & compact the logic for detecting "." and ".." and it adds a method IndexNode::nameAsString to return the node name as a String.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 reviewer)

Issue

  • JDK-8286594: (zipfs) Mention paths with dot elements in ZipException and cleanups

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8655

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

Using diff file

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

Improvements after JDK-8251329
@bridgekeeper
Copy link

bridgekeeper bot commented May 11, 2022

👋 Welcome back clanger! 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 openjdk bot added the rfr Pull request is ready for review label May 11, 2022
@openjdk
Copy link

openjdk bot commented May 11, 2022

@RealCLanger The following labels will be automatically applied to this pull request:

  • core-libs
  • nio

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

@openjdk openjdk bot added nio nio-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels May 11, 2022
@mlbridge
Copy link

mlbridge bot commented May 11, 2022

Webrevs

Copy link
Contributor

@LanceAndersen LanceAndersen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good Christoph. Thank you for separating this out from the other PR

@openjdk
Copy link

openjdk bot commented May 11, 2022

@RealCLanger 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:

8286594: (zipfs) Mention paths with dot elements in ZipException and cleanups

Reviewed-by: lancea

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 35 new commits pushed to the master branch:

  • 986d87d: 8274113: (fc) Tune FileChannel.transferFrom()
  • 61cb4b7: 8285951: Replace Algorithms.eatMemory(...) with WB.fullGC() in vmTestbase_vm_gc_ref tests
  • 5ff1d22: 8286386: Address possibly lossy conversions in java.net.http
  • 7118343: 8278262: JFR: TestPrintXML can't handle missing timestamps
  • 74eee28: 8286560: Remove user parameter from jdk.internal.perf.Perf.attach()
  • 160944b: 8286615: Small refactor to SerializedLambda
  • 17c5278: 8286378: Address possibly lossy conversions in java.base
  • 0a6832b: 8286617: Improve parameter names in javax.lang.model utility visitors
  • 2c5d136: 8282191: Implementation of Foreign Function & Memory API (Preview)
  • 3be394e: 8275535: Retrying a failed authentication on multiple LDAP servers can lead to users blocked
  • ... and 25 more: https://git.openjdk.java.net/jdk/compare/89de756ffbefac452c7df559e2a4eb50bf71368b...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 11, 2022
@seanjmullan
Copy link
Member

A more descriptive title for the bug report would be helpful.

@RealCLanger RealCLanger changed the title 8286594: (zipfs) Improvements after JDK-8251329 8286594: (zipfs) Mention paths with dot elements in ZipException and cleanups May 12, 2022
@RealCLanger
Copy link
Contributor Author

A more descriptive title for the bug report would be helpful.

Fixed.

@RealCLanger
Copy link
Contributor Author

Thanks @LanceAndersen for the review.

/integrate

@openjdk
Copy link

openjdk bot commented May 14, 2022

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

  • 29c4b8e: 8286444: javac errors after JDK-8251329 are not helpful enough to find root cause
  • 9eb15c9: 8286681: ShenandoahControlThread::request_gc misses the case of GCCause::_codecache_GC_threshold
  • e4378ab: 8286559: Re-examine synchronization of mark and reset methods on InflaterInputStream
  • f56396f: 6829250: Reg test: java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java fails in Windows
  • 273c732: 8277493: [REDO] Quarantined jpackage apps are labeled as "damaged"
  • 583a61a: 8286671: (fc) Modify sun.nio.ch.FileChannelImpl.map0() to accept a FileDescriptor parameter
  • 1e843c3: 8286604: Update InputStream and OutputStream to use @implSpec
  • 78ffefb: 8286668: JFR: Cleanup
  • 76caeed: 8285366: Fix typos in serviceability
  • f631c98: 8285380: Fix typos in security
  • ... and 47 more: https://git.openjdk.java.net/jdk/compare/89de756ffbefac452c7df559e2a4eb50bf71368b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 14, 2022
@openjdk openjdk bot closed this May 14, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 14, 2022
@openjdk
Copy link

openjdk bot commented May 14, 2022

@RealCLanger Pushed as commit 80cf9f3.

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

@RealCLanger RealCLanger deleted the zipfschange branch May 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated nio nio-dev@openjdk.org
3 participants