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

8315436: HttpsServer does not send TLS alerts #15505

Closed
wants to merge 2 commits into from

Conversation

djelinski
Copy link
Member

@djelinski djelinski commented Aug 31, 2023

Please review this patch that ensures that alerts produced by wrap are sent to the peer.

When a fatal alert is produced by a wrap call, the returned status is CLOSED, but some bytes are produced in the destination buffer. These bytes need to be sent to the client.

The new test verifies this fix; without the fix the test fails with:

javax.net.ssl.SSLHandshakeException: Remote host terminated the handshake

With the fix the test passes; the exception thrown is :

javax.net.ssl.SSLHandshakeException: Received fatal alert: protocol_version

Existing tier1-3 tests continue to pass.


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-8315436: HttpsServer does not send TLS alerts (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15505

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 31, 2023

👋 Welcome back djelinski! 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 changed the title 8315436 8315436: HttpsServer does not send TLS alerts Aug 31, 2023
@openjdk
Copy link

openjdk bot commented Aug 31, 2023

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

  • net

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.

@openjdk openjdk bot added the net net-dev@openjdk.org label Aug 31, 2023
@djelinski djelinski marked this pull request as ready for review August 31, 2023 08:25
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 31, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 31, 2023

Webrevs

Copy link
Member

@dfuch dfuch 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.

@openjdk
Copy link

openjdk bot commented Aug 31, 2023

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

8315436: HttpsServer does not send TLS alerts

Reviewed-by: dfuchs, michaelm

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

  • 145d8bc: 8315051: jdk/jfr/jvm/TestGetEventWriter.java fails with non-JVMCI GCs
  • 486fa08: 8313873: java/nio/channels/DatagramChannel/SendReceiveMaxSize.java fails on AIX due to small default RCVBUF size and different IPv6 Header interpretation
  • b0353ad: 8315242: G1: Fix -Wconversion warnings around GCDrainStackTargetSize
  • b594f01: 8314748: 1-10% regressions on Crypto micros
  • 39f1813: 8315318: Typo in comment on sun.nio.ch.Net.unblock4
  • 47aa6f3: 8315219: G1: Improve allocator pathological case where it keeps doing direct allocations instead of retiring a PLAB
  • 218829e: 8315421: [BACKOUT] 8314834 serviceability/jdwp/AllModulesCommandTest.java ignores VM flags
  • 3c8a667: 8314611: Provide more explicative error message parsing Currencies
  • df5e6e5: 8315248: AssertionError in Name.compareTo
  • 3eac890: 8315061: Make LockingMode a product flag
  • ... and 46 more: https://git.openjdk.org/jdk/compare/12de9b0225363377e9a76729b11698221d4f29f2...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 Aug 31, 2023
Copy link
Member

@Michael-Mc-Mahon Michael-Mc-Mahon 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

@djelinski
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 1, 2023

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

  • 033f311: 8315069: Relativize extended_sp in interpreter frames
  • c2e01eb: 8313983: jmod create --target-platform should replace existing ModuleTarget attribute
  • 81b5d22: 8315459: Print G1 reserved and committed sizes as separate items in VM.info and hs_err
  • 764f65c: 8315278: Patch 'print-targets' target to print targets separated by new line
  • 7754ac0: 8314925: ChoiceFormat does not specify IllegalArgumentExceptions
  • 2264667: 8315422: getSoTimeout() would be in try block in SSLSocketImpl
  • d5973bd: 6333341: [BI] Doc: java.text.BreakIterator class specification is unclear
  • 63f561f: 8306882: (fs) Path.toRealPath(LinkOption.NOFOLLOW_LINKS) fails when "../../" follows a link
  • 2436fb0: 8312306: Add more Reference.reachabilityFence() calls to the security classes using Cleaner
  • 351c31e: 8315378: [BACKOUT] runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)"
  • ... and 61 more: https://git.openjdk.org/jdk/compare/12de9b0225363377e9a76729b11698221d4f29f2...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 1, 2023

@djelinski Pushed as commit 42f5b9e.

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

@djelinski djelinski deleted the httpsserver-alerts branch September 27, 2023 08:09
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 net net-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

3 participants