8292044: HttpClient doesn't handle 102 or 103 properly #2896

MBaesken · 2024-08-06T11:45:58Z

Backport of 8292044 from 17

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
JDK-8292044 needs maintainer approval
Commit message must refer to an issue

Issue

JDK-8292044: HttpClient doesn't handle 102 or 103 properly (Bug - P3 - Approved)

Reviewers

Martin Doerr (@TheRealMDoerr - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2896/head:pull/2896
$ git checkout pull/2896

Update a local copy of the PR:
$ git checkout pull/2896
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/2896/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2896

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2896.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2024-08-06T11:46:32Z

👋 Welcome back mbaesken! 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 · 2024-08-06T11:47:07Z

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

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

8292044: HttpClient doesn't handle 102 or 103 properly

Reviewed-by: mdoerr

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 1 new commit pushed to the master branch:

648e8f0: 8330523: Reduce runtime and improve efficiency of KeepAliveTest

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 · 2024-08-06T11:47:26Z

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

MBaesken · 2024-08-06T11:49:22Z

HttpClientImpl.java exception block needs manual addition, diffs in the stride

@@ -582,6 +583,8 @@ final class HttpClientImpl extends HttpClient implements Trackable {
                 // any other SSLException is wrapped in a plain
                 // SSLException
                 throw new SSLException(msg, throwable);
+            } else if (throwable instanceof ProtocolException) {
+                throw new ProtocolException(msg);
             } else if (throwable instanceof IOException) {
                 throw new IOException(msg, throwable);
             } else {

Stream.java

checkRequestCancelled() not in, avoid this change part

test Response1xxTest.java
has to be adjusted to build ; and testSecureHTTP2Unexpected101 gets an IOException not a ProtocolException (seems there are some diffs/other changes 11 compared to 17/21)

mlbridge · 2024-08-06T11:51:52Z

Webrevs

01: Full - Incremental (75c13614)
00: Full (f55652e6)

TheRealMDoerr

Ok, JDK-8245462 is not in 11u. I have only one change request.

test/jdk/java/net/httpclient/Response1xxTest.java

…in jdk17

TheRealMDoerr

The backport LGTM. It would still be good to know more details about the IOException. Do you have a stack trace with more Exception details or .jtr output?

openjdk · 2024-08-07T13:12:35Z

⚠️ @MBaesken This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

MBaesken · 2024-08-08T07:12:49Z

Do you have a stack trace with more Exception details

This is the stack trace when I keep the ProtocolException and omit the check for IOException

java.lang.AssertionError: Expected ProtocolException to be thrown, but IOException was thrown
at org.testng.Assert.expectThrows(Assert.java:1724)
at org.testng.Assert.assertThrows(Assert.java:1695)
at Response1xxTest.testSecureHTTP2Unexpected101(Response1xxTest.java:448)
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:566)
at org.testng.internal.MethodInvocationHelper.invokeMethod(MethodInvocationHelper.java:132)
at org.testng.internal.TestInvoker.invokeMethod(TestInvoker.java:599)
at org.testng.internal.TestInvoker.invokeTestMethod(TestInvoker.java:174)
at org.testng.internal.MethodRunner.runInSequence(MethodRunner.java:46)
at org.testng.internal.TestInvoker$MethodInvocationAgent.invoke(TestInvoker.java:822)
at org.testng.internal.TestInvoker.invokeTestMethods(TestInvoker.java:147)
at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:146)
at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:128)
at java.base/java.util.ArrayList.forEach(ArrayList.java:1541)
at org.testng.TestRunner.privateRun(TestRunner.java:764)
at org.testng.TestRunner.run(TestRunner.java:585)
at org.testng.SuiteRunner.runTest(SuiteRunner.java:384)
at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:378)
at org.testng.SuiteRunner.privateRun(SuiteRunner.java:337)
at org.testng.SuiteRunner.run(SuiteRunner.java:286)
at org.testng.SuiteRunnerWorker.runSuite(SuiteRunnerWorker.java:53)
at org.testng.SuiteRunnerWorker.run(SuiteRunnerWorker.java:96)
at org.testng.TestNG.runSuitesSequentially(TestNG.java:1218)
at org.testng.TestNG.runSuitesLocally(TestNG.java:1140)
at org.testng.TestNG.runSuites(TestNG.java:1069)
at org.testng.TestNG.run(TestNG.java:1037)
at com.sun.javatest.regtest.agent.TestNGRunner.main(TestNGRunner.java:102)
at com.sun.javatest.regtest.agent.TestNGRunner.main(TestNGRunner.java:58)
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:566)
at com.sun.javatest.regtest.agent.MainWrapper$MainTask.run(MainWrapper.java:138)
at java.base/java.lang.Thread.run(Thread.java:829)
Caused by: java.io.IOException: No subject alternative names present
at java.net.http/jdk.internal.net.http.HttpClientImpl.send(HttpClientImpl.java:568)
at java.net.http/jdk.internal.net.http.HttpClientFacade.send(HttpClientFacade.java:119)
at Response1xxTest.lambda$testSecureHTTP2Unexpected101$2(Response1xxTest.java:449)
at org.testng.Assert.expectThrows(Assert.java:1714)
... 35 more
Caused by: javax.net.ssl.SSLHandshakeException: No subject alternative names present
at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:131)
at java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:360)
at java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:303)
at java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:298)
at java.base/sun.security.ssl.CertificateMessage$T13CertificateConsumer.checkServerCerts(CertificateMessage.java:1357)
at java.base/sun.security.ssl.CertificateMessage$T13CertificateConsumer.onConsumeCertificate(CertificateMessage.java:1232)
at java.base/sun.security.ssl.CertificateMessage$T13CertificateConsumer.consume(CertificateMessage.java:1175)
at java.base/sun.security.ssl.SSLHandshake.consume(SSLHandshake.java:392)
at java.base/sun.security.ssl.HandshakeContext.dispatch(HandshakeContext.java:443)
at java.base/sun.security.ssl.SSLEngineImpl$DelegatedTask$DelegatedAction.run(SSLEngineImpl.java:1076)
at java.base/sun.security.ssl.SSLEngineImpl$DelegatedTask$DelegatedAction.run(SSLEngineImpl.java:1063)
at java.base/java.security.AccessController.doPrivileged(Native Method)
at java.base/sun.security.ssl.SSLEngineImpl$DelegatedTask.run(SSLEngineImpl.java:1010)
at java.base/java.util.ArrayList.forEach(ArrayList.java:1541)
at java.net.http/jdk.internal.net.http.common.SSLFlowDelegate.lambda$executeTasks$3(SSLFlowDelegate.java:1073)
at java.net.http/jdk.internal.net.http.HttpClientImpl$DelegatingExecutor.execute(HttpClientImpl.java:154)
at java.net.http/jdk.internal.net.http.common.SSLFlowDelegate.executeTasks(SSLFlowDelegate.java:1068)
at java.net.http/jdk.internal.net.http.common.SSLFlowDelegate.doHandshake(SSLFlowDelegate.java:1034)
at java.net.http/jdk.internal.net.http.common.SSLFlowDelegate$Reader.processData(SSLFlowDelegate.java:442)
at java.net.http/jdk.internal.net.http.common.SSLFlowDelegate$Reader$ReaderDownstreamPusher.run(SSLFlowDelegate.java:264)
at java.net.http/jdk.internal.net.http.common.SequentialScheduler$SynchronizedRestartableTask.run(SequentialScheduler.java:175)
at java.net.http/jdk.internal.net.http.common.SequentialScheduler$CompleteRestartableTask.run(SequentialScheduler.java:147)
at java.net.http/jdk.internal.net.http.common.SequentialScheduler$SchedulableTask.run(SequentialScheduler.java:198)
at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
... 1 more
Caused by: java.security.cert.CertificateException: No subject alternative names present
at java.base/sun.security.util.HostnameChecker.matchIP(HostnameChecker.java:142)
at java.base/sun.security.util.HostnameChecker.match(HostnameChecker.java:101)
at java.base/sun.security.ssl.X509TrustManagerImpl.checkIdentity(X509TrustManagerImpl.java:461)
at java.base/sun.security.ssl.X509TrustManagerImpl.checkIdentity(X509TrustManagerImpl.java:435)
at java.base/sun.security.ssl.X509TrustManagerImpl.checkTrusted(X509TrustManagerImpl.java:283)
at java.base/sun.security.ssl.X509TrustManagerImpl.checkServerTrusted(X509TrustManagerImpl.java:141)
at java.base/sun.security.ssl.CertificateMessage$T13CertificateConsumer.checkServerCerts(CertificateMessage.java:1335)

MBaesken · 2024-08-09T14:05:37Z

Hi Martin, thanks for the review !

/integrate

openjdk · 2024-08-09T14:06:18Z

Going to push as commit 73dc9e8.
Since your change was applied there has been 1 commit pushed to the master branch:

648e8f0: 8330523: Reduce runtime and improve efficiency of KeepAliveTest

Your commit was automatically rebased without conflicts.

openjdk · 2024-08-09T14:06:28Z

@MBaesken Pushed as commit 73dc9e8.

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

Backport 10000286390ac9b0288cee25a4f3551d09475fdc

f55652e

openjdk bot changed the title ~~Backport 10000286390ac9b0288cee25a4f3551d09475fdc~~ 8292044: HttpClient doesn't handle 102 or 103 properly Aug 6, 2024

openjdk bot added backport rfr Pull request is ready for review labels Aug 6, 2024

TheRealMDoerr reviewed Aug 7, 2024

View reviewed changes

test/jdk/java/net/httpclient/Response1xxTest.java Outdated Show resolved Hide resolved

change comment in test about other exception class ProtocolException …

75c1361

…in jdk17

TheRealMDoerr approved these changes Aug 7, 2024

View reviewed changes

openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Aug 9, 2024

openjdk bot added the integrated Pull request has been integrated label Aug 9, 2024

openjdk bot closed this Aug 9, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 9, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8292044: HttpClient doesn't handle 102 or 103 properly #2896

8292044: HttpClient doesn't handle 102 or 103 properly #2896

Uh oh!

MBaesken commented Aug 6, 2024 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Aug 6, 2024

Uh oh!

openjdk bot commented Aug 6, 2024 •

edited

Loading

Uh oh!

openjdk bot commented Aug 6, 2024

Uh oh!

MBaesken commented Aug 6, 2024

Uh oh!

mlbridge bot commented Aug 6, 2024 •

edited

Loading

Uh oh!

TheRealMDoerr left a comment

Uh oh!

Uh oh!

TheRealMDoerr left a comment •

edited

Loading

Uh oh!

openjdk bot commented Aug 7, 2024

Uh oh!

MBaesken commented Aug 8, 2024

Uh oh!

MBaesken commented Aug 9, 2024

Uh oh!

openjdk bot commented Aug 9, 2024

Uh oh!

openjdk bot commented Aug 9, 2024

Uh oh!

Uh oh!

8292044: HttpClient doesn't handle 102 or 103 properly #2896

8292044: HttpClient doesn't handle 102 or 103 properly #2896

Uh oh!

Conversation

MBaesken commented Aug 6, 2024 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Aug 6, 2024

Uh oh!

openjdk bot commented Aug 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Aug 6, 2024

Uh oh!

MBaesken commented Aug 6, 2024

Uh oh!

mlbridge bot commented Aug 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

TheRealMDoerr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

TheRealMDoerr left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Aug 7, 2024

Uh oh!

MBaesken commented Aug 8, 2024

Uh oh!

MBaesken commented Aug 9, 2024

Uh oh!

openjdk bot commented Aug 9, 2024

Uh oh!

openjdk bot commented Aug 9, 2024

Uh oh!

Uh oh!

MBaesken commented Aug 6, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Aug 6, 2024 •

edited

Loading

mlbridge bot commented Aug 6, 2024 •

edited

Loading

TheRealMDoerr left a comment •

edited

Loading