Fix missing notifyRemoteAsyncErrors http config wiring

 (#11897)

Fixed missing notifyRemoteAsyncErrors http config wiring and add tests

Signed-off-by: Ludovic Orban <[email protected]>

jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/HttpOutput.java

@@ -685,7 +685,9 @@ public void flush() throws IOException
  catch (Throwable t)
  {
  onWriteComplete(false, t);
- throw t;
+ if (t instanceof IOException)
+ throw t;
+ throw new IOException(t);
  }
  }
  }

jetty-ee11/jetty-ee11-tests/jetty-ee11-test-client-transports/src/test/java/org/eclipse/jetty/ee11/test/client/transport/Http2AsyncIOServletTest.java

@@ -0,0 +1,151 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.ee11.test.client.transport;
+
+import java.net.InetSocketAddress;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee11.servlet.ServletHolder;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpURI;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.http.MetaData;
+import org.eclipse.jetty.http2.ErrorCode;
+import org.eclipse.jetty.http2.api.Session;
+import org.eclipse.jetty.http2.api.Stream;
+import org.eclipse.jetty.http2.client.HTTP2Client;
+import org.eclipse.jetty.http2.frames.HeadersFrame;
+import org.eclipse.jetty.http2.frames.ResetFrame;
+import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
+import org.eclipse.jetty.io.EofException;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.util.FuturePromise;
+import org.eclipse.jetty.util.component.LifeCycle;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class Http2AsyncIOServletTest
+{
+ private Server server;
+ private ServerConnector connector;
+ private HTTP2Client client;
+
+ private void start(HttpConfiguration httpConfig, HttpServlet httpServlet) throws Exception
+ {
+ server = new Server();
+ connector = new ServerConnector(server, 1, 1, new HTTP2CServerConnectionFactory(httpConfig));
+ server.addConnector(connector);
+ ServletContextHandler servletContextHandler = new ServletContextHandler("/");
+ servletContextHandler.addServlet(new ServletHolder(httpServlet), "/*");
+ server.setHandler(servletContextHandler);
+ server.start();
+
+ client = new HTTP2Client();
+ client.start();
+ }
+
+ @AfterEach
+ public void tearDown()
+ {
+ LifeCycle.stop(client);
+ LifeCycle.stop(server);
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testStartAsyncThenClientResetRemoteErrorNotification(boolean notify) throws Exception
+ {
+ HttpConfiguration httpConfig = new HttpConfiguration();
+ httpConfig.setNotifyRemoteAsyncErrors(notify);
+
+ AtomicReference<AsyncEvent> errorAsyncEventRef = new AtomicReference<>();
+ CountDownLatch latch = new CountDownLatch(1);
+ start(httpConfig, new HttpServlet()
+ {
+ @Override
+ protected void service(HttpServletRequest request, HttpServletResponse response)
+ {
+ AsyncContext asyncContext = request.startAsync();
+ asyncContext.addListener(new AsyncListener()
+ {
+ @Override
+ public void onComplete(AsyncEvent event)
+ {
+ }
+
+ @Override
+ public void onTimeout(AsyncEvent event)
+ {
+ }
+
+ @Override
+ public void onError(AsyncEvent event)
+ {
+ errorAsyncEventRef.set(event);
+ asyncContext.complete();
+ }
+
+ @Override
+ public void onStartAsync(AsyncEvent event)
+ {
+ }
+ });
+ asyncContext.setTimeout(0);
+ latch.countDown();
+ }
+ });
+
+ InetSocketAddress address = new InetSocketAddress("localhost", connector.getLocalPort());
+ FuturePromise<Session> sessionPromise = new FuturePromise<>();
+ client.connect(address, new Session.Listener() {}, sessionPromise);
+ Session session = sessionPromise.get(5, TimeUnit.SECONDS);
+ MetaData.Request metaData = new MetaData.Request("GET", HttpURI.from("/"), HttpVersion.HTTP_2, HttpFields.EMPTY);
+ HeadersFrame frame = new HeadersFrame(metaData, null, false);
+ Stream stream = session.newStream(frame, null).get(5, TimeUnit.SECONDS);
+
+ // Wait for the server to be in ASYNC_WAIT.
+ assertTrue(latch.await(5, TimeUnit.SECONDS));
+ Thread.sleep(500);
+
+ stream.reset(new ResetFrame(stream.getId(), ErrorCode.CANCEL_STREAM_ERROR.code));
+
+ if (notify)
+ // Wait for the reset to be notified to the async context listener.
+ await().atMost(5, TimeUnit.SECONDS).until(() ->
+ {
+ AsyncEvent asyncEvent = errorAsyncEventRef.get();
+ return asyncEvent == null ? null : asyncEvent.getThrowable();
+ }, instanceOf(EofException.class));
+ else
+ // Wait for the reset to NOT be notified to the failure listener.
+ await().atMost(5, TimeUnit.SECONDS).during(1, TimeUnit.SECONDS).until(errorAsyncEventRef::get, nullValue());
+ }
+}

jetty-ee11/jetty-ee11-tests/jetty-ee11-test-client-transports/src/test/java/org/eclipse/jetty/ee11/test/client/transport/Http3AsyncIOServletTest.java

@@ -0,0 +1,161 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.ee11.test.client.transport;
+
+import java.net.InetSocketAddress;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee11.servlet.ServletHolder;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpURI;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.http.MetaData;
+import org.eclipse.jetty.http3.HTTP3ErrorCode;
+import org.eclipse.jetty.http3.api.Stream;
+import org.eclipse.jetty.http3.client.HTTP3Client;
+import org.eclipse.jetty.http3.frames.HeadersFrame;
+import org.eclipse.jetty.http3.server.HTTP3ServerConnectionFactory;
+import org.eclipse.jetty.io.EofException;
+import org.eclipse.jetty.quic.client.ClientQuicConfiguration;
+import org.eclipse.jetty.quic.server.QuicServerConnector;
+import org.eclipse.jetty.quic.server.ServerQuicConfiguration;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.toolchain.test.MavenPaths;
+import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
+import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
+import org.eclipse.jetty.util.component.LifeCycle;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.awaitility.Awaitility.await;
+import static org.eclipse.jetty.http3.api.Session.Client;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@ExtendWith(WorkDirExtension.class)
+public class Http3AsyncIOServletTest
+{
+ public WorkDir workDir;
+
+ private Server server;
+ private QuicServerConnector connector;
+ private HTTP3Client client;
+
+ private void start(HttpConfiguration httpConfig, HttpServlet httpServlet) throws Exception
+ {
+ server = new Server();
+ SslContextFactory.Server serverSslContextFactory = new SslContextFactory.Server();
+ serverSslContextFactory.setKeyStorePath(MavenPaths.findTestResourceFile("keystore.p12").toString());
+ serverSslContextFactory.setKeyStorePassword("storepwd");
+ ServerQuicConfiguration serverQuicConfiguration = new ServerQuicConfiguration(serverSslContextFactory, workDir.getEmptyPathDir());
+ connector = new QuicServerConnector(server, serverQuicConfiguration, new HTTP3ServerConnectionFactory(serverQuicConfiguration, httpConfig));
+ server.addConnector(connector);
+ ServletContextHandler servletContextHandler = new ServletContextHandler("/");
+ servletContextHandler.addServlet(new ServletHolder(httpServlet), "/*");
+ server.setHandler(servletContextHandler);
+ server.start();
+
+ client = new HTTP3Client(new ClientQuicConfiguration(new SslContextFactory.Client(true), null));
+ client.start();
+ }
+
+ @AfterEach
+ public void tearDown()
+ {
+ LifeCycle.stop(client);
+ LifeCycle.stop(server);
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testStartAsyncThenClientResetRemoteErrorNotification(boolean notify) throws Exception
+ {
+ HttpConfiguration httpConfig = new HttpConfiguration();
+ httpConfig.setNotifyRemoteAsyncErrors(notify);
+
+ AtomicReference<AsyncEvent> errorAsyncEventRef = new AtomicReference<>();
+ CountDownLatch latch = new CountDownLatch(1);
+ start(httpConfig, new HttpServlet()
+ {
+ @Override
+ protected void service(HttpServletRequest request, HttpServletResponse response)
+ {
+ AsyncContext asyncContext = request.startAsync();
+ asyncContext.addListener(new AsyncListener()
+ {
+ @Override
+ public void onComplete(AsyncEvent event)
+ {
+ }
+
+ @Override
+ public void onTimeout(AsyncEvent event)
+ {
+ }
+
+ @Override
+ public void onError(AsyncEvent event)
+ {
+ errorAsyncEventRef.set(event);
+ asyncContext.complete();
+ }
+
+ @Override
+ public void onStartAsync(AsyncEvent event)
+ {
+ }
+ });
+ asyncContext.setTimeout(0);
+ latch.countDown();
+ }
+ });
+
+ InetSocketAddress address = new InetSocketAddress("localhost", connector.getLocalPort());
+ Client session = client.connect(address, new Client.Listener() {}).get(5, TimeUnit.SECONDS);
+ MetaData.Request metaData = new MetaData.Request("GET", HttpURI.from("/"), HttpVersion.HTTP_3, HttpFields.EMPTY);
+ HeadersFrame frame = new HeadersFrame(metaData, false);
+ Stream stream = session.newRequest(frame, null).get(5, TimeUnit.SECONDS);
+
+ // Wait for the server to be in ASYNC_WAIT.
+ assertTrue(latch.await(5, TimeUnit.SECONDS));
+ Thread.sleep(500);
+
+ stream.reset(HTTP3ErrorCode.REQUEST_CANCELLED_ERROR.code(), new Exception());
+
+ if (notify)
+ // Wait for the reset to be notified to the async context listener.
+ await().atMost(5, TimeUnit.SECONDS).until(() ->
+ {
+ AsyncEvent asyncEvent = errorAsyncEventRef.get();
+ return asyncEvent == null ? null : asyncEvent.getThrowable();
+ }, instanceOf(EofException.class));
+ else
+ // Wait for the reset to NOT be notified to the failure listener.
+ await().atMost(5, TimeUnit.SECONDS).during(1, TimeUnit.SECONDS).until(errorAsyncEventRef::get, nullValue());
+ }
+}