8328894: HttpResponse.body() returns null with https target and failed proxy authentication #28232
+364
−71
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This patch addresses the issue where
HttpResponse.body()returnsnullfor 407 responses when using HTTPS through a proxy, while HTTP requests correctly return the response body.Problem
When an HTTPS request receives a 407 Proxy Authentication Required response, the response body is discarded during CONNECT tunnel establishment. This is inconsistent with HTTP behavior where the body is properly returned.
Root cause:
MultiExchange<Void>for CONNECT requestsignoreBody()on 407 responsesProposed Solution
I propose the following changes to preserve and return the 407 response body:
PlainTunnelingConnection.java: Change
MultiExchange<Void>toMultiExchange<byte[]>and read the body on 407 responses instead of ignoring itProxyAuthenticationRequired.java: Add
proxyResponseBodyfield to carry the body bytes through the exceptionExchange.java: Cache both the proxy response and body, then return them when the application calls
body()Testing
Added comprehensive test (
ProxyAuthHttpTest.java) covering:BodyHandlertypes:ofString(),ofByteArray(),ofInputStream(),ofLines()Test results: 38/38 passed
Notes
I'd appreciate any feedback on this approach. If there's a better way to handle this, I'm happy to revise.
Progress
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/28232/head:pull/28232$ git checkout pull/28232Update a local copy of the PR:
$ git checkout pull/28232$ git pull https://git.openjdk.org/jdk.git pull/28232/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 28232View PR using the GUI difftool:
$ git pr show -t 28232Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/28232.diff
Using Webrev
Link to Webrev Comment