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

8347424: Fix and rewrite sun/security/x509/DNSName/LeadingPeriod.java test #23033

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jan 10, 2025

Noticed this when backporting JDK-8311546. The test is actually broken, as it does not include CA cert in the certification path. So it passes even without the fix, and thus the test does not actually test what the fix is supposed to fix.

The test is also quite hairy and can be drastically simplified.

It looks to me the actual bug is in this line:

List<Certificate> list = List.of(targetCert);

I think it got wrongly rewritten here:
a2c0fa6#diff-518af459086b0cd1aef2498da82abf7da93391c030662e55312860ac9ce80542L55

Additional testing:

  • Test now fails with JDK-8311546 fix reverted, passes with it

Progress

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

Issue

  • JDK-8347424: Fix and rewrite sun/security/x509/DNSName/LeadingPeriod.java test (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23033/head:pull/23033
$ git checkout pull/23033

Update a local copy of the PR:
$ git checkout pull/23033
$ git pull https://git.openjdk.org/jdk.git pull/23033/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23033

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23033.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 10, 2025

👋 Welcome back shade! 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
Copy link

openjdk bot commented Jan 10, 2025

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

8347424: Fix and rewrite sun/security/x509/DNSName/LeadingPeriod.java test

Reviewed-by: mullan, bperez

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

  • 4c30933: 8346971: [ubsan] psCardTable.cpp:131:24: runtime error: large index is out of bounds
  • 06ff4c1: 8347146: Convert IncludeLocalesPluginTest to use JUnit
  • db76f47: 8347720: [BACKOUT] Portable implementation of FORBID_C_FUNCTION and ALLOW_C_FUNCTION
  • e6902cf: 8323740: java.lang.ExceptionInInitializerError when trying to load XML classes in wrong order
  • a01e92c: 8347724: Replace SIZE_FORMAT in jfr directory
  • d002933: 8347286: (fs) Remove some extensions from java/nio/file/Files/probeContentType/Basic.java
  • d532019: 8347143: [aix] Fix strdup use in os::dll_load
  • dfd215b: 8347376: tools/jlink/runtimeImage/JavaSEReproducibleTest.java and PackagedModulesVsRuntimeImageLinkTest.java failed after JDK-8321413
  • a49f833: 8346045: Cleanup of security library tests calling Security Manager APIs
  • 56c7800: 8347381: Upgrade jQuery UI to version 1.14.1
  • ... and 109 more: https://git.openjdk.org/jdk/compare/98724219a87c1cdb1e7942ade1a4d49b201a0a94...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 rfr Pull request is ready for review label Jan 10, 2025
@openjdk
Copy link

openjdk bot commented Jan 10, 2025

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

  • security

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
Copy link

mlbridge bot commented Jan 10, 2025

Webrevs

Copy link
Member

@seanjmullan seanjmullan left a comment

Choose a reason for hiding this comment

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

Good catch. Usually the root certificate should not be included in the certpath, but this test depends on the name constraints included in the root certificate, thus it needs to be part of the certpath. That was an oversight in my fix that introduced the regression. The test simplifications look good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 13, 2025
Copy link
Contributor

@blperez01 blperez01 left a comment

Choose a reason for hiding this comment

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

Good catch - appreciate the fix and simplifications!

@shipilev
Copy link
Member Author

Thank you for reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Jan 15, 2025

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

  • 4257215: 8345493: JFR: JVM.flush hangs intermittently
  • a0f7982: 8345134: Test sun/security/tools/jarsigner/ConciseJarsigner.java failed: unable to find valid certification path to requested target
  • 63cedaf: 8347334: JimageDiffGenerator code clean-ups
  • 254e840: 8340416: Remove ArchiveBuilder::estimate_archive_size()
  • 8193ba3: 8347562: javac crash due to type vars in permits clause
  • 7df21a8: 8347597: HttpClient: improve exception reporting when closing connection
  • b0e2be6: 8347729: Replace SIZE_FORMAT in parallel and serial gc
  • d4e5ec2: 8346610: Make all imports consistent in the FFM API
  • c36200b: 8347721: Replace SIZE_FORMAT in compiler directories
  • af3f5d8: 8347039: ThreadPerTaskExecutor terminates if cancelled tasks still running
  • ... and 136 more: https://git.openjdk.org/jdk/compare/98724219a87c1cdb1e7942ade1a4d49b201a0a94...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 15, 2025

@shipilev Pushed as commit a6be907.

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

@shipilev shipilev deleted the JDK-8347424-fix-dnsname-test branch January 20, 2025 09:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated security [email protected]
Development

Successfully merging this pull request may close these issues.

3 participants