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

8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily #6197

Closed
wants to merge 6 commits into from

Conversation

jnimeh
Copy link
Member

@jnimeh jnimeh commented Nov 1, 2021

This fix handles cases where two or more threads may be acting on a single SSLSocket instance. In cases where one thread closes the socket while the other is in the middle of a read, a SocketException is appropriately thrown, but it results in SSLSession invalidation even though the session was legitimately negotiated at an earlier point in time and should remain in the cache.

JBS: https://bugs.openjdk.java.net/browse/JDK-8274736


Progress

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

Issue

  • JDK-8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6197

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 1, 2021

👋 Welcome back jnimeh! 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 openjdk bot commented Nov 1, 2021

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

@openjdk openjdk bot added the security label Nov 1, 2021
@jnimeh jnimeh changed the title Tls concurrent 8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily Nov 1, 2021
@openjdk openjdk bot added the rfr label Nov 1, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 1, 2021

@openjdk
Copy link

@openjdk openjdk bot commented Nov 1, 2021

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

8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily

Reviewed-by: xuelei, wetmore

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

  • 0699220: 8268882: C2: assert(n->outcnt() != 0 || C->top() == n || n->is_Proj()) failed: No dead instructions after post-alloc
  • d7012fb: 8276880: Remove java/lang/RuntimeTests/exec/ExecWithDir as unnecessary
  • f9024d0: 8230130: javadoc search result dialog shows cut off headers for long results
  • 055de6f: 8223358: Incorrect HTML structure in annotation pages
  • a60e912: 8198626: java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html fails on mac
  • dde959d: 8276808: java/nio/channels/Channels/TransferTo.java timed out
  • daf77eb: 8276337: Use override specifier in HeapDumper
  • 93692ea: 8274395: Use enhanced-for instead of plain 'for' in jdk.internal.jvmstat
  • e35abe3: 8256208: Javadoc's generated overview does not show classes of unnamed package
  • f65db88: 8276841: Add support for Visual Studio 2022
  • ... and 292 more: https://git.openjdk.java.net/jdk/compare/fd10f1996ef94529b5b12e547957cd904ade1956...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 label Nov 1, 2021
/*
* @test
* @bug 8274736
* @summary Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily
Copy link
Contributor

@bradfordwetmore bradfordwetmore Nov 5, 2021

Choose a reason for hiding this comment

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

Minor nit. Can you keep these under 80 chars?

Copy link
Member Author

@jnimeh jnimeh Nov 5, 2021

Choose a reason for hiding this comment

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

No problem.

@jnimeh
Copy link
Member Author

@jnimeh jnimeh commented Nov 10, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 10, 2021

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

  • c1e41fe: 8276842: G1: Only calculate size in bytes from words when needed
  • c8b0ee6: 8276833: G1: Make G1EvacFailureRegions::par_iterate const
  • 0699220: 8268882: C2: assert(n->outcnt() != 0 || C->top() == n || n->is_Proj()) failed: No dead instructions after post-alloc
  • d7012fb: 8276880: Remove java/lang/RuntimeTests/exec/ExecWithDir as unnecessary
  • f9024d0: 8230130: javadoc search result dialog shows cut off headers for long results
  • 055de6f: 8223358: Incorrect HTML structure in annotation pages
  • a60e912: 8198626: java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html fails on mac
  • dde959d: 8276808: java/nio/channels/Channels/TransferTo.java timed out
  • daf77eb: 8276337: Use override specifier in HeapDumper
  • 93692ea: 8274395: Use enhanced-for instead of plain 'for' in jdk.internal.jvmstat
  • ... and 294 more: https://git.openjdk.java.net/jdk/compare/fd10f1996ef94529b5b12e547957cd904ade1956...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 10, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 10, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 10, 2021

@jnimeh Pushed as commit 8822d41.

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

@jnimeh jnimeh deleted the tls-concurrent branch Nov 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated security
3 participants