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

8236859: WebSocket over authenticating proxy fails with NPE #53

Closed
wants to merge 1 commit into from

Conversation

@Larry-N
Copy link
Contributor

@Larry-N Larry-N commented Dec 10, 2020

Backport fix for bug 8236859

  • small correction cache.store() calling because of method signature difference from 16 to 13 jdk.
    File: AuthenticationFilter.java

Progress

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

Issue

  • JDK-8236859: WebSocket over authenticating proxy fails with NPE

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk13u-dev pull/53/head:pull/53
$ git checkout pull/53

@bridgekeeper bridgekeeper bot added the oca label Dec 10, 2020
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 10, 2020

Hi @Larry-N, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user Larry-N" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

@openjdk openjdk bot changed the title Backport c6da6681d418928c65cff6b1240e6b5d6bc5199b 8236859: WebSocket over authenticating proxy fails with NPE Dec 10, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 10, 2020

This backport pull request has now been updated with issue and summary from the original commit.

@openjdk openjdk bot added the backport label Dec 10, 2020
@Larry-N
Copy link
Contributor Author

@Larry-N Larry-N commented Dec 10, 2020

/covered

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 10, 2020

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

@robilad
Copy link

@robilad robilad commented Dec 10, 2020

Hi,

Please send me an email to dalibor.topic@oracle.com so that I can verify your account.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 22, 2020

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Dec 23, 2020

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

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

8236859: WebSocket over authenticating proxy fails with NPE

This change fixes several issues with WebSocket and proxy authentication. The AuthenticationFilter is changed to support an authenticating server accessed through an authenticating proxy. MultiExchange is fixed to close the previous connection if a new connection is necessary to establish the websocket (websocket connections are not cached and must be closed in that case). WebSocket OpeningHandshake is fixed to close the connection (without creating the RawChannel) if the opening handshake doesn't result in 101 upgrade protocol.

Reviewed-by: yan

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

  • cc78d10: 8254854: [cgroups v1] Metric limits not properly detected on some join controller combinations
  • ea904d8: 8257242: [macOS] Java app crashes while switching input methods
  • 9db1121: 8255603: Memory/Performance regression after JDK-8210985
  • 164abd4: 8239000: handle ContendedPaddingWidth in vm_version_ppc
  • ead24ad: 8252090: JFR: StreamWriterHost::write_unbuffered() stucks in an infinite loop OpenJDK (build 13.0.1+9)
  • 92aec52: 8245400: Upgrade to LittleCMS 2.11
  • 501e942: 8248532: Every time I change keyboard language at my MacBook, Java crashes
  • 05ac56a: 8239886: Minimal VM build fails after JDK-8237499
  • 85b7908: 8237499: JFR: Include stack trace in the ThreadStart event
  • 20251b7: 8247867: Upgrade to freetype 2.10.2
  • ... and 8 more: https://git.openjdk.java.net/jdk13u-dev/compare/c4c63b919ef07d74af7341c2d5ef6e98de4d353c...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@yan-too) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready label Dec 23, 2020
@Larry-N
Copy link
Contributor Author

@Larry-N Larry-N commented Dec 23, 2020

/integrate

@openjdk openjdk bot added the sponsor label Dec 23, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 23, 2020

@Larry-N
Your change (at version 9b807db) is now ready to be sponsored by a Committer.

@yan-too
Copy link
Collaborator

@yan-too yan-too commented Dec 23, 2020

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Dec 23, 2020

@yan-too @Larry-N Since your change was applied there have been 18 commits pushed to the master branch:

  • cc78d10: 8254854: [cgroups v1] Metric limits not properly detected on some join controller combinations
  • ea904d8: 8257242: [macOS] Java app crashes while switching input methods
  • 9db1121: 8255603: Memory/Performance regression after JDK-8210985
  • 164abd4: 8239000: handle ContendedPaddingWidth in vm_version_ppc
  • ead24ad: 8252090: JFR: StreamWriterHost::write_unbuffered() stucks in an infinite loop OpenJDK (build 13.0.1+9)
  • 92aec52: 8245400: Upgrade to LittleCMS 2.11
  • 501e942: 8248532: Every time I change keyboard language at my MacBook, Java crashes
  • 05ac56a: 8239886: Minimal VM build fails after JDK-8237499
  • 85b7908: 8237499: JFR: Include stack trace in the ThreadStart event
  • 20251b7: 8247867: Upgrade to freetype 2.10.2
  • ... and 8 more: https://git.openjdk.java.net/jdk13u-dev/compare/c4c63b919ef07d74af7341c2d5ef6e98de4d353c...master

Your commit was automatically rebased without conflicts.

Pushed as commit 5d25a8f.

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

@Larry-N Larry-N deleted the backport-c6da6681 branch Dec 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants